diff options
137 files changed, 25891 insertions, 21700 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..26d7549356 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +src/version.cpp export-subst diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 4e09583c7e..7bfdeea357 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -1,8 +1,8 @@ TEMPLATE = app TARGET = -VERSION = 0.6.0.10 +VERSION = 0.6.4.0 INCLUDEPATH += src src/json src/qt -DEFINES += QT_GUI BOOST_THREAD_USE_LIB +DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE CONFIG += no_include_pwd CONFIG += thread @@ -63,12 +63,6 @@ contains(USE_DBUS, 1) { QT += dbus } -# use: qmake "USE_SSL=1" -contains(USE_SSL, 1) { - message(Building with SSL support for RPC) - DEFINES += USE_SSL -} - # use: qmake "FIRST_CLASS_MESSAGING=1" contains(FIRST_CLASS_MESSAGING, 1) { message(Building with first-class messaging) @@ -87,8 +81,17 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) { # do not enable this on windows cross compile with mingw 4.2.x, as it will result in a non-working executable! } -# disable quite some warnings because bitcoin core "sins" a lot -QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wno-strict-aliasing -Wno-invalid-offsetof -Wno-unused-variable -Wno-unused-parameter -Wno-sign-compare -Wno-char-subscripts -Wno-unused-value -Wno-sequence-point -Wno-parentheses -Wno-unknown-pragmas -Wno-switch +# regenerate src/build.h +!windows|contains(USE_BUILD_INFO, 1) { + genbuild.depends = FORCE + genbuild.commands = cd $$PWD; /bin/sh share/genbuild.sh $$OUT_PWD/build/build.h + genbuild.target = genbuildhook + PRE_TARGETDEPS += genbuildhook + QMAKE_EXTRA_TARGETS += genbuild + DEFINES += HAVE_BUILD_INFO +} + +QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wformat -Wformat-security -Wno-invalid-offsetof -Wno-sign-compare -Wno-unused-parameter # Input DEPENDPATH += src src/json src/qt @@ -115,10 +118,9 @@ HEADERS += src/qt/bitcoingui.h \ src/net.h \ src/key.h \ src/db.h \ + src/walletdb.h \ src/script.h \ - src/noui.h \ src/init.h \ - src/headers.h \ src/irc.h \ src/mruset.h \ src/json/json_spirit_writer_template.h \ @@ -136,7 +138,6 @@ HEADERS += src/qt/bitcoingui.h \ src/qt/guiconstants.h \ src/qt/optionsmodel.h \ src/qt/monitoreddatamapper.h \ - src/qtui.h \ src/qt/transactiondesc.h \ src/qt/transactiondescdialog.h \ src/qt/bitcoinamountfield.h \ @@ -157,6 +158,8 @@ HEADERS += src/qt/bitcoingui.h \ src/protocol.h \ src/qt/notificator.h \ src/qt/qtipcserver.h \ + src/allocators.h \ + src/ui_interface.h \ src/netbase.h SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ @@ -169,6 +172,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/qt/aboutdialog.cpp \ src/qt/editaddressdialog.cpp \ src/qt/bitcoinaddressvalidator.cpp \ + src/version.cpp \ src/util.cpp \ src/netbase.cpp \ src/key.cpp \ @@ -180,6 +184,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/checkpoints.cpp \ src/addrman.cpp \ src/db.cpp \ + src/walletdb.cpp \ src/qt/clientmodel.cpp \ src/qt/guiutil.cpp \ src/qt/transactionrecord.cpp \ diff --git a/contrib/debian/patches/1001_use_system_json-spirit.patch b/contrib/debian/patches/1001_use_system_json-spirit.patch index 307dfc8d49..c6d60393d4 100644 --- a/contrib/debian/patches/1001_use_system_json-spirit.patch +++ b/contrib/debian/patches/1001_use_system_json-spirit.patch @@ -1,22 +1,22 @@ Description: Use system JSON Spirit library Author: Jonas Smedegaard <dr@jones.dk> Last-Update: 2012-07-05 ---- a/src/bitcoinrpc.cpp -+++ b/src/bitcoinrpc.cpp -@@ -20,9 +20,7 @@ - #include <boost/filesystem/fstream.hpp> - typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> SSLStream; - #endif +--- a/src/bitcoinrpc.h ++++ b/src/bitcoinrpc.h +@@ -9,9 +9,7 @@ + #include <string> + #include <map> + -#include "json/json_spirit_reader_template.h" -#include "json/json_spirit_writer_template.h" -#include "json/json_spirit_utils.h" +#include <json_spirit.h> - #define printf OutputDebugStringF - // MinGW 3.4.5 gets "fatal error: had to relocate PCH" if the json headers are - // precompiled in headers.h. The problem might be when the pch file goes over + + void ThreadRPCServer(void* parg); + int CommandLineRPC(int argc, char *argv[]); --- a/src/makefile.unix +++ b/src/makefile.unix -@@ -29,6 +29,7 @@ LIBS += \ +@@ -31,6 +31,7 @@ LIBS += \ -l boost_thread$(BOOST_LIB_SUFFIX) \ -l db_cxx$(BDB_LIB_SUFFIX) \ -l ssl \ @@ -26,21 +26,20 @@ Last-Update: 2012-07-05 ifndef USE_UPNP --- a/src/rpcdump.cpp +++ b/src/rpcdump.cpp -@@ -15,9 +15,8 @@ - // typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> SSLStream; - // #endif - // #include <boost/xpressive/xpressive_dynamic.hpp> +@@ -8,9 +8,7 @@ + + #include <boost/lexical_cast.hpp> + -#include "json/json_spirit_reader_template.h" -#include "json/json_spirit_writer_template.h" -#include "json/json_spirit_utils.h" -+ +#include <json_spirit.h> #define printf OutputDebugStringF --- a/src/test/rpc_tests.cpp +++ b/src/test/rpc_tests.cpp -@@ -1,11 +1,10 @@ +@@ -1,6 +1,8 @@ #include <boost/test/unit_test.hpp> #include <boost/foreach.hpp> @@ -48,9 +47,17 @@ Last-Update: 2012-07-05 + #include "base58.h" #include "util.h" + #include "bitcoinrpc.h" +--- a/src/test/script_tests.cpp ++++ b/src/test/script_tests.cpp +@@ -8,9 +8,7 @@ + #include <boost/foreach.hpp> + #include <boost/preprocessor/stringize.hpp> + #include <boost/test/unit_test.hpp> -#include "json/json_spirit_reader_template.h" -#include "json/json_spirit_writer_template.h" -#include "json/json_spirit_utils.h" ++#include <json_spirit.h> - using namespace std; - using namespace json_spirit; + #include "main.h" + #include "wallet.h" diff --git a/contrib/debian/rules b/contrib/debian/rules index 6d6f119b59..49c7766d13 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -20,7 +20,7 @@ override_dh_auto_clean: cd src; $(MAKE) -f makefile.unix clean override_dh_auto_configure: - qmake bitcoin-qt.pro USE_SSL=1 USE_QRCODE=1 + qmake bitcoin-qt.pro USE_QRCODE=1 override_dh_auto_test: cd src; $(MAKE) -f makefile.unix test_bitcoin diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml index 488cc95f64..a48e54da85 100644 --- a/contrib/gitian-descriptors/gitian-win32.yml +++ b/contrib/gitian-descriptors/gitian-win32.yml @@ -45,25 +45,30 @@ script: | # cd bitcoin mkdir -p $OUTDIR/src - cp -a . $OUTDIR/src - rm -rf $OUTDIR/src/.git + git archive HEAD | tar -x -C $OUTDIR/src cp $OUTDIR/src/doc/README_windows.txt $OUTDIR/readme.txt cp $OUTDIR/src/COPYING $OUTDIR/license.txt export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC - $HOME/qt/src/bin/qmake -spec unsupported/win32-g++-cross USE_SSL=1 MINIUPNPC_LIB_PATH=$HOME/build/miniupnpc MINIUPNPC_INCLUDE_PATH=$HOME/build/ BDB_LIB_PATH=$HOME/build/db-4.8.30.NC/build_unix BDB_INCLUDE_PATH=$HOME/build/db-4.8.30.NC/build_unix BOOST_LIB_PATH=$HOME/build/boost_1_47_0/stage/lib BOOST_INCLUDE_PATH=$HOME/build/boost_1_47_0 BOOST_LIB_SUFFIX=-mt-s BOOST_THREAD_LIB_SUFFIX=_win32-mt-s OPENSSL_LIB_PATH=$HOME/build/openssl-1.0.1b OPENSSL_INCLUDE_PATH=$HOME/build/openssl-1.0.1b/include QRENCODE_LIB_PATH=$HOME/build/qrencode-3.2.0/.libs QRENCODE_INCLUDE_PATH=$HOME/build/qrencode-3.2.0 USE_QRCODE=1 INCLUDEPATH=$HOME/build DEFINES=BOOST_THREAD_USE_LIB BITCOIN_NEED_QT_PLUGINS=1 QMAKE_LRELEASE=lrelease QMAKE_CXXFLAGS=-frandom-seed=bitcoin QMAKE_LFLAGS=-frandom-seed=bitcoin + $HOME/qt/src/bin/qmake -spec unsupported/win32-g++-cross MINIUPNPC_LIB_PATH=$HOME/build/miniupnpc MINIUPNPC_INCLUDE_PATH=$HOME/build/ BDB_LIB_PATH=$HOME/build/db-4.8.30.NC/build_unix BDB_INCLUDE_PATH=$HOME/build/db-4.8.30.NC/build_unix BOOST_LIB_PATH=$HOME/build/boost_1_47_0/stage/lib BOOST_INCLUDE_PATH=$HOME/build/boost_1_47_0 BOOST_LIB_SUFFIX=-mt-s BOOST_THREAD_LIB_SUFFIX=_win32-mt-s OPENSSL_LIB_PATH=$HOME/build/openssl-1.0.1b OPENSSL_INCLUDE_PATH=$HOME/build/openssl-1.0.1b/include QRENCODE_LIB_PATH=$HOME/build/qrencode-3.2.0/.libs QRENCODE_INCLUDE_PATH=$HOME/build/qrencode-3.2.0 USE_QRCODE=1 INCLUDEPATH=$HOME/build DEFINES=BOOST_THREAD_USE_LIB BITCOIN_NEED_QT_PLUGINS=1 QMAKE_LRELEASE=lrelease QMAKE_CXXFLAGS=-frandom-seed=bitcoin QMAKE_LFLAGS=-frandom-seed=bitcoin USE_BUILD_INFO=1 make $MAKEOPTS cp release/bitcoin-qt.exe $OUTDIR/ # cd src - sed 's/$(DEBUGFLAGS)/-frandom-seed=bitcoin/' -i makefile.linux-mingw export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC - make -f makefile.linux-mingw $MAKEOPTS DEPSDIR=$HOME/build bitcoind.exe USE_SSL=1 USE_UPNP=0 + make -f makefile.linux-mingw $MAKEOPTS DEPSDIR=$HOME/build bitcoind.exe USE_UPNP=0 DEBUGFLAGS="-frandom-seed=bitcoin" i586-mingw32msvc-strip bitcoind.exe - makensis ../share/setup.nsi - cp ../share/bitcoin-*-win32-setup.exe $OUTDIR/ mkdir $OUTDIR/daemon cp bitcoind.exe $OUTDIR/daemon + cd .. + mkdir nsis + git archive HEAD | tar -x -C nsis + cd nsis/src + mkdir ../release + cp ../../release/* ../release/ + cp ../../src/*.exe . + makensis ../share/setup.nsi + cp ../share/bitcoin-*-win32-setup.exe $OUTDIR/ diff --git a/contrib/gitian-descriptors/gitian.yml b/contrib/gitian-descriptors/gitian.yml index 52056b381d..36a2000551 100644 --- a/contrib/gitian-descriptors/gitian.yml +++ b/contrib/gitian-descriptors/gitian.yml @@ -42,16 +42,14 @@ script: | # cd bitcoin mkdir -p $OUTDIR/src - cp -a . $OUTDIR/src - rm -rf $OUTDIR/src/.git + git archive HEAD | tar -x -C $OUTDIR/src cp $OUTDIR/src/doc/README $OUTDIR cp $OUTDIR/src/COPYING $OUTDIR cd src - sed 's/$(DEBUGFLAGS)//' -i makefile.unix - make -f makefile.unix STATIC=1 OPENSSL_INCLUDE_PATH="$INSTDIR/include" OPENSSL_LIB_PATH="$INSTDIR/lib" $MAKEOPTS bitcoind USE_UPNP=0 USE_SSL=1 + make -f makefile.unix STATIC=1 OPENSSL_INCLUDE_PATH="$INSTDIR/include" OPENSSL_LIB_PATH="$INSTDIR/lib" $MAKEOPTS bitcoind USE_UPNP=0 DEBUGFLAGS= mkdir -p $OUTDIR/bin/$GBUILD_BITS install -s bitcoind $OUTDIR/bin/$GBUILD_BITS cd .. - qmake INCLUDEPATH="$INSTDIR/include" LIBS="-L$INSTDIR/lib" RELEASE=1 USE_SSL=1 USE_QRCODE=1 + qmake INCLUDEPATH="$INSTDIR/include" LIBS="-L$INSTDIR/lib" RELEASE=1 USE_QRCODE=1 make $MAKEOPTS install bitcoin-qt $OUTDIR/bin/$GBUILD_BITS diff --git a/doc/README b/doc/README index ac2db93248..3544f9e733 100644 --- a/doc/README +++ b/doc/README @@ -1,4 +1,4 @@ -Bitcoin 0.6.0.10 BETA +Bitcoin 0.6.4 BETA Copyright (c) 2009-2012 Bitcoin Developers Distributed under the MIT/X11 software license, see the accompanying diff --git a/doc/README_windows.txt b/doc/README_windows.txt index 89b80dbd1a..a91d17f2c7 100644 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -1,4 +1,4 @@ -Bitcoin 0.6.0.10 BETA
+Bitcoin 0.6.4 BETA
Copyright (c) 2009-2012 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
diff --git a/doc/coding.txt b/doc/coding.txt index cc41850a5c..b33ddd979a 100644 --- a/doc/coding.txt +++ b/doc/coding.txt @@ -44,7 +44,7 @@ bn CBigNum Locking/mutex usage notes
The code is multi-threaded, and uses mutexes and the
-CRITICAL_BLOCK/TRY_CRITICAL_BLOCK macros to protect data structures.
+LOCK/TRY_LOCK macros to protect data structures.
Deadlocks due to inconsistent lock ordering (thread 1 locks cs_main
and then cs_wallet, while thread 2 locks them in the opposite order:
diff --git a/doc/release-process.txt b/doc/release-process.txt index 0bd75fa880..ed23ef3505 100644 --- a/doc/release-process.txt +++ b/doc/release-process.txt @@ -2,7 +2,7 @@ * update (commit) version in sources bitcoin-qt.pro - src/main.h (CLIENT_VERSION : PROTOCOL_VERSION in serialize.h is updated only on protocol changes) + src/version.h share/setup.nsi doc/README* @@ -79,7 +79,7 @@ Gavin also had trouble with the macports py27-appscript package; he ended up installing a version that worked with: /usr/bin/easy_install-2.7 appscript - qmake RELEASE=1 USE_SSL=1 USE_UPNP=1 USE_QRCODE=1 bitcoin-qt.pro + qmake RELEASE=1 USE_UPNP=1 USE_QRCODE=1 bitcoin-qt.pro make export QTDIR=/opt/local/share/qt4 # needed to find translations/qt_*.qm files T=$(contrib/qt_translations.py $QTDIR/translations src/qt/locale) diff --git a/scripts/qt/make_windows_icon.py b/scripts/qt/make_windows_icon.py deleted file mode 120000 index f51c32a215..0000000000 --- a/scripts/qt/make_windows_icon.py +++ /dev/null @@ -1 +0,0 @@ -make_windows_icon.sh
\ No newline at end of file diff --git a/share/genbuild.sh b/share/genbuild.sh new file mode 100755 index 0000000000..d959877dc8 --- /dev/null +++ b/share/genbuild.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +if [ $# -gt 0 ]; then + FILE="$1" + shift + if [ -f "$FILE" ]; then + INFO="$(head -n 1 "$FILE")" + fi +else + echo "Usage: $0 <filename>" + exit 1 +fi + +if [ -e "$(which git)" ]; then + # clean 'dirty' status of touched files that haven't been modified + git diff >/dev/null 2>/dev/null + + # get a string like "v0.6.0-66-g59887e8-dirty" + DESC="$(git describe --dirty 2>/dev/null)" + + # get a string like "2012-04-10 16:27:19 +0200" + TIME="$(git log -n 1 --format="%ci")" +fi + +if [ -n "$DESC" ]; then + NEWINFO="#define BUILD_DESC \"$DESC\"" +else + NEWINFO="// No build information available" +fi + +# only update build.h if necessary +if [ "$INFO" != "$NEWINFO" ]; then + echo "$NEWINFO" >"$FILE" + echo "#define BUILD_DATE \"$TIME\"" >>"$FILE" +fi diff --git a/scripts/qt/extract_strings_qt.py b/share/qt/extract_strings_qt.py index b0478699ee..771f28ab0a 100755 --- a/scripts/qt/extract_strings_qt.py +++ b/share/qt/extract_strings_qt.py @@ -4,6 +4,7 @@ Extract _("...") strings for translation and convert to Qt4 stringdefs so that they can be picked up by Qt linguist. ''' from subprocess import Popen, PIPE +import glob OUT_CPP="src/qt/bitcoinstrings.cpp" EMPTY=['""'] @@ -44,7 +45,7 @@ def parse_po(text): return messages -files = ['src/base58.h', 'src/bignum.h', 'src/db.cpp', 'src/db.h', 'src/headers.h', 'src/init.cpp', 'src/init.h', 'src/irc.cpp', 'src/irc.h', 'src/key.h', 'src/main.cpp', 'src/main.h', 'src/net.cpp', 'src/net.h', 'src/noui.h', 'src/script.cpp', 'src/script.h', 'src/serialize.h', 'src/strlcpy.h', 'src/uint256.h', 'src/util.cpp', 'src/util.h'] +files = glob.glob('src/*.cpp') + glob.glob('src/*.h') # xgettext -n --keyword=_ $FILES child = Popen(['xgettext','--output=-','-n','--keyword=_'] + files, stdout=PIPE) diff --git a/scripts/qt/img/reload.xcf b/share/qt/img/reload.xcf Binary files differindex dc8be62831..dc8be62831 100644 --- a/scripts/qt/img/reload.xcf +++ b/share/qt/img/reload.xcf diff --git a/scripts/qt/make_spinner.py b/share/qt/make_spinner.py index 136aff3cb7..136aff3cb7 100755 --- a/scripts/qt/make_spinner.py +++ b/share/qt/make_spinner.py diff --git a/scripts/qt/make_windows_icon.sh b/share/qt/make_windows_icon.sh index bf607b1c62..bf607b1c62 100755 --- a/scripts/qt/make_windows_icon.sh +++ b/share/qt/make_windows_icon.sh diff --git a/share/setup.nsi b/share/setup.nsi index dff2681cd4..f38a18104f 100644 --- a/share/setup.nsi +++ b/share/setup.nsi @@ -5,7 +5,7 @@ SetCompressor /SOLID lzma # General Symbol Definitions
!define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 0.6.0.10
+!define VERSION 0.6.4
!define COMPANY "Bitcoin project"
!define URL http://www.bitcoin.org/
@@ -45,13 +45,13 @@ Var StartMenuGroup !insertmacro MUI_LANGUAGE English
# Installer attributes
-OutFile bitcoin-0.6.0.10-win32-setup.exe
+OutFile bitcoin-0.6.4-win32-setup.exe
InstallDir $PROGRAMFILES\Bitcoin
CRCCheck on
XPStyle on
BrandingText " "
ShowInstDetails show
-VIProductVersion 0.6.0.10
+VIProductVersion 0.6.4.0
VIAddVersionKey ProductName Bitcoin
VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"
diff --git a/src/addrman.cpp b/src/addrman.cpp index cdc5957726..8257a46a15 100644 --- a/src/addrman.cpp +++ b/src/addrman.cpp @@ -8,12 +8,12 @@ using namespace std; int CAddrInfo::GetTriedBucket(const std::vector<unsigned char> &nKey) const { - CDataStream ss1(SER_GETHASH); + CDataStream ss1(SER_GETHASH, 0); std::vector<unsigned char> vchKey = GetKey(); ss1 << nKey << vchKey; uint64 hash1 = Hash(ss1.begin(), ss1.end()).Get64(); - CDataStream ss2(SER_GETHASH); + CDataStream ss2(SER_GETHASH, 0); std::vector<unsigned char> vchGroupKey = GetGroup(); ss2 << nKey << vchGroupKey << (hash1 % ADDRMAN_TRIED_BUCKETS_PER_GROUP); uint64 hash2 = Hash(ss2.begin(), ss2.end()).Get64(); @@ -22,13 +22,13 @@ int CAddrInfo::GetTriedBucket(const std::vector<unsigned char> &nKey) const int CAddrInfo::GetNewBucket(const std::vector<unsigned char> &nKey, const CNetAddr& src) const { - CDataStream ss1(SER_GETHASH); + CDataStream ss1(SER_GETHASH, 0); std::vector<unsigned char> vchGroupKey = GetGroup(); std::vector<unsigned char> vchSourceGroupKey = src.GetGroup(); ss1 << nKey << vchGroupKey << vchSourceGroupKey; uint64 hash1 = Hash(ss1.begin(), ss1.end()).Get64(); - CDataStream ss2(SER_GETHASH); + CDataStream ss2(SER_GETHASH, 0); ss2 << nKey << vchSourceGroupKey << (hash1 % ADDRMAN_NEW_BUCKETS_PER_SOURCE_GROUP); uint64 hash2 = Hash(ss2.begin(), ss2.end()).Get64(); return hash2 % ADDRMAN_NEW_BUCKET_COUNT; @@ -107,9 +107,15 @@ void CAddrMan::SwapRandom(int nRndPos1, int nRndPos2) if (nRndPos1 == nRndPos2) return; + assert(nRndPos1 >= 0 && nRndPos2 >= 0); + assert(nRndPos1 < vRandom.size() && nRndPos2 < vRandom.size()); + int nId1 = vRandom[nRndPos1]; int nId2 = vRandom[nRndPos2]; + assert(mapInfo.count(nId1) == 1); + assert(mapInfo.count(nId2) == 1); + mapInfo[nId1].nRandomPos = nRndPos2; mapInfo[nId2].nRandomPos = nRndPos1; @@ -131,6 +137,7 @@ int CAddrMan::SelectTried(int nKBucket) int nTemp = vTried[nPos]; vTried[nPos] = vTried[i]; vTried[i] = nTemp; + assert(nOldest == -1 || mapInfo.count(nTemp) == 1); if (nOldest == -1 || mapInfo[nTemp].nLastSuccess < mapInfo[nOldest].nLastSuccess) { nOldest = nTemp; nOldestPos = nPos; @@ -142,11 +149,13 @@ int CAddrMan::SelectTried(int nKBucket) int CAddrMan::ShrinkNew(int nUBucket) { + assert(nUBucket >= 0 && nUBucket < vvNew.size()); std::set<int> &vNew = vvNew[nUBucket]; // first look for deletable items for (std::set<int>::iterator it = vNew.begin(); it != vNew.end(); it++) { + assert(mapInfo.count(*it)); CAddrInfo &info = mapInfo[*it]; if (info.IsTerrible()) { @@ -171,11 +180,13 @@ int CAddrMan::ShrinkNew(int nUBucket) { if (nI == n[0] || nI == n[1] || nI == n[2] || nI == n[3]) { + assert(nOldest == -1 || mapInfo.count(*it) == 1); if (nOldest == -1 || mapInfo[*it].nTime < mapInfo[nOldest].nTime) nOldest = *it; } nI++; } + assert(mapInfo.count(nOldest) == 1); CAddrInfo &info = mapInfo[nOldest]; if (--info.nRefCount == 0) { @@ -192,6 +203,8 @@ int CAddrMan::ShrinkNew(int nUBucket) void CAddrMan::MakeTried(CAddrInfo& info, int nId, int nOrigin) { + assert(vvNew[nOrigin].count(nId) == 1); + // remove the entry from all new buckets for (std::vector<std::set<int> >::iterator it = vvNew.begin(); it != vvNew.end(); it++) { @@ -200,6 +213,8 @@ void CAddrMan::MakeTried(CAddrInfo& info, int nId, int nOrigin) } nNew--; + assert(info.nRefCount == 0); + // what tried bucket to move the entry to int nKBucket = info.GetTriedBucket(nKey); std::vector<int> &vTried = vvTried[nKBucket]; @@ -217,6 +232,7 @@ void CAddrMan::MakeTried(CAddrInfo& info, int nId, int nOrigin) int nPos = SelectTried(nKBucket); // find which new bucket it belongs to + assert(mapInfo.count(vTried[nPos]) == 1); int nUBucket = mapInfo[vTried[nPos]].GetNewBucket(nKey); std::set<int> &vNew = vvNew[nUBucket]; @@ -388,6 +404,7 @@ CAddress CAddrMan::Select_(int nUnkBias) std::vector<int> &vTried = vvTried[nKBucket]; if (vTried.size() == 0) continue; int nPos = GetRandInt(vTried.size()); + assert(mapInfo.count(vTried[nPos]) == 1); CAddrInfo &info = mapInfo[vTried[nPos]]; if (GetRandInt(1<<30) < fChanceFactor*info.GetChance()*(1<<30)) return info; @@ -405,6 +422,7 @@ CAddress CAddrMan::Select_(int nUnkBias) std::set<int>::iterator it = vNew.begin(); while (nPos--) it++; + assert(mapInfo.count(*it) == 1); CAddrInfo &info = mapInfo[*it]; if (GetRandInt(1<<30) < fChanceFactor*info.GetChance()*(1<<30)) return info; @@ -484,6 +502,7 @@ void CAddrMan::GetAddr_(std::vector<CAddress> &vAddr) { int nRndPos = GetRandInt(vRandom.size() - n) + n; SwapRandom(n, nRndPos); + assert(mapInfo.count(vRandom[n]) == 1); vAddr.push_back(mapInfo[vRandom[n]]); } } diff --git a/src/addrman.h b/src/addrman.h index 5d1606698b..526c838025 100644 --- a/src/addrman.h +++ b/src/addrman.h @@ -266,8 +266,8 @@ public: // // This format is more complex, but significantly smaller (at most 1.5 MiB), and supports // changes to the ADDRMAN_ parameters without breaking the on-disk structure. - CRITICAL_BLOCK(cs) { + LOCK(cs); unsigned char nVersion = 0; READWRITE(nVersion); READWRITE(nKey); @@ -398,8 +398,8 @@ public: void Check() { #ifdef DEBUG_ADDRMAN - CRITICAL_BLOCK(cs) { + LOCK(cs); int err; if ((err=Check_())) printf("ADDRMAN CONSISTENCY CHECK FAILED!!! err=%i\n", err); @@ -411,8 +411,8 @@ public: bool Add(const CAddress &addr, const CNetAddr& source, int64 nTimePenalty = 0) { bool fRet = false; - CRITICAL_BLOCK(cs) { + LOCK(cs); Check(); fRet |= Add_(addr, source, nTimePenalty); Check(); @@ -426,8 +426,8 @@ public: bool Add(const std::vector<CAddress> &vAddr, const CNetAddr& source, int64 nTimePenalty = 0) { int nAdd = 0; - CRITICAL_BLOCK(cs) { + LOCK(cs); Check(); for (std::vector<CAddress>::const_iterator it = vAddr.begin(); it != vAddr.end(); it++) nAdd += Add_(*it, source, nTimePenalty) ? 1 : 0; @@ -441,8 +441,8 @@ public: // Mark an entry as accessible. void Good(const CService &addr, int64 nTime = GetAdjustedTime()) { - CRITICAL_BLOCK(cs) { + LOCK(cs); Check(); Good_(addr, nTime); Check(); @@ -452,8 +452,8 @@ public: // Mark an entry as connection attempted to. void Attempt(const CService &addr, int64 nTime = GetAdjustedTime()) { - CRITICAL_BLOCK(cs) { + LOCK(cs); Check(); Attempt_(addr, nTime); Check(); @@ -465,8 +465,8 @@ public: CAddress Select(int nUnkBias = 50) { CAddress addrRet; - CRITICAL_BLOCK(cs) { + LOCK(cs); Check(); addrRet = Select_(nUnkBias); Check(); @@ -479,8 +479,10 @@ public: { Check(); std::vector<CAddress> vAddr; - CRITICAL_BLOCK(cs) + { + LOCK(cs); GetAddr_(vAddr); + } Check(); return vAddr; } @@ -488,8 +490,8 @@ public: // Mark an entry as currently-connected-to. void Connected(const CService &addr, int64 nTime = GetAdjustedTime()) { - CRITICAL_BLOCK(cs) { + LOCK(cs); Check(); Connected_(addr, nTime); Check(); diff --git a/src/allocators.h b/src/allocators.h new file mode 100644 index 0000000000..ddeabc48c5 --- /dev/null +++ b/src/allocators.h @@ -0,0 +1,122 @@ +// Copyright (c) 2009-2010 Satoshi Nakamoto +// Copyright (c) 2009-2012 The Bitcoin developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. +#ifndef BITCOIN_ALLOCATORS_H +#define BITCOIN_ALLOCATORS_H + +#include <string.h> +#include <string> + +#ifdef WIN32 +#ifdef _WIN32_WINNT +#undef _WIN32_WINNT +#endif +#define _WIN32_WINNT 0x0501 +#define WIN32_LEAN_AND_MEAN 1 +#ifndef NOMINMAX +#define NOMINMAX +#endif +#include <windows.h> +// This is used to attempt to keep keying material out of swap +// Note that VirtualLock does not provide this as a guarantee on Windows, +// but, in practice, memory that has been VirtualLock'd almost never gets written to +// the pagefile except in rare circumstances where memory is extremely low. +#define mlock(p, n) VirtualLock((p), (n)); +#define munlock(p, n) VirtualUnlock((p), (n)); +#else +#include <sys/mman.h> +#include <limits.h> +/* This comes from limits.h if it's not defined there set a sane default */ +#ifndef PAGESIZE +#include <unistd.h> +#define PAGESIZE sysconf(_SC_PAGESIZE) +#endif +#define mlock(a,b) \ + mlock(((void *)(((size_t)(a)) & (~((PAGESIZE)-1)))),\ + (((((size_t)(a)) + (b) - 1) | ((PAGESIZE) - 1)) + 1) - (((size_t)(a)) & (~((PAGESIZE) - 1)))) +#define munlock(a,b) \ + munlock(((void *)(((size_t)(a)) & (~((PAGESIZE)-1)))),\ + (((((size_t)(a)) + (b) - 1) | ((PAGESIZE) - 1)) + 1) - (((size_t)(a)) & (~((PAGESIZE) - 1)))) +#endif + +// +// Allocator that locks its contents from being paged +// out of memory and clears its contents before deletion. +// +template<typename T> +struct secure_allocator : public std::allocator<T> +{ + // MSVC8 default copy constructor is broken + typedef std::allocator<T> base; + typedef typename base::size_type size_type; + typedef typename base::difference_type difference_type; + typedef typename base::pointer pointer; + typedef typename base::const_pointer const_pointer; + typedef typename base::reference reference; + typedef typename base::const_reference const_reference; + typedef typename base::value_type value_type; + secure_allocator() throw() {} + secure_allocator(const secure_allocator& a) throw() : base(a) {} + template <typename U> + secure_allocator(const secure_allocator<U>& a) throw() : base(a) {} + ~secure_allocator() throw() {} + template<typename _Other> struct rebind + { typedef secure_allocator<_Other> other; }; + + T* allocate(std::size_t n, const void *hint = 0) + { + T *p; + p = std::allocator<T>::allocate(n, hint); + if (p != NULL) + mlock(p, sizeof(T) * n); + return p; + } + + void deallocate(T* p, std::size_t n) + { + if (p != NULL) + { + memset(p, 0, sizeof(T) * n); + munlock(p, sizeof(T) * n); + } + std::allocator<T>::deallocate(p, n); + } +}; + + +// +// Allocator that clears its contents before deletion. +// +template<typename T> +struct zero_after_free_allocator : public std::allocator<T> +{ + // MSVC8 default copy constructor is broken + typedef std::allocator<T> base; + typedef typename base::size_type size_type; + typedef typename base::difference_type difference_type; + typedef typename base::pointer pointer; + typedef typename base::const_pointer const_pointer; + typedef typename base::reference reference; + typedef typename base::const_reference const_reference; + typedef typename base::value_type value_type; + zero_after_free_allocator() throw() {} + zero_after_free_allocator(const zero_after_free_allocator& a) throw() : base(a) {} + template <typename U> + zero_after_free_allocator(const zero_after_free_allocator<U>& a) throw() : base(a) {} + ~zero_after_free_allocator() throw() {} + template<typename _Other> struct rebind + { typedef zero_after_free_allocator<_Other> other; }; + + void deallocate(T* p, std::size_t n) + { + if (p != NULL) + memset(p, 0, sizeof(T) * n); + std::allocator<T>::deallocate(p, n); + } +}; + +// This is exactly like std::string, but with a custom allocator. +typedef std::basic_string<char, std::char_traits<char>, secure_allocator<char> > SecureString; + +#endif diff --git a/src/bignum.h b/src/bignum.h index 69da72460f..9fea3f70fb 100644 --- a/src/bignum.h +++ b/src/bignum.h @@ -9,7 +9,7 @@ #include <vector> #include <openssl/bn.h> -#include "util.h" +#include "util.h" // for uint64 /** Errors thrown by the bignum class */ class bignum_error : public std::runtime_error @@ -47,7 +47,7 @@ public: }; -/** C++ wrapper for BIGNUM (OpenSSl bignum) */ +/** C++ wrapper for BIGNUM (OpenSSL bignum) */ class CBigNum : public BIGNUM { public: @@ -117,9 +117,9 @@ public: { unsigned long n = BN_get_word(this); if (!BN_is_negative(this)) - return (n > std::numeric_limits<int>::max() ? std::numeric_limits<int>::max() : n); + return (n > (unsigned long)std::numeric_limits<int>::max() ? std::numeric_limits<int>::max() : n); else - return (n > std::numeric_limits<int>::max() ? std::numeric_limits<int>::min() : -(int)n); + return (n > (unsigned long)std::numeric_limits<int>::max() ? std::numeric_limits<int>::min() : -(int)n); } void setint64(int64 sn) @@ -230,7 +230,7 @@ public: if (vch.size() > 4) vch[4] &= 0x7f; uint256 n = 0; - for (int i = 0, j = vch.size()-1; i < sizeof(n) && j >= 4; i++, j--) + for (unsigned int i = 0, j = vch.size()-1; i < sizeof(n) && j >= 4; i++, j--) ((unsigned char*)&n)[i] = vch[j]; return n; } diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 8899b11831..d737657928 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -3,10 +3,15 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "headers.h" +#include "main.h" +#include "wallet.h" #include "db.h" +#include "walletdb.h" #include "net.h" #include "init.h" +#include "ui_interface.h" +#include "bitcoinrpc.h" + #undef printf #include <boost/asio.hpp> #include <boost/filesystem.hpp> @@ -14,15 +19,10 @@ #include <boost/iostreams/stream.hpp> #include <boost/algorithm/string.hpp> #include <boost/lexical_cast.hpp> -#ifdef USE_SSL #include <boost/asio/ssl.hpp> -#include <boost/filesystem.hpp> #include <boost/filesystem/fstream.hpp> typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> SSLStream; -#endif -#include "json/json_spirit_reader_template.h" -#include "json/json_spirit_writer_template.h" -#include "json/json_spirit_utils.h" + #define printf OutputDebugStringF // MinGW 3.4.5 gets "fatal error: had to relocate PCH" if the json headers are // precompiled in headers.h. The problem might be when the pch file goes over @@ -35,8 +35,6 @@ using namespace boost::asio; using namespace json_spirit; void ThreadRPCServer2(void* parg); -typedef Value(*rpcfn_type)(const Array& params, bool fHelp); -extern map<string, rpcfn_type> mapCallTable; static std::string strRPCUserColonPass; @@ -140,7 +138,7 @@ Object blockToJSON(const CBlock& block, const CBlockIndex* blockindex) { Object result; result.push_back(Pair("hash", block.GetHash().GetHex())); - result.push_back(Pair("size", (int)::GetSerializeSize(block, SER_NETWORK))); + result.push_back(Pair("size", (int)::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION))); result.push_back(Pair("height", blockindex->nHeight)); result.push_back(Pair("version", block.nVersion)); result.push_back(Pair("merkleroot", block.hashMerkleRoot.GetHex())); @@ -166,23 +164,14 @@ Object blockToJSON(const CBlock& block, const CBlockIndex* blockindex) /// Note: This interface may still be subject to change. /// - -Value help(const Array& params, bool fHelp) +string CRPCTable::help(string strCommand) const { - if (fHelp || params.size() > 1) - throw runtime_error( - "help [command]\n" - "List commands, or get help for a command."); - - string strCommand; - if (params.size() > 0) - strCommand = params[0].get_str(); - string strRet; set<rpcfn_type> setDone; - for (map<string, rpcfn_type>::iterator mi = mapCallTable.begin(); mi != mapCallTable.end(); ++mi) + for (map<string, const CRPCCommand*>::const_iterator mi = mapCommands.begin(); mi != mapCommands.end(); ++mi) { - string strMethod = (*mi).first; + const CRPCCommand *pcmd = mi->second; + string strMethod = mi->first; // We already filter duplicates, but these deprecated screw up the sort order if (strMethod == "getamountreceived" || strMethod == "getallreceived" || @@ -194,7 +183,7 @@ Value help(const Array& params, bool fHelp) try { Array params; - rpcfn_type pfn = (*mi).second; + rpcfn_type pfn = pcmd->actor; if (setDone.insert(pfn).second) (*pfn)(params, true); } @@ -214,6 +203,20 @@ Value help(const Array& params, bool fHelp) return strRet; } +Value help(const Array& params, bool fHelp) +{ + if (fHelp || params.size() > 1) + throw runtime_error( + "help [command]\n" + "List commands, or get help for a command."); + + string strCommand; + if (params.size() > 0) + strCommand = params[0].get_str(); + + return tableRPC.help(strCommand); +} + Value stop(const Array& params, bool fHelp) { @@ -221,14 +224,9 @@ Value stop(const Array& params, bool fHelp) throw runtime_error( "stop\n" "Stop bitcoin server."); -#ifndef QT_GUI // Shutdown will take long enough that the response should get back - // NOTE: This should actually work with Bitcoin-Qt too now, but 0.6.0 didn't allow it StartShutdown(); return "bitcoin server stopping"; -#else - throw runtime_error("NYI: cannot shut down GUI with RPC command"); -#endif } @@ -370,7 +368,7 @@ Value getmininginfo(const Array& params, bool fHelp) obj.push_back(Pair("generate", GetBoolArg("-gen"))); obj.push_back(Pair("genproclimit", (int)GetArg("-genproclimit", -1))); obj.push_back(Pair("hashespersec", gethashespersec(params, false))); - obj.push_back(Pair("pooledtx", (uint64_t)nPooledTx)); + obj.push_back(Pair("pooledtx", (uint64_t)mempool.size())); obj.push_back(Pair("testnet", fTestNet)); return obj; } @@ -605,7 +603,7 @@ Value signmessage(const Array& params, bool fHelp) if (!pwalletMain->GetKey(addr, key)) throw JSONRPCError(-4, "Private key not available"); - CDataStream ss(SER_GETHASH); + CDataStream ss(SER_GETHASH, 0); ss << strMessageMagic; ss << strMessage; @@ -637,7 +635,7 @@ Value verifymessage(const Array& params, bool fHelp) if (fInvalid) throw JSONRPCError(-5, "Malformed base64 encoding"); - CDataStream ss(SER_GETHASH); + CDataStream ss(SER_GETHASH, 0); ss << strMessageMagic; ss << strMessage; @@ -995,8 +993,6 @@ Value addmultisigaddress(const Array& params, bool fHelp) "If [account] is specified, assign address to [account]."; throw runtime_error(msg); } - if (!fTestNet) - throw runtime_error("addmultisigaddress available only when running -testnet\n"); int nRequired = params[0].get_int(); const Array& keys = params[1].get_array(); @@ -1007,7 +1003,7 @@ Value addmultisigaddress(const Array& params, bool fHelp) // Gather public keys if (nRequired < 1) throw runtime_error("a multisignature address must require at least one key to redeem"); - if (keys.size() < nRequired) + if ((int)keys.size() < nRequired) throw runtime_error( strprintf("not enough keys supplied " "(got %d keys, but need at least %d to redeem)", keys.size(), nRequired)); @@ -1339,8 +1335,10 @@ Value listtransactions(const Array& params, bool fHelp) } // ret is newest to oldest - if (nFrom > ret.size()) nFrom = ret.size(); - if (nFrom+nCount > ret.size()) nCount = ret.size()-nFrom; + if (nFrom > (int)ret.size()) + nFrom = ret.size(); + if ((nFrom + nCount) > (int)ret.size()) + nCount = ret.size() - nFrom; Array::iterator first = ret.begin(); std::advance(first, nFrom); Array::iterator last = ret.begin(); @@ -1671,8 +1669,8 @@ Value walletlock(const Array& params, bool fHelp) if (!pwalletMain->IsCrypted()) throw JSONRPCError(-15, "Error: running with an unencrypted wallet, but walletlock was called."); - CRITICAL_BLOCK(cs_nWalletUnlockTime) { + LOCK(cs_nWalletUnlockTime); pwalletMain->Lock(); nWalletUnlockTime = 0; } @@ -1692,11 +1690,6 @@ Value encryptwallet(const Array& params, bool fHelp) if (pwalletMain->IsCrypted()) throw JSONRPCError(-15, "Error: running with an encrypted wallet, but encryptwallet was called."); -#ifdef QT_GUI - // shutting down via RPC while the GUI is running does not work (yet): - throw runtime_error("Not Yet Implemented: use GUI to encrypt wallet, not RPC command"); -#endif - // TODO: get rid of this .c_str() by implementing SecureString::operator=(std::string) // Alternately, find a way to make params[0] mlock()'d to begin with. SecureString strWalletPass; @@ -1959,7 +1952,7 @@ Value getmemorypool(const Array& params, bool fHelp) if(tx.IsCoinBase()) continue; - CDataStream ssTx; + CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION); ssTx << tx; transactions.push_back(HexStr(ssTx.begin(), ssTx.end())); @@ -1982,7 +1975,7 @@ Value getmemorypool(const Array& params, bool fHelp) else { // Parse parameters - CDataStream ssBlock(ParseHex(params[0].get_str())); + CDataStream ssBlock(ParseHex(params[0].get_str()), SER_NETWORK, PROTOCOL_VERSION); CBlock pblock; ssBlock >> pblock; @@ -2042,86 +2035,77 @@ Value getblock(const Array& params, bool fHelp) // Call Table // -pair<string, rpcfn_type> pCallTable[] = -{ - make_pair("help", &help), - make_pair("stop", &stop), - make_pair("getblockcount", &getblockcount), - make_pair("getblocknumber", &getblocknumber), - make_pair("getconnectioncount", &getconnectioncount), - make_pair("getdifficulty", &getdifficulty), - make_pair("getgenerate", &getgenerate), - make_pair("setgenerate", &setgenerate), - make_pair("gethashespersec", &gethashespersec), - make_pair("getinfo", &getinfo), - make_pair("getmininginfo", &getmininginfo), - make_pair("getnewaddress", &getnewaddress), - make_pair("getaccountaddress", &getaccountaddress), - make_pair("setaccount", &setaccount), - make_pair("getaccount", &getaccount), - make_pair("getaddressesbyaccount", &getaddressesbyaccount), - make_pair("sendtoaddress", &sendtoaddress), - make_pair("getreceivedbyaddress", &getreceivedbyaddress), - make_pair("getreceivedbyaccount", &getreceivedbyaccount), - make_pair("listreceivedbyaddress", &listreceivedbyaddress), - make_pair("listreceivedbyaccount", &listreceivedbyaccount), - make_pair("backupwallet", &backupwallet), - make_pair("keypoolrefill", &keypoolrefill), - make_pair("walletpassphrase", &walletpassphrase), - make_pair("walletpassphrasechange", &walletpassphrasechange), - make_pair("walletlock", &walletlock), - make_pair("encryptwallet", &encryptwallet), - make_pair("validateaddress", &validateaddress), - make_pair("getbalance", &getbalance), - make_pair("move", &movecmd), - make_pair("sendfrom", &sendfrom), - make_pair("sendmany", &sendmany), - make_pair("addmultisigaddress", &addmultisigaddress), - make_pair("getblock", &getblock), - make_pair("getblockhash", &getblockhash), - make_pair("gettransaction", &gettransaction), - make_pair("listtransactions", &listtransactions), - make_pair("signmessage", &signmessage), - make_pair("verifymessage", &verifymessage), - make_pair("getwork", &getwork), - make_pair("listaccounts", &listaccounts), - make_pair("settxfee", &settxfee), - make_pair("getmemorypool", &getmemorypool), - make_pair("listsinceblock", &listsinceblock), - make_pair("dumpprivkey", &dumpprivkey), - make_pair("importprivkey", &importprivkey) -}; -map<string, rpcfn_type> mapCallTable(pCallTable, pCallTable + sizeof(pCallTable)/sizeof(pCallTable[0])); - -string pAllowInSafeMode[] = -{ - "help", - "stop", - "getblockcount", - "getblocknumber", // deprecated - "getconnectioncount", - "getdifficulty", - "getgenerate", - "setgenerate", - "gethashespersec", - "getinfo", - "getmininginfo", - "getnewaddress", - "getaccountaddress", - "getaccount", - "getaddressesbyaccount", - "backupwallet", - "keypoolrefill", - "walletpassphrase", - "walletlock", - "validateaddress", - "getwork", - "getmemorypool", + +static const CRPCCommand vRPCCommands[] = +{ // name function safe mode? + // ------------------------ ----------------------- ---------- + { "help", &help, true }, + { "stop", &stop, true }, + { "getblockcount", &getblockcount, true }, + { "getblocknumber", &getblocknumber, true }, + { "getconnectioncount", &getconnectioncount, true }, + { "getdifficulty", &getdifficulty, true }, + { "getgenerate", &getgenerate, true }, + { "setgenerate", &setgenerate, true }, + { "gethashespersec", &gethashespersec, true }, + { "getinfo", &getinfo, true }, + { "getmininginfo", &getmininginfo, true }, + { "getnewaddress", &getnewaddress, true }, + { "getaccountaddress", &getaccountaddress, true }, + { "setaccount", &setaccount, true }, + { "getaccount", &getaccount, false }, + { "getaddressesbyaccount", &getaddressesbyaccount, true }, + { "sendtoaddress", &sendtoaddress, false }, + { "getreceivedbyaddress", &getreceivedbyaddress, false }, + { "getreceivedbyaccount", &getreceivedbyaccount, false }, + { "listreceivedbyaddress", &listreceivedbyaddress, false }, + { "listreceivedbyaccount", &listreceivedbyaccount, false }, + { "backupwallet", &backupwallet, true }, + { "keypoolrefill", &keypoolrefill, true }, + { "walletpassphrase", &walletpassphrase, true }, + { "walletpassphrasechange", &walletpassphrasechange, false }, + { "walletlock", &walletlock, true }, + { "encryptwallet", &encryptwallet, false }, + { "validateaddress", &validateaddress, true }, + { "getbalance", &getbalance, false }, + { "move", &movecmd, false }, + { "sendfrom", &sendfrom, false }, + { "sendmany", &sendmany, false }, + { "addmultisigaddress", &addmultisigaddress, false }, + { "getblock", &getblock, false }, + { "getblockhash", &getblockhash, false }, + { "gettransaction", &gettransaction, false }, + { "listtransactions", &listtransactions, false }, + { "signmessage", &signmessage, false }, + { "verifymessage", &verifymessage, false }, + { "getwork", &getwork, true }, + { "listaccounts", &listaccounts, false }, + { "settxfee", &settxfee, false }, + { "getmemorypool", &getmemorypool, true }, + { "listsinceblock", &listsinceblock, false }, + { "dumpprivkey", &dumpprivkey, false }, + { "importprivkey", &importprivkey, false }, }; -set<string> setAllowInSafeMode(pAllowInSafeMode, pAllowInSafeMode + sizeof(pAllowInSafeMode)/sizeof(pAllowInSafeMode[0])); +CRPCTable::CRPCTable() +{ + unsigned int vcidx; + for (vcidx = 0; vcidx < (sizeof(vRPCCommands) / sizeof(vRPCCommands[0])); vcidx++) + { + const CRPCCommand *pcmd; + pcmd = &vRPCCommands[vcidx]; + mapCommands[pcmd->name] = pcmd; + } +} +const CRPCCommand *CRPCTable::operator[](string name) const +{ + map<string, const CRPCCommand*>::const_iterator it = mapCommands.find(name); + if (it == mapCommands.end()) + return NULL; + return (*it).second; +} // // HTTP protocol @@ -2249,7 +2233,7 @@ int ReadHTTP(std::basic_istream<char>& stream, map<string, string>& mapHeadersRe // Read header int nLen = ReadHTTPHeader(stream, mapHeadersRet); - if (nLen < 0 || nLen > MAX_SIZE) + if (nLen < 0 || nLen > (int)MAX_SIZE) return 500; // Read message @@ -2326,7 +2310,6 @@ bool ClientAllowed(const string& strAddress) return false; } -#ifdef USE_SSL // // IOStream device that speaks SSL but can also speak non-SSL // @@ -2378,7 +2361,6 @@ private: bool fUseSSL; SSLStream& stream; }; -#endif void ThreadRPCServer(void* parg) { @@ -2421,12 +2403,10 @@ void ThreadRPCServer2(void* parg) "(you do not need to remember this password)\n" "If the file does not exist, create it with owner-readable-only file permissions.\n"), strWhatAmI.c_str(), - GetConfigFile().c_str(), + GetConfigFile().string().c_str(), EncodeBase58(&rand_pwd[0],&rand_pwd[0]+32).c_str()), _("Error"), wxOK | wxMODAL); -#ifndef QT_GUI StartShutdown(); -#endif return; } @@ -2435,11 +2415,6 @@ void ThreadRPCServer2(void* parg) asio::io_service io_service; ip::tcp::endpoint endpoint(bindAddress, GetArg("-rpcport", 8332)); -#ifndef QT_GUI - ip::tcp::acceptor acceptor(io_service, endpoint); - - acceptor.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true)); -#else ip::tcp::acceptor acceptor(io_service); try { @@ -2455,49 +2430,36 @@ void ThreadRPCServer2(void* parg) StartShutdown(); return; } -#endif -#ifdef USE_SSL ssl::context context(io_service, ssl::context::sslv23); if (fUseSSL) { context.set_options(ssl::context::no_sslv2); - filesystem::path certfile = GetArg("-rpcsslcertificatechainfile", "server.cert"); - if (!certfile.is_complete()) certfile = filesystem::path(GetDataDir()) / certfile; - if (filesystem::exists(certfile)) context.use_certificate_chain_file(certfile.string().c_str()); - else printf("ThreadRPCServer ERROR: missing server certificate file %s\n", certfile.string().c_str()); - filesystem::path pkfile = GetArg("-rpcsslprivatekeyfile", "server.pem"); - if (!pkfile.is_complete()) pkfile = filesystem::path(GetDataDir()) / pkfile; - if (filesystem::exists(pkfile)) context.use_private_key_file(pkfile.string().c_str(), ssl::context::pem); - else printf("ThreadRPCServer ERROR: missing server private key file %s\n", pkfile.string().c_str()); - - string ciphers = GetArg("-rpcsslciphers", - "TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH"); - SSL_CTX_set_cipher_list(context.impl(), ciphers.c_str()); - } -#else - if (fUseSSL) - throw runtime_error("-rpcssl=1, but bitcoin compiled without full openssl libraries."); -#endif + + filesystem::path pathCertFile(GetArg("-rpcsslcertificatechainfile", "server.cert")); + if (!pathCertFile.is_complete()) pathCertFile = filesystem::path(GetDataDir()) / pathCertFile; + if (filesystem::exists(pathCertFile)) context.use_certificate_chain_file(pathCertFile.string()); + else printf("ThreadRPCServer ERROR: missing server certificate file %s\n", pathCertFile.string().c_str()); + + filesystem::path pathPKFile(GetArg("-rpcsslprivatekeyfile", "server.pem")); + if (!pathPKFile.is_complete()) pathPKFile = filesystem::path(GetDataDir()) / pathPKFile; + if (filesystem::exists(pathPKFile)) context.use_private_key_file(pathPKFile.string(), ssl::context::pem); + else printf("ThreadRPCServer ERROR: missing server private key file %s\n", pathPKFile.string().c_str()); + + string strCiphers = GetArg("-rpcsslciphers", "TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH"); + SSL_CTX_set_cipher_list(context.impl(), strCiphers.c_str()); + } loop { // Accept connection -#ifdef USE_SSL SSLStream sslStream(io_service, context); SSLIOStreamDevice d(sslStream, fUseSSL); iostreams::stream<SSLIOStreamDevice> stream(d); -#else - ip::tcp::iostream stream; -#endif ip::tcp::endpoint peer; vnThreadsRunning[THREAD_RPCSERVER]--; -#ifdef USE_SSL acceptor.accept(sslStream.lowest_layer(), peer); -#else - acceptor.accept(*stream.rdbuf(), peer); -#endif vnThreadsRunning[4]++; if (fShutdown) return; @@ -2574,22 +2536,24 @@ void ThreadRPCServer2(void* parg) throw JSONRPCError(-32600, "Params must be an array"); // Find method - map<string, rpcfn_type>::iterator mi = mapCallTable.find(strMethod); - if (mi == mapCallTable.end()) + const CRPCCommand *pcmd = tableRPC[strMethod]; + if (!pcmd) throw JSONRPCError(-32601, "Method not found"); // Observe safe mode string strWarning = GetWarnings("rpc"); - if (strWarning != "" && !GetBoolArg("-disablesafemode") && !setAllowInSafeMode.count(strMethod)) + if (strWarning != "" && !GetBoolArg("-disablesafemode") && + !pcmd->okSafeMode) throw JSONRPCError(-2, string("Safe mode: ") + strWarning); try { // Execute Value result; - CRITICAL_BLOCK(cs_main) - CRITICAL_BLOCK(pwalletMain->cs_wallet) - result = (*(*mi).second)(params, false); + { + LOCK2(cs_main, pwalletMain->cs_wallet); + result = pcmd->actor(params, false); + } // Send reply string strReply = JSONRPCReply(result, Value::null, id); @@ -2620,11 +2584,10 @@ Object CallRPC(const string& strMethod, const Array& params) throw runtime_error(strprintf( _("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."), - GetConfigFile().c_str())); + GetConfigFile().string().c_str())); // Connect to localhost bool fUseSSL = GetBoolArg("-rpcssl"); -#ifdef USE_SSL asio::io_service io_service; ssl::context context(io_service, ssl::context::sslv23); context.set_options(ssl::context::no_sslv2); @@ -2633,15 +2596,6 @@ Object CallRPC(const string& strMethod, const Array& params) iostreams::stream<SSLIOStreamDevice> stream(d); if (!d.connect(GetArg("-rpcconnect", "127.0.0.1"), GetArg("-rpcport", "8332"))) throw runtime_error("couldn't connect to server"); -#else - if (fUseSSL) - throw runtime_error("-rpcssl=1, but bitcoin compiled without full openssl libraries."); - - ip::tcp::iostream stream(GetArg("-rpcconnect", "127.0.0.1"), GetArg("-rpcport", "8332")); - if (stream.fail()) - throw runtime_error("couldn't connect to server"); -#endif - // HTTP basic authentication string strUserPass64 = EncodeBase64(mapArgs["-rpcuser"] + ":" + mapArgs["-rpcpassword"]); @@ -2839,3 +2793,5 @@ int main(int argc, char *argv[]) return 0; } #endif + +const CRPCTable tableRPC; diff --git a/src/bitcoinrpc.h b/src/bitcoinrpc.h index 254def86b2..f8216867b6 100644 --- a/src/bitcoinrpc.h +++ b/src/bitcoinrpc.h @@ -3,5 +3,39 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#ifndef _BITCOINRPC_H_ +#define _BITCOINRPC_H_ 1 + +#include <string> +#include <map> + +#include "json/json_spirit_reader_template.h" +#include "json/json_spirit_writer_template.h" +#include "json/json_spirit_utils.h" + void ThreadRPCServer(void* parg); int CommandLineRPC(int argc, char *argv[]); + +typedef json_spirit::Value(*rpcfn_type)(const json_spirit::Array& params, bool fHelp); + +class CRPCCommand +{ +public: + std::string name; + rpcfn_type actor; + bool okSafeMode; +}; + +class CRPCTable +{ +private: + std::map<std::string, const CRPCCommand*> mapCommands; +public: + CRPCTable(); + const CRPCCommand* operator[](std::string name) const; + std::string help(std::string name) const; +}; + +extern const CRPCTable tableRPC; + +#endif diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 2d49f2b641..67e2c4cb78 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -5,9 +5,11 @@ #include <boost/assign/list_of.hpp> // for 'map_list_of()' #include <boost/foreach.hpp> -#include "headers.h" #include "checkpoints.h" +#include "main.h" +#include "uint256.h" + namespace Checkpoints { typedef std::map<int, uint256> MapCheckpoints; diff --git a/src/checkpoints.h b/src/checkpoints.h index df3e373782..70e936564c 100644 --- a/src/checkpoints.h +++ b/src/checkpoints.h @@ -5,7 +5,6 @@ #define BITCOIN_CHECKPOINT_H #include <map> -#include "util.h" class uint256; class CBlockIndex; diff --git a/src/compat.h b/src/compat.h index 0b4e2f8d43..79ebb9323a 100644 --- a/src/compat.h +++ b/src/compat.h @@ -5,6 +5,26 @@ #ifndef _BITCOIN_COMPAT_H #define _BITCOIN_COMPAT_H 1 +#ifdef WIN32 +#define _WIN32_WINNT 0x0501 +#define WIN32_LEAN_AND_MEAN 1 +#ifndef NOMINMAX +#define NOMINMAX +#endif +#include <winsock2.h> +#include <mswsock.h> +#include <ws2tcpip.h> +#else +#include <sys/types.h> +#include <sys/socket.h> +#include <sys/fcntl.h> +#include <arpa/inet.h> +#include <netdb.h> +#include <net/if.h> +#include <netinet/in.h> +#include <ifaddrs.h> +#endif + typedef u_int SOCKET; #ifdef WIN32 #define MSG_NOSIGNAL 0 @@ -39,4 +59,5 @@ inline int myclosesocket(SOCKET& hSocket) } #define closesocket(s) myclosesocket(s) + #endif diff --git a/src/crypter.cpp b/src/crypter.cpp index 134d2be02e..ca4618886d 100644 --- a/src/crypter.cpp +++ b/src/crypter.cpp @@ -6,14 +6,11 @@ #include <openssl/evp.h> #include <vector> #include <string> -#include "headers.h" #ifdef WIN32 #include <windows.h> #endif #include "crypter.h" -#include "main.h" -#include "util.h" bool CCrypter::SetKeyFromPassphrase(const SecureString& strKeyData, const std::vector<unsigned char>& chSalt, const unsigned int nRounds, const unsigned int nDerivationMethod) { diff --git a/src/crypter.h b/src/crypter.h index 698027c4f6..f46c32a227 100644 --- a/src/crypter.h +++ b/src/crypter.h @@ -4,8 +4,9 @@ #ifndef __CRYPTER_H__ #define __CRYPTER_H__ -#include "util.h" /* for SecureString */ +#include "allocators.h" /* for SecureString */ #include "key.h" +#include "serialize.h" const unsigned int WALLET_CRYPTO_KEY_SIZE = 32; const unsigned int WALLET_CRYPTO_SALT_SIZE = 8; diff --git a/src/db.cpp b/src/db.cpp index 6c5e7918c8..c67a34c39e 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -3,19 +3,22 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "headers.h" #include "db.h" -#include "net.h" +#include "util.h" +#include "main.h" #include <boost/version.hpp> #include <boost/filesystem.hpp> #include <boost/filesystem/fstream.hpp> +#ifndef WIN32 +#include "sys/stat.h" +#endif + using namespace std; using namespace boost; unsigned int nWalletDBUpdated; -uint64 nAccountingEntryNumber = 0; @@ -23,12 +26,12 @@ uint64 nAccountingEntryNumber = 0; // CDB // -static CCriticalSection cs_db; +CCriticalSection cs_db; static bool fDbEnvInit = false; +bool fDetachDB = false; DbEnv dbenv(0); -static map<string, int> mapFileUseCount; +map<string, int> mapFileUseCount; static map<string, Db*> mapDb; -static int64 nTxn = 0; static void EnvShutdown() { @@ -44,7 +47,7 @@ static void EnvShutdown() { printf("EnvShutdown exception: %s (%d)\n", e.what(), e.get_errno()); } - DbEnv(0).remove(GetDataDir().c_str(), 0); + DbEnv(0).remove(GetDataDir().string().c_str(), 0); } class CDBInit @@ -61,7 +64,7 @@ public: instance_of_cdbinit; -CDB::CDB(const char* pszFile, const char* pszMode) : pdb(NULL) +CDB::CDB(const char *pszFile, const char* pszMode) : pdb(NULL) { int ret; if (pszFile == NULL) @@ -73,29 +76,30 @@ CDB::CDB(const char* pszFile, const char* pszMode) : pdb(NULL) if (fCreate) nFlags |= DB_CREATE; - CRITICAL_BLOCK(cs_db) { + LOCK(cs_db); if (!fDbEnvInit) { if (fShutdown) return; - string strDataDir = GetDataDir(); - string strLogDir = strDataDir + "/database"; - filesystem::create_directory(strLogDir.c_str()); - string strErrorFile = strDataDir + "/db.log"; - printf("dbenv.open strLogDir=%s strErrorFile=%s\n", strLogDir.c_str(), strErrorFile.c_str()); + filesystem::path pathDataDir = GetDataDir(); + filesystem::path pathLogDir = pathDataDir / "database"; + filesystem::create_directory(pathLogDir); + filesystem::path pathErrorFile = pathDataDir / "db.log"; + printf("dbenv.open LogDir=%s ErrorFile=%s\n", pathLogDir.string().c_str(), pathErrorFile.string().c_str()); int nDbCache = GetArg("-dbcache", 25); - dbenv.set_lg_dir(strLogDir.c_str()); + dbenv.set_lg_dir(pathLogDir.string().c_str()); dbenv.set_cachesize(nDbCache / 1024, (nDbCache % 1024)*1048576, 1); dbenv.set_lg_bsize(1048576); dbenv.set_lg_max(10485760); dbenv.set_lk_max_locks(10000); dbenv.set_lk_max_objects(10000); - dbenv.set_errfile(fopen(strErrorFile.c_str(), "a")); /// debug + dbenv.set_errfile(fopen(pathErrorFile.string().c_str(), "a")); /// debug + dbenv.set_flags(DB_TXN_WRITE_NOSYNC, 1); dbenv.set_flags(DB_AUTO_COMMIT, 1); dbenv.log_set_config(DB_LOG_AUTO_REMOVE, 1); - ret = dbenv.open(strDataDir.c_str(), + ret = dbenv.open(pathDataDir.string().c_str(), DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | @@ -127,8 +131,10 @@ CDB::CDB(const char* pszFile, const char* pszMode) : pdb(NULL) { delete pdb; pdb = NULL; - CRITICAL_BLOCK(cs_db) + { + LOCK(cs_db); --mapFileUseCount[strFile]; + } strFile = ""; throw runtime_error(strprintf("CDB() : can't open database file %s, error %d", pszFile, ret)); } @@ -161,25 +167,23 @@ void CDB::Close() nMinutes = 1; if (strFile == "addr.dat") nMinutes = 2; + if (strFile == "blkindex.dat") + nMinutes = 2; if (strFile == "blkindex.dat" && IsInitialBlockDownload()) nMinutes = 5; - if (nMinutes == 0 || nTxn > 200000) - { - nTxn = 0; - nMinutes = 0; - } - - dbenv.txn_checkpoint(0, nMinutes, 0); + dbenv.txn_checkpoint(nMinutes ? GetArg("-dblogsize", 100)*1024 : 0, nMinutes, 0); - CRITICAL_BLOCK(cs_db) + { + LOCK(cs_db); --mapFileUseCount[strFile]; + } } -void static CloseDb(const string& strFile) +void CloseDb(const string& strFile) { - CRITICAL_BLOCK(cs_db) { + LOCK(cs_db); if (mapDb[strFile] != NULL) { // Close the database handle @@ -195,8 +199,8 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip) { while (!fShutdown) { - CRITICAL_BLOCK(cs_db) { + LOCK(cs_db); if (!mapFileUseCount.count(strFile) || mapFileUseCount[strFile] == 0) { // Flush log data to the dat file @@ -228,8 +232,8 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip) if (pcursor) while (fSuccess) { - CDataStream ssKey; - CDataStream ssValue; + CDataStream ssKey(SER_DISK, CLIENT_VERSION); + CDataStream ssValue(SER_DISK, CLIENT_VERSION); int ret = db.ReadAtCursor(pcursor, ssKey, ssValue, DB_NEXT); if (ret == DB_NOTFOUND) { @@ -293,8 +297,8 @@ void DBFlush(bool fShutdown) printf("DBFlush(%s)%s\n", fShutdown ? "true" : "false", fDbEnvInit ? "" : " db not started"); if (!fDbEnvInit) return; - CRITICAL_BLOCK(cs_db) { + LOCK(cs_db); map<string, int>::iterator mi = mapFileUseCount.begin(); while (mi != mapFileUseCount.end()) { @@ -305,9 +309,13 @@ void DBFlush(bool fShutdown) { // Move log data to the dat file CloseDb(strFile); + printf("%s checkpoint\n", strFile.c_str()); dbenv.txn_checkpoint(0, 0, 0); - printf("%s flush\n", strFile.c_str()); - dbenv.lsn_reset(strFile.c_str(), 0); + if ((strFile != "blkindex.dat" && strFile != "addr.dat") || fDetachDB) { + printf("%s detach\n", strFile.c_str()); + dbenv.lsn_reset(strFile.c_str(), 0); + } + printf("%s closed\n", strFile.c_str()); mapFileUseCount.erase(mi++); } else @@ -344,7 +352,6 @@ bool CTxDB::ReadTxIndex(uint256 hash, CTxIndex& txindex) bool CTxDB::UpdateTxIndex(uint256 hash, const CTxIndex& txindex) { assert(!fClient); - nTxn++; return Write(make_pair(string("tx"), hash), txindex); } @@ -355,7 +362,6 @@ bool CTxDB::AddTxIndex(const CTransaction& tx, const CDiskTxPos& pos, int nHeigh // Add to tx index uint256 hash = tx.GetHash(); CTxIndex txindex(pos, tx.vout.size()); - nTxn++; return Write(make_pair(string("tx"), hash), txindex); } @@ -387,10 +393,10 @@ bool CTxDB::ReadOwnerTxes(uint160 hash160, int nMinHeight, vector<CTransaction>& loop { // Read next record - CDataStream ssKey; + CDataStream ssKey(SER_DISK, CLIENT_VERSION); if (fFlags == DB_SET_RANGE) ssKey << string("owner") << hash160 << CDiskTxPos(0, 0, 0); - CDataStream ssValue; + CDataStream ssValue(SER_DISK, CLIENT_VERSION); int ret = ReadAtCursor(pcursor, ssKey, ssValue, fFlags); fFlags = DB_NEXT; if (ret == DB_NOTFOUND) @@ -521,10 +527,10 @@ bool CTxDB::LoadBlockIndex() loop { // Read next record - CDataStream ssKey; + CDataStream ssKey(SER_DISK, CLIENT_VERSION); if (fFlags == DB_SET_RANGE) ssKey << make_pair(string("blockindex"), uint256(0)); - CDataStream ssValue; + CDataStream ssValue(SER_DISK, CLIENT_VERSION); int ret = ReadAtCursor(pcursor, ssKey, ssValue, fFlags); fFlags = DB_NEXT; if (ret == DB_NOTFOUND) @@ -537,7 +543,7 @@ bool CTxDB::LoadBlockIndex() try { string strType; ssKey >> strType; - if (strType == "blockindex") + if (strType == "blockindex" && !fRequestShutdown) { CDiskBlockIndex diskindex; ssValue >> diskindex; @@ -564,7 +570,7 @@ bool CTxDB::LoadBlockIndex() } else { - break; + break; // if shutdown requested or finished loading block index } } // try catch (std::exception &e) { @@ -573,6 +579,9 @@ bool CTxDB::LoadBlockIndex() } pcursor->close(); + if (fRequestShutdown) + return true; + // Calculate bnChainWork vector<pair<int, CBlockIndex*> > vSortedByHeight; vSortedByHeight.reserve(mapBlockIndex.size()); @@ -657,7 +666,7 @@ bool CTxDB::LoadBlockIndex() } } // check level 4: check whether spent txouts were spent within the main chain - int nOutput = 0; + unsigned int nOutput = 0; if (nCheckLevel>3) { BOOST_FOREACH(const CDiskTxPos &txpos, txindex.vSpent) @@ -767,8 +776,8 @@ bool CAddrDB::LoadAddresses() loop { // Read next record - CDataStream ssKey; - CDataStream ssValue; + CDataStream ssKey(SER_DISK, CLIENT_VERSION); + CDataStream ssValue(SER_DISK, CLIENT_VERSION); int ret = ReadAtCursor(pcursor, ssKey, ssValue); if (ret == DB_NOTFOUND) break; @@ -803,419 +812,3 @@ bool LoadAddresses() } - - -// -// CWalletDB -// - -bool CWalletDB::WriteName(const string& strAddress, const string& strName) -{ - nWalletDBUpdated++; - return Write(make_pair(string("name"), strAddress), strName); -} - -bool CWalletDB::EraseName(const string& strAddress) -{ - // This should only be used for sending addresses, never for receiving addresses, - // receiving addresses must always have an address book entry if they're not change return. - nWalletDBUpdated++; - return Erase(make_pair(string("name"), strAddress)); -} - -bool CWalletDB::ReadAccount(const string& strAccount, CAccount& account) -{ - account.SetNull(); - return Read(make_pair(string("acc"), strAccount), account); -} - -bool CWalletDB::WriteAccount(const string& strAccount, const CAccount& account) -{ - return Write(make_pair(string("acc"), strAccount), account); -} - -bool CWalletDB::WriteAccountingEntry(const CAccountingEntry& acentry) -{ - return Write(boost::make_tuple(string("acentry"), acentry.strAccount, ++nAccountingEntryNumber), acentry); -} - -int64 CWalletDB::GetAccountCreditDebit(const string& strAccount) -{ - list<CAccountingEntry> entries; - ListAccountCreditDebit(strAccount, entries); - - int64 nCreditDebit = 0; - BOOST_FOREACH (const CAccountingEntry& entry, entries) - nCreditDebit += entry.nCreditDebit; - - return nCreditDebit; -} - -void CWalletDB::ListAccountCreditDebit(const string& strAccount, list<CAccountingEntry>& entries) -{ - bool fAllAccounts = (strAccount == "*"); - - Dbc* pcursor = GetCursor(); - if (!pcursor) - throw runtime_error("CWalletDB::ListAccountCreditDebit() : cannot create DB cursor"); - unsigned int fFlags = DB_SET_RANGE; - loop - { - // Read next record - CDataStream ssKey; - if (fFlags == DB_SET_RANGE) - ssKey << boost::make_tuple(string("acentry"), (fAllAccounts? string("") : strAccount), uint64(0)); - CDataStream ssValue; - int ret = ReadAtCursor(pcursor, ssKey, ssValue, fFlags); - fFlags = DB_NEXT; - if (ret == DB_NOTFOUND) - break; - else if (ret != 0) - { - pcursor->close(); - throw runtime_error("CWalletDB::ListAccountCreditDebit() : error scanning DB"); - } - - // Unserialize - string strType; - ssKey >> strType; - if (strType != "acentry") - break; - CAccountingEntry acentry; - ssKey >> acentry.strAccount; - if (!fAllAccounts && acentry.strAccount != strAccount) - break; - - ssValue >> acentry; - entries.push_back(acentry); - } - - pcursor->close(); -} - - -int CWalletDB::LoadWallet(CWallet* pwallet) -{ - pwallet->vchDefaultKey.clear(); - int nFileVersion = 0; - vector<uint256> vWalletUpgrade; - bool fIsEncrypted = false; - - //// todo: shouldn't we catch exceptions and try to recover and continue? - CRITICAL_BLOCK(pwallet->cs_wallet) - { - int nMinVersion = 0; - if (Read((string)"minversion", nMinVersion)) - { - if (nMinVersion > CLIENT_VERSION) - return DB_TOO_NEW; - pwallet->LoadMinVersion(nMinVersion); - } - - // Get cursor - Dbc* pcursor = GetCursor(); - if (!pcursor) - { - printf("Error getting wallet database cursor\n"); - return DB_CORRUPT; - } - - loop - { - // Read next record - CDataStream ssKey; - CDataStream ssValue; - int ret = ReadAtCursor(pcursor, ssKey, ssValue); - if (ret == DB_NOTFOUND) - break; - else if (ret != 0) - { - printf("Error reading next record from wallet database\n"); - return DB_CORRUPT; - } - - // Unserialize - // Taking advantage of the fact that pair serialization - // is just the two items serialized one after the other - string strType; - ssKey >> strType; - if (strType == "name") - { - string strAddress; - ssKey >> strAddress; - ssValue >> pwallet->mapAddressBook[strAddress]; - } - else if (strType == "tx") - { - uint256 hash; - ssKey >> hash; - CWalletTx& wtx = pwallet->mapWallet[hash]; - ssValue >> wtx; - wtx.BindWallet(pwallet); - - if (wtx.GetHash() != hash) - printf("Error in wallet.dat, hash mismatch\n"); - - // Undo serialize changes in 31600 - if (31404 <= wtx.fTimeReceivedIsTxTime && wtx.fTimeReceivedIsTxTime <= 31703) - { - if (!ssValue.empty()) - { - char fTmp; - char fUnused; - ssValue >> fTmp >> fUnused >> wtx.strFromAccount; - printf("LoadWallet() upgrading tx ver=%d %d '%s' %s\n", wtx.fTimeReceivedIsTxTime, fTmp, wtx.strFromAccount.c_str(), hash.ToString().c_str()); - wtx.fTimeReceivedIsTxTime = fTmp; - } - else - { - printf("LoadWallet() repairing tx ver=%d %s\n", wtx.fTimeReceivedIsTxTime, hash.ToString().c_str()); - wtx.fTimeReceivedIsTxTime = 0; - } - vWalletUpgrade.push_back(hash); - } - - //// debug print - //printf("LoadWallet %s\n", wtx.GetHash().ToString().c_str()); - //printf(" %12"PRI64d" %s %s %s\n", - // wtx.vout[0].nValue, - // DateTimeStrFormat("%x %H:%M:%S", wtx.GetBlockTime()).c_str(), - // wtx.hashBlock.ToString().substr(0,20).c_str(), - // wtx.mapValue["message"].c_str()); - } - else if (strType == "acentry") - { - string strAccount; - ssKey >> strAccount; - uint64 nNumber; - ssKey >> nNumber; - if (nNumber > nAccountingEntryNumber) - nAccountingEntryNumber = nNumber; - } - else if (strType == "key" || strType == "wkey") - { - vector<unsigned char> vchPubKey; - ssKey >> vchPubKey; - CKey key; - if (strType == "key") - { - CPrivKey pkey; - ssValue >> pkey; - key.SetPubKey(vchPubKey); - key.SetPrivKey(pkey); - if (key.GetPubKey() != vchPubKey) - { - printf("Error reading wallet database: CPrivKey pubkey inconsistency\n"); - return DB_CORRUPT; - } - if (!key.IsValid()) - { - printf("Error reading wallet database: invalid CPrivKey\n"); - return DB_CORRUPT; - } - } - else - { - CWalletKey wkey; - ssValue >> wkey; - key.SetPubKey(vchPubKey); - key.SetPrivKey(wkey.vchPrivKey); - if (key.GetPubKey() != vchPubKey) - { - printf("Error reading wallet database: CWalletKey pubkey inconsistency\n"); - return DB_CORRUPT; - } - if (!key.IsValid()) - { - printf("Error reading wallet database: invalid CWalletKey\n"); - return DB_CORRUPT; - } - } - if (!pwallet->LoadKey(key)) - { - printf("Error reading wallet database: LoadKey failed\n"); - return DB_CORRUPT; - } - } - else if (strType == "mkey") - { - unsigned int nID; - ssKey >> nID; - CMasterKey kMasterKey; - ssValue >> kMasterKey; - if(pwallet->mapMasterKeys.count(nID) != 0) - { - printf("Error reading wallet database: duplicate CMasterKey id %u\n", nID); - return DB_CORRUPT; - } - pwallet->mapMasterKeys[nID] = kMasterKey; - if (pwallet->nMasterKeyMaxID < nID) - pwallet->nMasterKeyMaxID = nID; - } - else if (strType == "ckey") - { - vector<unsigned char> vchPubKey; - ssKey >> vchPubKey; - vector<unsigned char> vchPrivKey; - ssValue >> vchPrivKey; - if (!pwallet->LoadCryptedKey(vchPubKey, vchPrivKey)) - { - printf("Error reading wallet database: LoadCryptedKey failed\n"); - return DB_CORRUPT; - } - fIsEncrypted = true; - } - else if (strType == "defaultkey") - { - ssValue >> pwallet->vchDefaultKey; - } - else if (strType == "pool") - { - int64 nIndex; - ssKey >> nIndex; - pwallet->setKeyPool.insert(nIndex); - } - else if (strType == "version") - { - ssValue >> nFileVersion; - if (nFileVersion == 10300) - nFileVersion = 300; - } - else if (strType == "cscript") - { - uint160 hash; - ssKey >> hash; - CScript script; - ssValue >> script; - if (!pwallet->LoadCScript(script)) - { - printf("Error reading wallet database: LoadCScript failed\n"); - return DB_CORRUPT; - } - } - } - pcursor->close(); - } - - BOOST_FOREACH(uint256 hash, vWalletUpgrade) - WriteTx(hash, pwallet->mapWallet[hash]); - - printf("nFileVersion = %d\n", nFileVersion); - - - // Rewrite encrypted wallets of versions 0.4.0 and 0.5.0rc: - if (fIsEncrypted && (nFileVersion == 40000 || nFileVersion == 50000)) - return DB_NEED_REWRITE; - - if (nFileVersion < CLIENT_VERSION) // Update - { - // Get rid of old debug.log file in current directory - if (nFileVersion <= 105 && !pszSetDataDir[0]) - unlink("debug.log"); - - WriteVersion(CLIENT_VERSION); - } - - return DB_LOAD_OK; -} - -void ThreadFlushWalletDB(void* parg) -{ - const string& strFile = ((const string*)parg)[0]; - static bool fOneThread; - if (fOneThread) - return; - fOneThread = true; - if (!GetBoolArg("-flushwallet", true)) - return; - - unsigned int nLastSeen = nWalletDBUpdated; - unsigned int nLastFlushed = nWalletDBUpdated; - int64 nLastWalletUpdate = GetTime(); - while (!fShutdown) - { - Sleep(500); - - if (nLastSeen != nWalletDBUpdated) - { - nLastSeen = nWalletDBUpdated; - nLastWalletUpdate = GetTime(); - } - - if (nLastFlushed != nWalletDBUpdated && GetTime() - nLastWalletUpdate >= 2) - { - TRY_CRITICAL_BLOCK(cs_db) - { - // Don't do this if any databases are in use - int nRefCount = 0; - map<string, int>::iterator mi = mapFileUseCount.begin(); - while (mi != mapFileUseCount.end()) - { - nRefCount += (*mi).second; - mi++; - } - - if (nRefCount == 0 && !fShutdown) - { - map<string, int>::iterator mi = mapFileUseCount.find(strFile); - if (mi != mapFileUseCount.end()) - { - printf("%s ", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str()); - printf("Flushing wallet.dat\n"); - nLastFlushed = nWalletDBUpdated; - int64 nStart = GetTimeMillis(); - - // Flush wallet.dat so it's self contained - CloseDb(strFile); - dbenv.txn_checkpoint(0, 0, 0); - dbenv.lsn_reset(strFile.c_str(), 0); - - mapFileUseCount.erase(mi++); - printf("Flushed wallet.dat %"PRI64d"ms\n", GetTimeMillis() - nStart); - } - } - } - } - } -} - -bool BackupWallet(const CWallet& wallet, const string& strDest) -{ - if (!wallet.fFileBacked) - return false; - while (!fShutdown) - { - CRITICAL_BLOCK(cs_db) - { - if (!mapFileUseCount.count(wallet.strWalletFile) || mapFileUseCount[wallet.strWalletFile] == 0) - { - // Flush log data to the dat file - CloseDb(wallet.strWalletFile); - dbenv.txn_checkpoint(0, 0, 0); - dbenv.lsn_reset(wallet.strWalletFile.c_str(), 0); - mapFileUseCount.erase(wallet.strWalletFile); - - // Copy wallet.dat - filesystem::path pathSrc(GetDataDir() + "/" + wallet.strWalletFile); - filesystem::path pathDest(strDest); - if (filesystem::is_directory(pathDest)) - pathDest = pathDest / wallet.strWalletFile; - - try { -#if BOOST_VERSION >= 104000 - filesystem::copy_file(pathSrc, pathDest, filesystem::copy_option::overwrite_if_exists); -#else - filesystem::copy_file(pathSrc, pathDest); -#endif - printf("copied wallet.dat to %s\n", pathDest.string().c_str()); - return true; - } catch(const filesystem::filesystem_error &e) { - printf("error copying wallet.dat to %s - %s\n", pathDest.string().c_str(), e.what()); - return false; - } - } - } - Sleep(100); - } - return false; -} @@ -5,7 +5,7 @@ #ifndef BITCOIN_DB_H #define BITCOIN_DB_H -#include "key.h" +#include "main.h" #include <map> #include <string> @@ -13,8 +13,6 @@ #include <db_cxx.h> -class CAccount; -class CAccountingEntry; class CAddress; class CAddrMan; class CBlockLocator; @@ -27,6 +25,7 @@ class CWallet; class CWalletTx; extern unsigned int nWalletDBUpdated; +extern bool fDetachDB; extern DbEnv dbenv; extern void DBFlush(bool fShutdown); @@ -59,7 +58,7 @@ protected: return false; // Key - CDataStream ssKey(SER_DISK); + CDataStream ssKey(SER_DISK, CLIENT_VERSION); ssKey.reserve(1000); ssKey << key; Dbt datKey(&ssKey[0], ssKey.size()); @@ -74,7 +73,7 @@ protected: // Unserialize value try { - CDataStream ssValue((char*)datValue.get_data(), (char*)datValue.get_data() + datValue.get_size(), SER_DISK); + CDataStream ssValue((char*)datValue.get_data(), (char*)datValue.get_data() + datValue.get_size(), SER_DISK, CLIENT_VERSION); ssValue >> value; } catch (std::exception &e) { @@ -96,13 +95,13 @@ protected: assert(!"Write called on database in read-only mode"); // Key - CDataStream ssKey(SER_DISK); + CDataStream ssKey(SER_DISK, CLIENT_VERSION); ssKey.reserve(1000); ssKey << key; Dbt datKey(&ssKey[0], ssKey.size()); // Value - CDataStream ssValue(SER_DISK); + CDataStream ssValue(SER_DISK, CLIENT_VERSION); ssValue.reserve(10000); ssValue << value; Dbt datValue(&ssValue[0], ssValue.size()); @@ -125,7 +124,7 @@ protected: assert(!"Erase called on database in read-only mode"); // Key - CDataStream ssKey(SER_DISK); + CDataStream ssKey(SER_DISK, CLIENT_VERSION); ssKey.reserve(1000); ssKey << key; Dbt datKey(&ssKey[0], ssKey.size()); @@ -145,7 +144,7 @@ protected: return false; // Key - CDataStream ssKey(SER_DISK); + CDataStream ssKey(SER_DISK, CLIENT_VERSION); ssKey.reserve(1000); ssKey << key; Dbt datKey(&ssKey[0], ssKey.size()); @@ -222,7 +221,7 @@ public: if (!pdb) return false; DbTxn* ptxn = NULL; - int ret = dbenv.txn_begin(GetTxn(), &ptxn, DB_TXN_NOSYNC); + int ret = dbenv.txn_begin(GetTxn(), &ptxn, DB_TXN_WRITE_NOSYNC); if (!ptxn || ret != 0) return false; vTxn.push_back(ptxn); @@ -318,198 +317,4 @@ public: bool LoadAddresses(); -/** A key pool entry */ -class CKeyPool -{ -public: - int64 nTime; - std::vector<unsigned char> vchPubKey; - - CKeyPool() - { - nTime = GetTime(); - } - - CKeyPool(const std::vector<unsigned char>& vchPubKeyIn) - { - nTime = GetTime(); - vchPubKey = vchPubKeyIn; - } - - IMPLEMENT_SERIALIZE - ( - if (!(nType & SER_GETHASH)) - READWRITE(nVersion); - READWRITE(nTime); - READWRITE(vchPubKey); - ) -}; - - - -/** Error statuses for the wallet database */ -enum DBErrors -{ - DB_LOAD_OK, - DB_CORRUPT, - DB_TOO_NEW, - DB_LOAD_FAIL, - DB_NEED_REWRITE -}; - -/** Access to the wallet database (wallet.dat) */ -class CWalletDB : public CDB -{ -public: - CWalletDB(std::string strFilename, const char* pszMode="r+") : CDB(strFilename.c_str(), pszMode) - { - } -private: - CWalletDB(const CWalletDB&); - void operator=(const CWalletDB&); -public: - bool ReadName(const std::string& strAddress, std::string& strName) - { - strName = ""; - return Read(std::make_pair(std::string("name"), strAddress), strName); - } - - bool WriteName(const std::string& strAddress, const std::string& strName); - - bool EraseName(const std::string& strAddress); - - bool ReadTx(uint256 hash, CWalletTx& wtx) - { - return Read(std::make_pair(std::string("tx"), hash), wtx); - } - - bool WriteTx(uint256 hash, const CWalletTx& wtx) - { - nWalletDBUpdated++; - return Write(std::make_pair(std::string("tx"), hash), wtx); - } - - bool EraseTx(uint256 hash) - { - nWalletDBUpdated++; - return Erase(std::make_pair(std::string("tx"), hash)); - } - - bool ReadKey(const std::vector<unsigned char>& vchPubKey, CPrivKey& vchPrivKey) - { - vchPrivKey.clear(); - return Read(std::make_pair(std::string("key"), vchPubKey), vchPrivKey); - } - - bool WriteKey(const std::vector<unsigned char>& vchPubKey, const CPrivKey& vchPrivKey) - { - nWalletDBUpdated++; - return Write(std::make_pair(std::string("key"), vchPubKey), vchPrivKey, false); - } - - bool WriteCryptedKey(const std::vector<unsigned char>& vchPubKey, const std::vector<unsigned char>& vchCryptedSecret, bool fEraseUnencryptedKey = true) - { - nWalletDBUpdated++; - if (!Write(std::make_pair(std::string("ckey"), vchPubKey), vchCryptedSecret, false)) - return false; - if (fEraseUnencryptedKey) - { - Erase(std::make_pair(std::string("key"), vchPubKey)); - Erase(std::make_pair(std::string("wkey"), vchPubKey)); - } - return true; - } - - bool WriteMasterKey(unsigned int nID, const CMasterKey& kMasterKey) - { - nWalletDBUpdated++; - return Write(std::make_pair(std::string("mkey"), nID), kMasterKey, true); - } - - // Support for BIP 0013 : see https://en.bitcoin.it/wiki/BIP_0013 - bool ReadCScript(const uint160 &hash, CScript& redeemScript) - { - redeemScript.clear(); - return Read(std::make_pair(std::string("cscript"), hash), redeemScript); - } - - bool WriteCScript(const uint160& hash, const CScript& redeemScript) - { - nWalletDBUpdated++; - return Write(std::make_pair(std::string("cscript"), hash), redeemScript, false); - } - - bool WriteBestBlock(const CBlockLocator& locator) - { - nWalletDBUpdated++; - return Write(std::string("bestblock"), locator); - } - - bool ReadBestBlock(CBlockLocator& locator) - { - return Read(std::string("bestblock"), locator); - } - - bool ReadDefaultKey(std::vector<unsigned char>& vchPubKey) - { - vchPubKey.clear(); - return Read(std::string("defaultkey"), vchPubKey); - } - - bool WriteDefaultKey(const std::vector<unsigned char>& vchPubKey) - { - nWalletDBUpdated++; - return Write(std::string("defaultkey"), vchPubKey); - } - - bool ReadPool(int64 nPool, CKeyPool& keypool) - { - return Read(std::make_pair(std::string("pool"), nPool), keypool); - } - - bool WritePool(int64 nPool, const CKeyPool& keypool) - { - nWalletDBUpdated++; - return Write(std::make_pair(std::string("pool"), nPool), keypool); - } - - bool ErasePool(int64 nPool) - { - nWalletDBUpdated++; - return Erase(std::make_pair(std::string("pool"), nPool)); - } - - // Settings are no longer stored in wallet.dat; these are - // used only for backwards compatibility: - template<typename T> - bool ReadSetting(const std::string& strKey, T& value) - { - return Read(std::make_pair(std::string("setting"), strKey), value); - } - template<typename T> - bool WriteSetting(const std::string& strKey, const T& value) - { - nWalletDBUpdated++; - return Write(std::make_pair(std::string("setting"), strKey), value); - } - bool EraseSetting(const std::string& strKey) - { - nWalletDBUpdated++; - return Erase(std::make_pair(std::string("setting"), strKey)); - } - - bool WriteMinVersion(int nVersion) - { - return Write(std::string("minversion"), nVersion); - } - - bool ReadAccount(const std::string& strAccount, CAccount& account); - bool WriteAccount(const std::string& strAccount, const CAccount& account); - bool WriteAccountingEntry(const CAccountingEntry& acentry); - int64 GetAccountCreditDebit(const std::string& strAccount); - void ListAccountCreditDebit(const std::string& strAccount, std::list<CAccountingEntry>& acentries); - - int LoadWallet(CWallet* pwallet); -}; - -#endif +#endif // BITCOIN_DB_H diff --git a/src/headers.h b/src/headers.h deleted file mode 100644 index fb86a6fe02..0000000000 --- a/src/headers.h +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2012 The Bitcoin developers -// Distributed under the MIT/X11 software license, see the accompanying -// file COPYING or http://www.opensource.org/licenses/mit-license.php. - -#ifdef _MSC_VER -#pragma warning(disable:4786) -#pragma warning(disable:4804) -#pragma warning(disable:4805) -#pragma warning(disable:4717) -#endif -#ifdef _WIN32_WINNT -#undef _WIN32_WINNT -#endif -#define _WIN32_WINNT 0x0501 -#ifdef _WIN32_IE -#undef _WIN32_IE -#endif -#define _WIN32_IE 0x0400 -#define WIN32_LEAN_AND_MEAN 1 - -// Include boost/foreach here as it defines __STDC_LIMIT_MACROS on some systems. -#include <boost/foreach.hpp> - -#if (defined(__unix__) || defined(unix)) && !defined(USG) -#include <sys/param.h> // to get BSD define -#endif -#ifdef MAC_OSX -#ifndef BSD -#define BSD 1 -#endif -#endif -#include <openssl/buffer.h> -#include <openssl/ecdsa.h> -#include <openssl/evp.h> -#include <openssl/rand.h> -#include <openssl/sha.h> -#include <openssl/ripemd.h> -#include <db_cxx.h> -#include <stdio.h> -#include <stdlib.h> -#include <time.h> -#include <math.h> -#include <float.h> -#include <assert.h> -#include <iostream> -#include <sstream> -#include <string> -#include <vector> -#include <list> -#include <deque> -#include <map> - -#ifdef WIN32 -#include <windows.h> -#include <winsock2.h> -#include <mswsock.h> -#include <shlobj.h> -#include <shlwapi.h> -#include <io.h> -#include <process.h> -#include <malloc.h> -#else -#include <sys/time.h> -#include <sys/resource.h> -#include <sys/socket.h> -#include <sys/stat.h> -#include <arpa/inet.h> -#include <netdb.h> -#include <unistd.h> -#include <errno.h> -#include <net/if.h> -#include <ifaddrs.h> -#include <fcntl.h> -#include <signal.h> -#endif -#ifdef BSD -#include <netinet/in.h> -#endif - - -#include "serialize.h" -#include "uint256.h" -#include "util.h" -#include "bignum.h" -#include "base58.h" -#include "main.h" -#ifdef QT_GUI -#include "qtui.h" -#else -#include "noui.h" -#endif diff --git a/src/init.cpp b/src/init.cpp index 6644d04ce3..f4168b1729 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -2,26 +2,20 @@ // Copyright (c) 2009-2012 The Bitcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "headers.h" #include "db.h" +#include "walletdb.h" #include "bitcoinrpc.h" #include "net.h" #include "init.h" -#include "strlcpy.h" +#include "util.h" +#include "ui_interface.h" #include <boost/filesystem.hpp> #include <boost/filesystem/fstream.hpp> #include <boost/filesystem/convenience.hpp> #include <boost/interprocess/sync/file_lock.hpp> -#if defined(BITCOIN_NEED_QT_PLUGINS) && !defined(_BITCOIN_QT_PLUGINS_INCLUDED) -#define _BITCOIN_QT_PLUGINS_INCLUDED -#define __INSURE__ -#include <QtPlugin> -Q_IMPORT_PLUGIN(qcncodecs) -Q_IMPORT_PLUGIN(qjpcodecs) -Q_IMPORT_PLUGIN(qtwcodecs) -Q_IMPORT_PLUGIN(qkrcodecs) -Q_IMPORT_PLUGIN(qtaccessiblewidgets) +#ifndef WIN32 +#include <signal.h> #endif using namespace std; @@ -58,10 +52,13 @@ void Shutdown(void* parg) static CCriticalSection cs_Shutdown; static bool fTaken; bool fFirstThread = false; - TRY_CRITICAL_BLOCK(cs_Shutdown) { - fFirstThread = !fTaken; - fTaken = true; + TRY_LOCK(cs_Shutdown, lockShutdown); + if (lockShutdown) + { + fFirstThread = !fTaken; + fTaken = true; + } } static bool fExit; if (fFirstThread) @@ -167,11 +164,12 @@ bool AppInit2(int argc, char* argv[]) // If Qt is used, parameters/bitcoin.conf are parsed in qt/bitcoin.cpp's main() #if !defined(QT_GUI) ParseParameters(argc, argv); - if (!ReadConfigFile(mapArgs, mapMultiArgs)) + if (!boost::filesystem::is_directory(GetDataDir(false))) { fprintf(stderr, "Error: Specified directory does not exist\n"); Shutdown(NULL); } + ReadConfigFile(mapArgs, mapMultiArgs); #endif if (mapArgs.count("-?") || mapArgs.count("--help")) @@ -192,6 +190,7 @@ bool AppInit2(int argc, char* argv[]) " -splash \t\t " + _("Show splash screen on startup (default: 1)") + "\n" + " -datadir=<dir> \t\t " + _("Specify data directory") + "\n" + " -dbcache=<n> \t\t " + _("Set database cache size in megabytes (default: 25)") + "\n" + + " -dblogsize=<n> \t\t " + _("Set database disk log size in megabytes (default: 100)") + "\n" + " -timeout=<n> \t " + _("Specify connection timeout (in milliseconds)") + "\n" + " -proxy=<ip:port> \t " + _("Connect through socks4 proxy") + "\n" + " -dns \t " + _("Allow DNS lookups for addnode and connect") + "\n" + @@ -215,6 +214,7 @@ bool AppInit2(int argc, char* argv[]) #else " -upnp \t " + _("Use Universal Plug and Play to map the listening port (default: 0)") + "\n" + #endif + " -detachdb \t " + _("Detach block and address databases. Increases shutdown time (default: 0)") + "\n" + #endif " -paytxfee=<amt> \t " + _("Fee per KB to add to transactions you send") + "\n" + #ifdef QT_GUI @@ -242,14 +242,12 @@ bool AppInit2(int argc, char* argv[]) " -checkblocks=<n> \t\t " + _("How many blocks to check at startup (default: 2500, 0 = all)") + "\n" + " -checklevel=<n> \t\t " + _("How thorough the block verification is (0-6, default: 1)") + "\n"; -#ifdef USE_SSL strUsage += string() + _("\nSSL options: (see the Bitcoin Wiki for SSL setup instructions)") + "\n" + " -rpcssl \t " + _("Use OpenSSL (https) for JSON-RPC connections") + "\n" + " -rpcsslcertificatechainfile=<file.cert>\t " + _("Server certificate file (default: server.cert)") + "\n" + " -rpcsslprivatekeyfile=<file.pem> \t " + _("Server private key (default: server.pem)") + "\n" + " -rpcsslciphers=<ciphers> \t " + _("Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)") + "\n"; -#endif strUsage += string() + " -? \t\t " + _("This help message") + "\n"; @@ -258,7 +256,7 @@ bool AppInit2(int argc, char* argv[]) strUsage.erase(std::remove(strUsage.begin(), strUsage.end(), '\t'), strUsage.end()); #if defined(QT_GUI) && defined(WIN32) // On Windows, show a message box, as there is no stderr - wxMessageBox(strUsage, "Usage"); + ThreadSafeMessageBox(strUsage, _("Usage"), wxOK | wxMODAL); #else fprintf(stdout, "%s", strUsage.c_str()); #endif @@ -272,6 +270,7 @@ bool AppInit2(int argc, char* argv[]) } fDebug = GetBoolArg("-debug"); + fDetachDB = GetBoolArg("-detachdb", false); #if !defined(WIN32) && !defined(QT_GUI) fDaemon = GetBoolArg("-daemon"); @@ -326,11 +325,11 @@ bool AppInit2(int argc, char* argv[]) } #endif - if (!fDebug && !pszSetDataDir[0]) + if (!fDebug) ShrinkDebugFile(); printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); - printf("Bitcoin version %s\n", FormatFullVersion().c_str()); - printf("Default data directory %s\n", GetDefaultDataDir().c_str()); + printf("Bitcoin version %s (%s)\n", FormatFullVersion().c_str(), CLIENT_DATE.c_str()); + printf("Default data directory %s\n", GetDefaultDataDir().string().c_str()); if (GetBoolArg("-loadblockindextest")) { @@ -341,13 +340,13 @@ bool AppInit2(int argc, char* argv[]) } // Make sure only a single bitcoin process is using the data directory. - string strLockFile = GetDataDir() + "/.lock"; - FILE* file = fopen(strLockFile.c_str(), "a"); // empty lock file; created if it doesn't exist. + boost::filesystem::path pathLockFile = GetDataDir() / ".lock"; + FILE* file = fopen(pathLockFile.string().c_str(), "a"); // empty lock file; created if it doesn't exist. if (file) fclose(file); - static boost::interprocess::file_lock lock(strLockFile.c_str()); + static boost::interprocess::file_lock lock(pathLockFile.string().c_str()); if (!lock.try_lock()) { - wxMessageBox(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin is probably already running."), GetDataDir().c_str()), "Bitcoin"); + ThreadSafeMessageBox(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin is probably already running."), GetDataDir().string().c_str()), _("Bitcoin"), wxOK|wxMODAL); return false; } @@ -371,6 +370,15 @@ bool AppInit2(int argc, char* argv[]) nStart = GetTimeMillis(); if (!LoadBlockIndex()) strErrors << _("Error loading blkindex.dat") << "\n"; + + // as LoadBlockIndex can take several minutes, it's possible the user + // requested to kill bitcoin-qt during the last operation. If so, exit. + // As the program has not fully started yet, Shutdown() is possibly overkill. + if (fRequestShutdown) + { + printf("Shutdown requested. Exiting.\n"); + return false; + } printf(" block index %15"PRI64d"ms\n", GetTimeMillis() - nStart); InitMessage(_("Loading wallet...")); @@ -389,7 +397,7 @@ bool AppInit2(int argc, char* argv[]) { strErrors << _("Wallet needed to be rewritten: restart Bitcoin to complete") << "\n"; printf("%s", strErrors.str().c_str()); - wxMessageBox(strErrors.str(), "Bitcoin", wxOK | wxICON_ERROR); + ThreadSafeMessageBox(strErrors.str(), _("Bitcoin"), wxOK | wxICON_ERROR | wxMODAL); return false; } else @@ -461,7 +469,7 @@ bool AppInit2(int argc, char* argv[]) if (!strErrors.str().empty()) { - wxMessageBox(strErrors.str(), "Bitcoin", wxOK | wxICON_ERROR); + ThreadSafeMessageBox(strErrors.str(), _("Bitcoin"), wxOK | wxICON_ERROR | wxMODAL); return false; } @@ -517,7 +525,7 @@ bool AppInit2(int argc, char* argv[]) addrProxy = CService(mapArgs["-proxy"], 9050); if (!addrProxy.IsValid()) { - wxMessageBox(_("Invalid -proxy address"), "Bitcoin"); + ThreadSafeMessageBox(_("Invalid -proxy address"), _("Bitcoin"), wxOK | wxMODAL); return false; } } @@ -548,7 +556,7 @@ bool AppInit2(int argc, char* argv[]) std::string strError; if (!BindListenPort(strError)) { - wxMessageBox(strError, "Bitcoin"); + ThreadSafeMessageBox(strError, _("Bitcoin"), wxOK | wxMODAL); return false; } } @@ -568,11 +576,11 @@ bool AppInit2(int argc, char* argv[]) { if (!ParseMoney(mapArgs["-paytxfee"], nTransactionFee)) { - wxMessageBox(_("Invalid amount for -paytxfee=<amount>"), "Bitcoin"); + ThreadSafeMessageBox(_("Invalid amount for -paytxfee=<amount>"), _("Bitcoin"), wxOK | wxMODAL); return false; } if (nTransactionFee > 0.25 * COIN) - wxMessageBox(_("Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction."), "Bitcoin", wxOK | wxICON_EXCLAMATION); + ThreadSafeMessageBox(_("Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction."), _("Bitcoin"), wxOK | wxICON_EXCLAMATION | wxMODAL); } // @@ -584,14 +592,14 @@ bool AppInit2(int argc, char* argv[]) RandAddSeedPerfmon(); if (!CreateThread(StartNode, NULL)) - wxMessageBox(_("Error: CreateThread(StartNode) failed"), "Bitcoin"); + ThreadSafeMessageBox(_("Error: CreateThread(StartNode) failed"), _("Bitcoin"), wxOK | wxMODAL); if (fServer) CreateThread(ThreadRPCServer, NULL); #ifdef QT_GUI - if(GetStartOnSystemStartup()) - SetStartOnSystemStartup(true); // Remove startup links to bitcoin-wx + if (GetStartOnSystemStartup()) + SetStartOnSystemStartup(true); // Remove startup links #endif #if !defined(QT_GUI) @@ -602,151 +610,3 @@ bool AppInit2(int argc, char* argv[]) return true; } -#ifdef WIN32 -string StartupShortcutPath() -{ - return MyGetSpecialFolderPath(CSIDL_STARTUP, true) + "\\Bitcoin.lnk"; -} - -bool GetStartOnSystemStartup() -{ - return filesystem::exists(StartupShortcutPath().c_str()); -} - -bool SetStartOnSystemStartup(bool fAutoStart) -{ - // If the shortcut exists already, remove it for updating - remove(StartupShortcutPath().c_str()); - - if (fAutoStart) - { - CoInitialize(NULL); - - // Get a pointer to the IShellLink interface. - IShellLink* psl = NULL; - HRESULT hres = CoCreateInstance(CLSID_ShellLink, NULL, - CLSCTX_INPROC_SERVER, IID_IShellLink, - reinterpret_cast<void**>(&psl)); - - if (SUCCEEDED(hres)) - { - // Get the current executable path - TCHAR pszExePath[MAX_PATH]; - GetModuleFileName(NULL, pszExePath, sizeof(pszExePath)); - - TCHAR pszArgs[5] = TEXT("-min"); - - // Set the path to the shortcut target - psl->SetPath(pszExePath); - PathRemoveFileSpec(pszExePath); - psl->SetWorkingDirectory(pszExePath); - psl->SetShowCmd(SW_SHOWMINNOACTIVE); - psl->SetArguments(pszArgs); - - // Query IShellLink for the IPersistFile interface for - // saving the shortcut in persistent storage. - IPersistFile* ppf = NULL; - hres = psl->QueryInterface(IID_IPersistFile, - reinterpret_cast<void**>(&ppf)); - if (SUCCEEDED(hres)) - { - WCHAR pwsz[MAX_PATH]; - // Ensure that the string is ANSI. - MultiByteToWideChar(CP_ACP, 0, StartupShortcutPath().c_str(), -1, pwsz, MAX_PATH); - // Save the link by calling IPersistFile::Save. - hres = ppf->Save(pwsz, TRUE); - ppf->Release(); - psl->Release(); - CoUninitialize(); - return true; - } - psl->Release(); - } - CoUninitialize(); - return false; - } - return true; -} - -#elif defined(LINUX) - -// Follow the Desktop Application Autostart Spec: -// http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html - -boost::filesystem::path GetAutostartDir() -{ - namespace fs = boost::filesystem; - - char* pszConfigHome = getenv("XDG_CONFIG_HOME"); - if (pszConfigHome) return fs::path(pszConfigHome) / fs::path("autostart"); - char* pszHome = getenv("HOME"); - if (pszHome) return fs::path(pszHome) / fs::path(".config/autostart"); - return fs::path(); -} - -boost::filesystem::path GetAutostartFilePath() -{ - return GetAutostartDir() / boost::filesystem::path("bitcoin.desktop"); -} - -bool GetStartOnSystemStartup() -{ - boost::filesystem::ifstream optionFile(GetAutostartFilePath()); - if (!optionFile.good()) - return false; - // Scan through file for "Hidden=true": - string line; - while (!optionFile.eof()) - { - getline(optionFile, line); - if (line.find("Hidden") != string::npos && - line.find("true") != string::npos) - return false; - } - optionFile.close(); - - return true; -} - -bool SetStartOnSystemStartup(bool fAutoStart) -{ - if (!fAutoStart) - { -#if defined(BOOST_FILESYSTEM_VERSION) && BOOST_FILESYSTEM_VERSION >= 3 - unlink(GetAutostartFilePath().string().c_str()); -#else - unlink(GetAutostartFilePath().native_file_string().c_str()); -#endif - } - else - { - char pszExePath[MAX_PATH+1]; - memset(pszExePath, 0, sizeof(pszExePath)); - if (readlink("/proc/self/exe", pszExePath, sizeof(pszExePath)-1) == -1) - return false; - - boost::filesystem::create_directories(GetAutostartDir()); - - boost::filesystem::ofstream optionFile(GetAutostartFilePath(), ios_base::out|ios_base::trunc); - if (!optionFile.good()) - return false; - // Write a bitcoin.desktop file to the autostart directory: - optionFile << "[Desktop Entry]\n"; - optionFile << "Type=Application\n"; - optionFile << "Name=Bitcoin\n"; - optionFile << "Exec=" << pszExePath << " -min\n"; - optionFile << "Terminal=false\n"; - optionFile << "Hidden=false\n"; - optionFile.close(); - } - return true; -} -#else - -// TODO: OSX startup stuff; see: -// https://developer.apple.com/library/mac/#documentation/MacOSX/Conceptual/BPSystemStartup/Articles/CustomLogin.html - -bool GetStartOnSystemStartup() { return false; } -bool SetStartOnSystemStartup(bool fAutoStart) { return false; } - -#endif diff --git a/src/init.h b/src/init.h index f038d7b621..cc276a2bf3 100644 --- a/src/init.h +++ b/src/init.h @@ -5,6 +5,8 @@ #ifndef BITCOIN_INIT_H #define BITCOIN_INIT_H +#include "wallet.h" + extern CWallet* pwalletMain; void StartShutdown(); @@ -12,7 +14,4 @@ void Shutdown(void* parg); bool AppInit(int argc, char* argv[]); bool AppInit2(int argc, char* argv[]); -bool GetStartOnSystemStartup(); -bool SetStartOnSystemStartup(bool fAutoStart); - #endif diff --git a/src/irc.cpp b/src/irc.cpp index c1308e51b4..a9f47350b7 100644 --- a/src/irc.cpp +++ b/src/irc.cpp @@ -3,10 +3,10 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "headers.h" #include "irc.h" #include "net.h" #include "strlcpy.h" +#include "base58.h" using namespace std; using namespace boost; diff --git a/src/key.cpp b/src/key.cpp index 98d1ad6099..4bb141f701 100644 --- a/src/key.cpp +++ b/src/key.cpp @@ -2,8 +2,13 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include <openssl/ec.h> +#include <map> + #include <openssl/ecdsa.h> +#include <openssl/obj_mac.h> + +#include "key.h" +#include "util.h" // Generate a private key from just the secret parameter int EC_KEY_regenerate_key(EC_KEY *eckey, BIGNUM *priv_key) @@ -115,3 +120,267 @@ err: if (Q != NULL) EC_POINT_free(Q); return ret; } + +void CKey::SetCompressedPubKey() +{ + EC_KEY_set_conv_form(pkey, POINT_CONVERSION_COMPRESSED); + fCompressedPubKey = true; +} + +void CKey::Reset() +{ + fCompressedPubKey = false; + if (pkey != NULL) + EC_KEY_free(pkey); + pkey = EC_KEY_new_by_curve_name(NID_secp256k1); + if (pkey == NULL) + throw key_error("CKey::CKey() : EC_KEY_new_by_curve_name failed"); + fSet = false; +} + +CKey::CKey() +{ + pkey = NULL; + Reset(); +} + +CKey::CKey(const CKey& b) +{ + pkey = EC_KEY_dup(b.pkey); + if (pkey == NULL) + throw key_error("CKey::CKey(const CKey&) : EC_KEY_dup failed"); + fSet = b.fSet; +} + +CKey& CKey::operator=(const CKey& b) +{ + if (!EC_KEY_copy(pkey, b.pkey)) + throw key_error("CKey::operator=(const CKey&) : EC_KEY_copy failed"); + fSet = b.fSet; + return (*this); +} + +CKey::~CKey() +{ + EC_KEY_free(pkey); +} + +bool CKey::IsNull() const +{ + return !fSet; +} + +bool CKey::IsCompressed() const +{ + return fCompressedPubKey; +} + +void CKey::MakeNewKey(bool fCompressed) +{ + if (!EC_KEY_generate_key(pkey)) + throw key_error("CKey::MakeNewKey() : EC_KEY_generate_key failed"); + if (fCompressed) + SetCompressedPubKey(); + fSet = true; +} + +bool CKey::SetPrivKey(const CPrivKey& vchPrivKey) +{ + const unsigned char* pbegin = &vchPrivKey[0]; + if (!d2i_ECPrivateKey(&pkey, &pbegin, vchPrivKey.size())) + return false; + fSet = true; + return true; +} + +bool CKey::SetSecret(const CSecret& vchSecret, bool fCompressed) +{ + EC_KEY_free(pkey); + pkey = EC_KEY_new_by_curve_name(NID_secp256k1); + if (pkey == NULL) + throw key_error("CKey::SetSecret() : EC_KEY_new_by_curve_name failed"); + if (vchSecret.size() != 32) + throw key_error("CKey::SetSecret() : secret must be 32 bytes"); + BIGNUM *bn = BN_bin2bn(&vchSecret[0],32,BN_new()); + if (bn == NULL) + throw key_error("CKey::SetSecret() : BN_bin2bn failed"); + if (!EC_KEY_regenerate_key(pkey,bn)) + { + BN_clear_free(bn); + throw key_error("CKey::SetSecret() : EC_KEY_regenerate_key failed"); + } + BN_clear_free(bn); + fSet = true; + if (fCompressed || fCompressedPubKey) + SetCompressedPubKey(); + return true; +} + +CSecret CKey::GetSecret(bool &fCompressed) const +{ + CSecret vchRet; + vchRet.resize(32); + const BIGNUM *bn = EC_KEY_get0_private_key(pkey); + int nBytes = BN_num_bytes(bn); + if (bn == NULL) + throw key_error("CKey::GetSecret() : EC_KEY_get0_private_key failed"); + int n=BN_bn2bin(bn,&vchRet[32 - nBytes]); + if (n != nBytes) + throw key_error("CKey::GetSecret(): BN_bn2bin failed"); + fCompressed = fCompressedPubKey; + return vchRet; +} + +CPrivKey CKey::GetPrivKey() const +{ + int nSize = i2d_ECPrivateKey(pkey, NULL); + if (!nSize) + throw key_error("CKey::GetPrivKey() : i2d_ECPrivateKey failed"); + CPrivKey vchPrivKey(nSize, 0); + unsigned char* pbegin = &vchPrivKey[0]; + if (i2d_ECPrivateKey(pkey, &pbegin) != nSize) + throw key_error("CKey::GetPrivKey() : i2d_ECPrivateKey returned unexpected size"); + return vchPrivKey; +} + +bool CKey::SetPubKey(const std::vector<unsigned char>& vchPubKey) +{ + const unsigned char* pbegin = &vchPubKey[0]; + if (!o2i_ECPublicKey(&pkey, &pbegin, vchPubKey.size())) + return false; + fSet = true; + if (vchPubKey.size() == 33) + SetCompressedPubKey(); + return true; +} + +std::vector<unsigned char> CKey::GetPubKey() const +{ + int nSize = i2o_ECPublicKey(pkey, NULL); + if (!nSize) + throw key_error("CKey::GetPubKey() : i2o_ECPublicKey failed"); + std::vector<unsigned char> vchPubKey(nSize, 0); + unsigned char* pbegin = &vchPubKey[0]; + if (i2o_ECPublicKey(pkey, &pbegin) != nSize) + throw key_error("CKey::GetPubKey() : i2o_ECPublicKey returned unexpected size"); + return vchPubKey; +} + +bool CKey::Sign(uint256 hash, std::vector<unsigned char>& vchSig) +{ + unsigned int nSize = ECDSA_size(pkey); + vchSig.resize(nSize); // Make sure it is big enough + if (!ECDSA_sign(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], &nSize, pkey)) + { + vchSig.clear(); + return false; + } + vchSig.resize(nSize); // Shrink to fit actual size + return true; +} + +// create a compact signature (65 bytes), which allows reconstructing the used public key +// The format is one header byte, followed by two times 32 bytes for the serialized r and s values. +// The header byte: 0x1B = first key with even y, 0x1C = first key with odd y, +// 0x1D = second key with even y, 0x1E = second key with odd y +bool CKey::SignCompact(uint256 hash, std::vector<unsigned char>& vchSig) +{ + bool fOk = false; + ECDSA_SIG *sig = ECDSA_do_sign((unsigned char*)&hash, sizeof(hash), pkey); + if (sig==NULL) + return false; + vchSig.clear(); + vchSig.resize(65,0); + int nBitsR = BN_num_bits(sig->r); + int nBitsS = BN_num_bits(sig->s); + if (nBitsR <= 256 && nBitsS <= 256) + { + int nRecId = -1; + for (int i=0; i<4; i++) + { + CKey keyRec; + keyRec.fSet = true; + if (fCompressedPubKey) + keyRec.SetCompressedPubKey(); + if (ECDSA_SIG_recover_key_GFp(keyRec.pkey, sig, (unsigned char*)&hash, sizeof(hash), i, 1) == 1) + if (keyRec.GetPubKey() == this->GetPubKey()) + { + nRecId = i; + break; + } + } + + if (nRecId == -1) + throw key_error("CKey::SignCompact() : unable to construct recoverable key"); + + vchSig[0] = nRecId+27+(fCompressedPubKey ? 4 : 0); + BN_bn2bin(sig->r,&vchSig[33-(nBitsR+7)/8]); + BN_bn2bin(sig->s,&vchSig[65-(nBitsS+7)/8]); + fOk = true; + } + ECDSA_SIG_free(sig); + return fOk; +} + +// reconstruct public key from a compact signature +// This is only slightly more CPU intensive than just verifying it. +// If this function succeeds, the recovered public key is guaranteed to be valid +// (the signature is a valid signature of the given data for that key) +bool CKey::SetCompactSignature(uint256 hash, const std::vector<unsigned char>& vchSig) +{ + if (vchSig.size() != 65) + return false; + int nV = vchSig[0]; + if (nV<27 || nV>=35) + return false; + ECDSA_SIG *sig = ECDSA_SIG_new(); + BN_bin2bn(&vchSig[1],32,sig->r); + BN_bin2bn(&vchSig[33],32,sig->s); + + EC_KEY_free(pkey); + pkey = EC_KEY_new_by_curve_name(NID_secp256k1); + if (nV >= 31) + { + SetCompressedPubKey(); + nV -= 4; + } + if (ECDSA_SIG_recover_key_GFp(pkey, sig, (unsigned char*)&hash, sizeof(hash), nV - 27, 0) == 1) + { + fSet = true; + ECDSA_SIG_free(sig); + return true; + } + return false; +} + +bool CKey::Verify(uint256 hash, const std::vector<unsigned char>& vchSig) +{ + // -1 = error, 0 = bad sig, 1 = good + if (ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], vchSig.size(), pkey) != 1) + return false; + + return true; +} + +bool CKey::VerifyCompact(uint256 hash, const std::vector<unsigned char>& vchSig) +{ + CKey key; + if (!key.SetCompactSignature(hash, vchSig)) + return false; + if (GetPubKey() != key.GetPubKey()) + return false; + + return true; +} + +bool CKey::IsValid() +{ + if (!fSet) + return false; + + bool fCompr; + CSecret secret = GetSecret(fCompr); + CKey key2; + key2.SetSecret(secret, fCompr); + return GetPubKey() == key2.GetPubKey(); +} @@ -8,13 +8,11 @@ #include <stdexcept> #include <vector> -#include <openssl/ec.h> -#include <openssl/ecdsa.h> -#include <openssl/obj_mac.h> - -#include "serialize.h" +#include "allocators.h" #include "uint256.h" +#include <openssl/ec.h> // for EC_KEY definition + // secp160k1 // const unsigned int PRIVATE_KEY_SIZE = 192; // const unsigned int PUBLIC_KEY_SIZE = 41; @@ -38,9 +36,6 @@ // see www.keylength.com // script supports up to 75 for single byte push -int extern EC_KEY_regenerate_key(EC_KEY *eckey, BIGNUM *priv_key); -int extern ECDSA_SIG_recover_key_GFp(EC_KEY *eckey, ECDSA_SIG *ecsig, const unsigned char *msg, int msglen, int recid, int check); - class key_error : public std::runtime_error { public: @@ -48,7 +43,7 @@ public: }; -// secure_allocator is defined in serialize.h +// secure_allocator is defined in allocators.h // CPrivKey is a serialized private key, with all parameters included (279 bytes) typedef std::vector<unsigned char, secure_allocator<unsigned char> > CPrivKey; // CSecret is a serialization of just the secret parameter (32 bytes) @@ -62,270 +57,50 @@ protected: bool fSet; bool fCompressedPubKey; - void SetCompressedPubKey() - { - EC_KEY_set_conv_form(pkey, POINT_CONVERSION_COMPRESSED); - fCompressedPubKey = true; - } + void SetCompressedPubKey(); public: - void Reset() - { - fCompressedPubKey = false; - if (pkey != NULL) - EC_KEY_free(pkey); - pkey = EC_KEY_new_by_curve_name(NID_secp256k1); - if (pkey == NULL) - throw key_error("CKey::CKey() : EC_KEY_new_by_curve_name failed"); - fSet = false; - } - - CKey() - { - pkey = NULL; - Reset(); - } - - CKey(const CKey& b) - { - pkey = EC_KEY_dup(b.pkey); - if (pkey == NULL) - throw key_error("CKey::CKey(const CKey&) : EC_KEY_dup failed"); - fSet = b.fSet; - } - - CKey& operator=(const CKey& b) - { - if (!EC_KEY_copy(pkey, b.pkey)) - throw key_error("CKey::operator=(const CKey&) : EC_KEY_copy failed"); - fSet = b.fSet; - return (*this); - } - - ~CKey() - { - EC_KEY_free(pkey); - } - - bool IsNull() const - { - return !fSet; - } + void Reset(); - bool IsCompressed() const - { - return fCompressedPubKey; - } + CKey(); + CKey(const CKey& b); - void MakeNewKey(bool fCompressed) - { - if (!EC_KEY_generate_key(pkey)) - throw key_error("CKey::MakeNewKey() : EC_KEY_generate_key failed"); - if (fCompressed) - SetCompressedPubKey(); - fSet = true; - } + CKey& operator=(const CKey& b); - bool SetPrivKey(const CPrivKey& vchPrivKey) - { - const unsigned char* pbegin = &vchPrivKey[0]; - if (!d2i_ECPrivateKey(&pkey, &pbegin, vchPrivKey.size())) - return false; - fSet = true; - return true; - } + ~CKey(); - bool SetSecret(const CSecret& vchSecret, bool fCompressed = false) - { - EC_KEY_free(pkey); - pkey = EC_KEY_new_by_curve_name(NID_secp256k1); - if (pkey == NULL) - throw key_error("CKey::SetSecret() : EC_KEY_new_by_curve_name failed"); - if (vchSecret.size() != 32) - throw key_error("CKey::SetSecret() : secret must be 32 bytes"); - BIGNUM *bn = BN_bin2bn(&vchSecret[0],32,BN_new()); - if (bn == NULL) - throw key_error("CKey::SetSecret() : BN_bin2bn failed"); - if (!EC_KEY_regenerate_key(pkey,bn)) - { - BN_clear_free(bn); - throw key_error("CKey::SetSecret() : EC_KEY_regenerate_key failed"); - } - BN_clear_free(bn); - fSet = true; - if (fCompressed || fCompressedPubKey) - SetCompressedPubKey(); - return true; - } + bool IsNull() const; + bool IsCompressed() const; - CSecret GetSecret(bool &fCompressed) const - { - CSecret vchRet; - vchRet.resize(32); - const BIGNUM *bn = EC_KEY_get0_private_key(pkey); - int nBytes = BN_num_bytes(bn); - if (bn == NULL) - throw key_error("CKey::GetSecret() : EC_KEY_get0_private_key failed"); - int n=BN_bn2bin(bn,&vchRet[32 - nBytes]); - if (n != nBytes) - throw key_error("CKey::GetSecret(): BN_bn2bin failed"); - fCompressed = fCompressedPubKey; - return vchRet; - } + void MakeNewKey(bool fCompressed); + bool SetPrivKey(const CPrivKey& vchPrivKey); + bool SetSecret(const CSecret& vchSecret, bool fCompressed = false); + CSecret GetSecret(bool &fCompressed) const; + CPrivKey GetPrivKey() const; + bool SetPubKey(const std::vector<unsigned char>& vchPubKey); + std::vector<unsigned char> GetPubKey() const; - CPrivKey GetPrivKey() const - { - int nSize = i2d_ECPrivateKey(pkey, NULL); - if (!nSize) - throw key_error("CKey::GetPrivKey() : i2d_ECPrivateKey failed"); - CPrivKey vchPrivKey(nSize, 0); - unsigned char* pbegin = &vchPrivKey[0]; - if (i2d_ECPrivateKey(pkey, &pbegin) != nSize) - throw key_error("CKey::GetPrivKey() : i2d_ECPrivateKey returned unexpected size"); - return vchPrivKey; - } - - bool SetPubKey(const std::vector<unsigned char>& vchPubKey) - { - const unsigned char* pbegin = &vchPubKey[0]; - if (!o2i_ECPublicKey(&pkey, &pbegin, vchPubKey.size())) - return false; - fSet = true; - if (vchPubKey.size() == 33) - SetCompressedPubKey(); - return true; - } - - std::vector<unsigned char> GetPubKey() const - { - int nSize = i2o_ECPublicKey(pkey, NULL); - if (!nSize) - throw key_error("CKey::GetPubKey() : i2o_ECPublicKey failed"); - std::vector<unsigned char> vchPubKey(nSize, 0); - unsigned char* pbegin = &vchPubKey[0]; - if (i2o_ECPublicKey(pkey, &pbegin) != nSize) - throw key_error("CKey::GetPubKey() : i2o_ECPublicKey returned unexpected size"); - return vchPubKey; - } - - bool Sign(uint256 hash, std::vector<unsigned char>& vchSig) - { - unsigned int nSize = ECDSA_size(pkey); - vchSig.resize(nSize); // Make sure it is big enough - if (!ECDSA_sign(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], &nSize, pkey)) - { - vchSig.clear(); - return false; - } - vchSig.resize(nSize); // Shrink to fit actual size - return true; - } + bool Sign(uint256 hash, std::vector<unsigned char>& vchSig); // create a compact signature (65 bytes), which allows reconstructing the used public key // The format is one header byte, followed by two times 32 bytes for the serialized r and s values. // The header byte: 0x1B = first key with even y, 0x1C = first key with odd y, // 0x1D = second key with even y, 0x1E = second key with odd y - bool SignCompact(uint256 hash, std::vector<unsigned char>& vchSig) - { - bool fOk = false; - ECDSA_SIG *sig = ECDSA_do_sign((unsigned char*)&hash, sizeof(hash), pkey); - if (sig==NULL) - return false; - vchSig.clear(); - vchSig.resize(65,0); - int nBitsR = BN_num_bits(sig->r); - int nBitsS = BN_num_bits(sig->s); - if (nBitsR <= 256 && nBitsS <= 256) - { - int nRecId = -1; - for (int i=0; i<4; i++) - { - CKey keyRec; - keyRec.fSet = true; - if (fCompressedPubKey) - keyRec.SetCompressedPubKey(); - if (ECDSA_SIG_recover_key_GFp(keyRec.pkey, sig, (unsigned char*)&hash, sizeof(hash), i, 1) == 1) - if (keyRec.GetPubKey() == this->GetPubKey()) - { - nRecId = i; - break; - } - } - - if (nRecId == -1) - throw key_error("CKey::SignCompact() : unable to construct recoverable key"); - - vchSig[0] = nRecId+27+(fCompressedPubKey ? 4 : 0); - BN_bn2bin(sig->r,&vchSig[33-(nBitsR+7)/8]); - BN_bn2bin(sig->s,&vchSig[65-(nBitsS+7)/8]); - fOk = true; - } - ECDSA_SIG_free(sig); - return fOk; - } + bool SignCompact(uint256 hash, std::vector<unsigned char>& vchSig); // reconstruct public key from a compact signature // This is only slightly more CPU intensive than just verifying it. // If this function succeeds, the recovered public key is guaranteed to be valid // (the signature is a valid signature of the given data for that key) - bool SetCompactSignature(uint256 hash, const std::vector<unsigned char>& vchSig) - { - if (vchSig.size() != 65) - return false; - int nV = vchSig[0]; - if (nV<27 || nV>=35) - return false; - ECDSA_SIG *sig = ECDSA_SIG_new(); - BN_bin2bn(&vchSig[1],32,sig->r); - BN_bin2bn(&vchSig[33],32,sig->s); - - EC_KEY_free(pkey); - pkey = EC_KEY_new_by_curve_name(NID_secp256k1); - if (nV >= 31) - { - SetCompressedPubKey(); - nV -= 4; - } - if (ECDSA_SIG_recover_key_GFp(pkey, sig, (unsigned char*)&hash, sizeof(hash), nV - 27, 0) == 1) - { - fSet = true; - ECDSA_SIG_free(sig); - return true; - } - return false; - } + bool SetCompactSignature(uint256 hash, const std::vector<unsigned char>& vchSig); - bool Verify(uint256 hash, const std::vector<unsigned char>& vchSig) - { - // -1 = error, 0 = bad sig, 1 = good - if (ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], vchSig.size(), pkey) != 1) - return false; - return true; - } + bool Verify(uint256 hash, const std::vector<unsigned char>& vchSig); // Verify a compact signature - bool VerifyCompact(uint256 hash, const std::vector<unsigned char>& vchSig) - { - CKey key; - if (!key.SetCompactSignature(hash, vchSig)) - return false; - if (GetPubKey() != key.GetPubKey()) - return false; - return true; - } - - bool IsValid() - { - if (!fSet) - return false; + bool VerifyCompact(uint256 hash, const std::vector<unsigned char>& vchSig); - bool fCompr; - CSecret secret = GetSecret(fCompr); - CKey key2; - key2.SetSecret(secret, fCompr); - return GetPubKey() == key2.GetPubKey(); - } + bool IsValid(); }; #endif diff --git a/src/keystore.cpp b/src/keystore.cpp index 5b8420674d..3cb95767bb 100644 --- a/src/keystore.cpp +++ b/src/keystore.cpp @@ -3,9 +3,7 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "headers.h" -#include "crypter.h" -#include "db.h" +#include "keystore.h" #include "script.h" bool CKeyStore::GetPubKey(const CBitcoinAddress &address, std::vector<unsigned char> &vchPubKeyOut) const @@ -21,31 +19,37 @@ bool CBasicKeyStore::AddKey(const CKey& key) { bool fCompressed = false; CSecret secret = key.GetSecret(fCompressed); - CRITICAL_BLOCK(cs_KeyStore) + { + LOCK(cs_KeyStore); mapKeys[CBitcoinAddress(key.GetPubKey())] = make_pair(secret, fCompressed); + } return true; } bool CBasicKeyStore::AddCScript(const CScript& redeemScript) { - CRITICAL_BLOCK(cs_KeyStore) + { + LOCK(cs_KeyStore); mapScripts[Hash160(redeemScript)] = redeemScript; + } return true; } bool CBasicKeyStore::HaveCScript(const uint160& hash) const { bool result; - CRITICAL_BLOCK(cs_KeyStore) + { + LOCK(cs_KeyStore); result = (mapScripts.count(hash) > 0); + } return result; } bool CBasicKeyStore::GetCScript(const uint160 &hash, CScript& redeemScriptOut) const { - CRITICAL_BLOCK(cs_KeyStore) { + LOCK(cs_KeyStore); ScriptMap::const_iterator mi = mapScripts.find(hash); if (mi != mapScripts.end()) { @@ -58,8 +62,8 @@ bool CBasicKeyStore::GetCScript(const uint160 &hash, CScript& redeemScriptOut) c bool CCryptoKeyStore::SetCrypted() { - CRITICAL_BLOCK(cs_KeyStore) { + LOCK(cs_KeyStore); if (fUseCrypto) return true; if (!mapKeys.empty()) @@ -71,8 +75,8 @@ bool CCryptoKeyStore::SetCrypted() bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn) { - CRITICAL_BLOCK(cs_KeyStore) { + LOCK(cs_KeyStore); if (!SetCrypted()) return false; @@ -100,8 +104,8 @@ bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn) bool CCryptoKeyStore::AddKey(const CKey& key) { - CRITICAL_BLOCK(cs_KeyStore) { + LOCK(cs_KeyStore); if (!IsCrypted()) return CBasicKeyStore::AddKey(key); @@ -123,8 +127,8 @@ bool CCryptoKeyStore::AddKey(const CKey& key) bool CCryptoKeyStore::AddCryptedKey(const std::vector<unsigned char> &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret) { - CRITICAL_BLOCK(cs_KeyStore) { + LOCK(cs_KeyStore); if (!SetCrypted()) return false; @@ -135,8 +139,8 @@ bool CCryptoKeyStore::AddCryptedKey(const std::vector<unsigned char> &vchPubKey, bool CCryptoKeyStore::GetKey(const CBitcoinAddress &address, CKey& keyOut) const { - CRITICAL_BLOCK(cs_KeyStore) { + LOCK(cs_KeyStore); if (!IsCrypted()) return CBasicKeyStore::GetKey(address, keyOut); @@ -160,8 +164,8 @@ bool CCryptoKeyStore::GetKey(const CBitcoinAddress &address, CKey& keyOut) const bool CCryptoKeyStore::GetPubKey(const CBitcoinAddress &address, std::vector<unsigned char>& vchPubKeyOut) const { - CRITICAL_BLOCK(cs_KeyStore) { + LOCK(cs_KeyStore); if (!IsCrypted()) return CKeyStore::GetPubKey(address, vchPubKeyOut); @@ -177,8 +181,8 @@ bool CCryptoKeyStore::GetPubKey(const CBitcoinAddress &address, std::vector<unsi bool CCryptoKeyStore::EncryptKeys(CKeyingMaterial& vMasterKeyIn) { - CRITICAL_BLOCK(cs_KeyStore) { + LOCK(cs_KeyStore); if (!mapCryptedKeys.empty() || IsCrypted()) return false; diff --git a/src/keystore.h b/src/keystore.h index 3e56919d3b..3f1f0ce9dd 100644 --- a/src/keystore.h +++ b/src/keystore.h @@ -6,7 +6,10 @@ #define BITCOIN_KEYSTORE_H #include "crypter.h" -#include "script.h" +#include "util.h" +#include "base58.h" + +class CScript; /** A virtual base class for key stores */ class CKeyStore @@ -56,15 +59,17 @@ public: bool HaveKey(const CBitcoinAddress &address) const { bool result; - CRITICAL_BLOCK(cs_KeyStore) + { + LOCK(cs_KeyStore); result = (mapKeys.count(address) > 0); + } return result; } void GetKeys(std::set<CBitcoinAddress> &setAddress) const { setAddress.clear(); - CRITICAL_BLOCK(cs_KeyStore) { + LOCK(cs_KeyStore); KeyMap::const_iterator mi = mapKeys.begin(); while (mi != mapKeys.end()) { @@ -75,8 +80,8 @@ public: } bool GetKey(const CBitcoinAddress &address, CKey &keyOut) const { - CRITICAL_BLOCK(cs_KeyStore) { + LOCK(cs_KeyStore); KeyMap::const_iterator mi = mapKeys.find(address); if (mi != mapKeys.end()) { @@ -131,8 +136,10 @@ public: if (!IsCrypted()) return false; bool result; - CRITICAL_BLOCK(cs_KeyStore) + { + LOCK(cs_KeyStore); result = vMasterKey.empty(); + } return result; } @@ -141,8 +148,10 @@ public: if (!SetCrypted()) return false; - CRITICAL_BLOCK(cs_KeyStore) + { + LOCK(cs_KeyStore); vMasterKey.clear(); + } return true; } @@ -151,8 +160,8 @@ public: bool AddKey(const CKey& key); bool HaveKey(const CBitcoinAddress &address) const { - CRITICAL_BLOCK(cs_KeyStore) { + LOCK(cs_KeyStore); if (!IsCrypted()) return CBasicKeyStore::HaveKey(address); return mapCryptedKeys.count(address) > 0; diff --git a/src/main.cpp b/src/main.cpp index 5f38fcfc23..9f5312a7ea 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,11 +3,11 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "headers.h" #include "checkpoints.h" #include "db.h" #include "net.h" #include "init.h" +#include "ui_interface.h" #include <boost/algorithm/string/replace.hpp> #include <boost/filesystem.hpp> #include <boost/filesystem/fstream.hpp> @@ -19,20 +19,13 @@ using namespace boost; // Global state // -// Name of client reported in the 'version' message. Report the same name -// for both bitcoind and bitcoin-qt, to make it harder for attackers to -// target servers or GUI users specifically. -const std::string CLIENT_NAME("Satoshi"); - CCriticalSection cs_setpwalletRegistered; set<CWallet*> setpwalletRegistered; CCriticalSection cs_main; -static map<uint256, CTransaction> mapTransactions; -CCriticalSection cs_mapTransactions; +CTxMemPool mempool; unsigned int nTransactionsUpdated = 0; -map<COutPoint, CInPoint> mapNextTx; map<uint256, CBlockIndex*> mapBlockIndex; uint256 hashGenesisBlock("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"); @@ -76,16 +69,16 @@ int64 nTransactionFee = 0; void RegisterWallet(CWallet* pwalletIn) { - CRITICAL_BLOCK(cs_setpwalletRegistered) { + LOCK(cs_setpwalletRegistered); setpwalletRegistered.insert(pwalletIn); } } void UnregisterWallet(CWallet* pwalletIn) { - CRITICAL_BLOCK(cs_setpwalletRegistered) { + LOCK(cs_setpwalletRegistered); setpwalletRegistered.erase(pwalletIn); } } @@ -218,15 +211,13 @@ void static EraseOrphanTx(uint256 hash) mapOrphanTransactions.erase(hash); } -int LimitOrphanTxSize(int nMaxOrphans) +unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans) { - int nEvicted = 0; + unsigned int nEvicted = 0; while (mapOrphanTransactions.size() > nMaxOrphans) { // Evict a random orphan: - std::vector<unsigned char> randbytes(32); - RAND_bytes(&randbytes[0], 32); - uint256 randomhash(randbytes); + uint256 randomhash = GetRandHash(); map<uint256, CDataStream*>::iterator it = mapOrphanTransactions.lower_bound(randomhash); if (it == mapOrphanTransactions.end()) it = mapOrphanTransactions.begin(); @@ -358,10 +349,10 @@ bool CTransaction::AreInputsStandard(const MapPrevTx& mapInputs) const return true; } -int +unsigned int CTransaction::GetLegacySigOpCount() const { - int nSigOps = 0; + unsigned int nSigOps = 0; BOOST_FOREACH(const CTxIn& txin, vin) { nSigOps += txin.scriptSig.GetSigOpCount(false); @@ -399,10 +390,10 @@ int CMerkleTx::SetMerkleBranch(const CBlock* pblock) hashBlock = pblock->GetHash(); // Locate the transaction - for (nIndex = 0; nIndex < pblock->vtx.size(); nIndex++) + for (nIndex = 0; nIndex < (int)pblock->vtx.size(); nIndex++) if (pblock->vtx[nIndex] == *(CTransaction*)this) break; - if (nIndex == pblock->vtx.size()) + if (nIndex == (int)pblock->vtx.size()) { vMerkleBranch.clear(); nIndex = -1; @@ -439,7 +430,7 @@ bool CTransaction::CheckTransaction() const if (vout.empty()) return DoS(10, error("CTransaction::CheckTransaction() : vout empty")); // Size limits - if (::GetSerializeSize(*this, SER_NETWORK) > MAX_BLOCK_SIZE) + if (::GetSerializeSize(*this, SER_NETWORK, PROTOCOL_VERSION) > MAX_BLOCK_SIZE) return DoS(100, error("CTransaction::CheckTransaction() : size limits failed")); // Check for negative or overflow output values @@ -479,40 +470,43 @@ bool CTransaction::CheckTransaction() const return true; } -bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMissingInputs) +bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs, + bool* pfMissingInputs) { if (pfMissingInputs) *pfMissingInputs = false; - if (!CheckTransaction()) - return error("AcceptToMemoryPool() : CheckTransaction failed"); + if (!tx.CheckTransaction()) + return error("CTxMemPool::accept() : CheckTransaction failed"); // Coinbase is only valid in a block, not as a loose transaction - if (IsCoinBase()) - return DoS(100, error("AcceptToMemoryPool() : coinbase as individual tx")); + if (tx.IsCoinBase()) + return tx.DoS(100, error("CTxMemPool::accept() : coinbase as individual tx")); // To help v0.1.5 clients who would see it as a negative number - if ((int64)nLockTime > std::numeric_limits<int>::max()) - return error("AcceptToMemoryPool() : not accepting nLockTime beyond 2038 yet"); + if ((int64)tx.nLockTime > std::numeric_limits<int>::max()) + return error("CTxMemPool::accept() : not accepting nLockTime beyond 2038 yet"); // Rather not work on nonstandard transactions (unless -testnet) - if (!fTestNet && !IsStandard()) - return error("AcceptToMemoryPool() : nonstandard transaction type"); + if (!fTestNet && !tx.IsStandard()) + return error("CTxMemPool::accept() : nonstandard transaction type"); // Do we already have it? - uint256 hash = GetHash(); - CRITICAL_BLOCK(cs_mapTransactions) - if (mapTransactions.count(hash)) + uint256 hash = tx.GetHash(); + { + LOCK(cs); + if (mapTx.count(hash)) return false; + } if (fCheckInputs) if (txdb.ContainsTx(hash)) return false; // Check for conflicts with in-memory transactions CTransaction* ptxOld = NULL; - for (unsigned int i = 0; i < vin.size(); i++) + for (unsigned int i = 0; i < tx.vin.size(); i++) { - COutPoint outpoint = vin[i].prevout; + COutPoint outpoint = tx.vin[i].prevout; if (mapNextTx.count(outpoint)) { // Disable replacement feature for now @@ -524,11 +518,11 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi ptxOld = mapNextTx[outpoint].ptx; if (ptxOld->IsFinal()) return false; - if (!IsNewerThan(*ptxOld)) + if (!tx.IsNewerThan(*ptxOld)) return false; - for (unsigned int i = 0; i < vin.size(); i++) + for (unsigned int i = 0; i < tx.vin.size(); i++) { - COutPoint outpoint = vin[i].prevout; + COutPoint outpoint = tx.vin[i].prevout; if (!mapNextTx.count(outpoint) || mapNextTx[outpoint].ptx != ptxOld) return false; } @@ -541,29 +535,29 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi MapPrevTx mapInputs; map<uint256, CTxIndex> mapUnused; bool fInvalid = false; - if (!FetchInputs(txdb, mapUnused, false, false, mapInputs, fInvalid)) + if (!tx.FetchInputs(txdb, mapUnused, false, false, mapInputs, fInvalid)) { if (fInvalid) - return error("AcceptToMemoryPool() : FetchInputs found invalid tx %s", hash.ToString().substr(0,10).c_str()); + return error("CTxMemPool::accept() : FetchInputs found invalid tx %s", hash.ToString().substr(0,10).c_str()); if (pfMissingInputs) *pfMissingInputs = true; - return error("AcceptToMemoryPool() : FetchInputs failed %s", hash.ToString().substr(0,10).c_str()); + return error("CTxMemPool::accept() : FetchInputs failed %s", hash.ToString().substr(0,10).c_str()); } // Check for non-standard pay-to-script-hash in inputs - if (!AreInputsStandard(mapInputs) && !fTestNet) - return error("AcceptToMemoryPool() : nonstandard transaction input"); + if (!tx.AreInputsStandard(mapInputs) && !fTestNet) + return error("CTxMemPool::accept() : nonstandard transaction input"); // Note: if you modify this code to accept non-standard transactions, then // you should add code here to check that the transaction does a // reasonable number of ECDSA signature verifications. - int64 nFees = GetValueIn(mapInputs)-GetValueOut(); - unsigned int nSize = ::GetSerializeSize(*this, SER_NETWORK); + int64 nFees = tx.GetValueIn(mapInputs)-tx.GetValueOut(); + unsigned int nSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION); // Don't accept it if it can't get into a block - if (nFees < GetMinFee(1000, true, GMF_RELAY)) - return error("AcceptToMemoryPool() : not enough fees"); + if (nFees < tx.GetMinFee(1000, true, GMF_RELAY)) + return error("CTxMemPool::accept() : not enough fees"); // Continuously rate-limit free transactions // This mitigates 'penny-flooding' -- sending thousands of free transactions just to @@ -575,15 +569,15 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi static int64 nLastTime; int64 nNow = GetTime(); - CRITICAL_BLOCK(cs) { + LOCK(cs); // Use an exponentially decaying ~10-minute window: dFreeCount *= pow(1.0 - 1.0/600.0, (double)(nNow - nLastTime)); nLastTime = nNow; // -limitfreerelay unit is thousand-bytes-per-minute // At default rate it would take over a month to fill 1GB - if (dFreeCount > GetArg("-limitfreerelay", 15)*10*1000 && !IsFromMe(*this)) - return error("AcceptToMemoryPool() : free transaction rejected by rate limiter"); + if (dFreeCount > GetArg("-limitfreerelay", 15)*10*1000 && !IsFromMe(tx)) + return error("CTxMemPool::accept() : free transaction rejected by rate limiter"); if (fDebug) printf("Rate limit dFreeCount: %g => %g\n", dFreeCount, dFreeCount+nSize); dFreeCount += nSize; @@ -592,21 +586,21 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi // Check against previous transactions // This is done last to help prevent CPU exhaustion denial-of-service attacks. - if (!ConnectInputs(mapInputs, mapUnused, CDiskTxPos(1,1,1), pindexBest, false, false)) + if (!tx.ConnectInputs(mapInputs, mapUnused, CDiskTxPos(1,1,1), pindexBest, false, false)) { - return error("AcceptToMemoryPool() : ConnectInputs failed %s", hash.ToString().substr(0,10).c_str()); + return error("CTxMemPool::accept() : ConnectInputs failed %s", hash.ToString().substr(0,10).c_str()); } } // Store transaction in memory - CRITICAL_BLOCK(cs_mapTransactions) { + LOCK(cs); if (ptxOld) { - printf("AcceptToMemoryPool() : replacing tx %s with new version\n", ptxOld->GetHash().ToString().c_str()); - ptxOld->RemoveFromMemoryPool(); + printf("CTxMemPool::accept() : replacing tx %s with new version\n", ptxOld->GetHash().ToString().c_str()); + remove(*ptxOld); } - AddToMemoryPoolUnchecked(); + addUnchecked(tx); } ///// are we sure this is ok when loading transactions or restoring block txes @@ -614,49 +608,44 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi if (ptxOld) EraseFromWallets(ptxOld->GetHash()); - printf("AcceptToMemoryPool(): accepted %s\n", hash.ToString().substr(0,10).c_str()); + printf("CTxMemPool::accept() : accepted %s\n", hash.ToString().substr(0,10).c_str()); return true; } -bool CTransaction::AcceptToMemoryPool(bool fCheckInputs, bool* pfMissingInputs) +bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMissingInputs) { - CTxDB txdb("r"); - return AcceptToMemoryPool(txdb, fCheckInputs, pfMissingInputs); + return mempool.accept(txdb, *this, fCheckInputs, pfMissingInputs); } -uint64 nPooledTx = 0; - -bool CTransaction::AddToMemoryPoolUnchecked() +bool CTxMemPool::addUnchecked(CTransaction &tx) { - printf("AcceptToMemoryPoolUnchecked(): size %lu\n", mapTransactions.size()); + printf("addUnchecked(): size %lu\n", mapTx.size()); // Add to memory pool without checking anything. Don't call this directly, - // call AcceptToMemoryPool to properly check the transaction first. - CRITICAL_BLOCK(cs_mapTransactions) + // call CTxMemPool::accept to properly check the transaction first. { - uint256 hash = GetHash(); - mapTransactions[hash] = *this; - for (unsigned int i = 0; i < vin.size(); i++) - mapNextTx[vin[i].prevout] = CInPoint(&mapTransactions[hash], i); + LOCK(cs); + uint256 hash = tx.GetHash(); + mapTx[hash] = tx; + for (unsigned int i = 0; i < tx.vin.size(); i++) + mapNextTx[tx.vin[i].prevout] = CInPoint(&mapTx[hash], i); nTransactionsUpdated++; - ++nPooledTx; } return true; } -bool CTransaction::RemoveFromMemoryPool() +bool CTxMemPool::remove(CTransaction &tx) { // Remove transaction from memory pool - CRITICAL_BLOCK(cs_mapTransactions) { - uint256 hash = GetHash(); - if (mapTransactions.count(hash)) + LOCK(cs); + uint256 hash = tx.GetHash(); + if (mapTx.count(hash)) { - BOOST_FOREACH(const CTxIn& txin, vin) + BOOST_FOREACH(const CTxIn& txin, tx.vin) mapNextTx.erase(txin.prevout); - mapTransactions.erase(hash); + mapTx.erase(hash); nTransactionsUpdated++; - --nPooledTx; } } return true; @@ -725,15 +714,16 @@ bool CMerkleTx::AcceptToMemoryPool() bool CWalletTx::AcceptWalletTransaction(CTxDB& txdb, bool fCheckInputs) { - CRITICAL_BLOCK(cs_mapTransactions) + { + LOCK(mempool.cs); // Add previous supporting transactions first BOOST_FOREACH(CMerkleTx& tx, vtxPrev) { if (!tx.IsCoinBase()) { uint256 hash = tx.GetHash(); - if (!mapTransactions.count(hash) && !txdb.ContainsTx(hash)) + if (!mempool.exists(hash) && !txdb.ContainsTx(hash)) tx.AcceptToMemoryPool(txdb, fCheckInputs); } } @@ -742,7 +732,7 @@ bool CWalletTx::AcceptWalletTransaction(CTxDB& txdb, bool fCheckInputs) return false; } -bool CWalletTx::AcceptWalletTransaction() +bool CWalletTx::AcceptWalletTransaction() { CTxDB txdb("r"); return AcceptWalletTransaction(txdb); @@ -1047,11 +1037,11 @@ bool CTransaction::FetchInputs(CTxDB& txdb, const map<uint256, CTxIndex>& mapTes if (!fFound || txindex.pos == CDiskTxPos(1,1,1)) { // Get prev tx from single transactions in memory - CRITICAL_BLOCK(cs_mapTransactions) { - if (!mapTransactions.count(prevout.hash)) - return error("FetchInputs() : %s mapTransactions prev not found %s", GetHash().ToString().substr(0,10).c_str(), prevout.hash.ToString().substr(0,10).c_str()); - txPrev = mapTransactions[prevout.hash]; + LOCK(mempool.cs); + if (!mempool.exists(prevout.hash)) + return error("FetchInputs() : %s mempool Tx prev not found %s", GetHash().ToString().substr(0,10).c_str(), prevout.hash.ToString().substr(0,10).c_str()); + txPrev = mempool.lookup(prevout.hash); } if (!fFound) txindex.vSpent.resize(txPrev.vout.size()); @@ -1110,12 +1100,12 @@ int64 CTransaction::GetValueIn(const MapPrevTx& inputs) const } -int CTransaction::GetP2SHSigOpCount(const MapPrevTx& inputs) const +unsigned int CTransaction::GetP2SHSigOpCount(const MapPrevTx& inputs) const { if (IsCoinBase()) return 0; - int nSigOps = 0; + unsigned int nSigOps = 0; for (unsigned int i = 0; i < vin.size(); i++) { const CTxOut& prevout = GetOutputFor(vin[i], inputs); @@ -1224,16 +1214,16 @@ bool CTransaction::ClientConnectInputs() return false; // Take over previous transactions' spent pointers - CRITICAL_BLOCK(cs_mapTransactions) { + LOCK(mempool.cs); int64 nValueIn = 0; for (unsigned int i = 0; i < vin.size(); i++) { // Get prev tx from single transactions in memory COutPoint prevout = vin[i].prevout; - if (!mapTransactions.count(prevout.hash)) + if (!mempool.exists(prevout.hash)) return false; - CTransaction& txPrev = mapTransactions[prevout.hash]; + CTransaction& txPrev = mempool.lookup(prevout.hash); if (prevout.n >= txPrev.vout.size()) return false; @@ -1242,7 +1232,8 @@ bool CTransaction::ClientConnectInputs() if (!VerifySignature(txPrev, *this, i, true, 0)) return error("ConnectInputs() : VerifySignature failed"); - ///// this is redundant with the mapNextTx stuff, not sure which I want to get rid of + ///// this is redundant with the mempool.mapNextTx stuff, + ///// not sure which I want to get rid of ///// this has to go away now that posNext is gone // // Check for conflicts // if (!txPrev.vout[prevout.n].posNext.IsNull()) @@ -1330,11 +1321,11 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex) bool fStrictPayToScriptHash = (pindex->nTime >= nBIP16SwitchTime); //// issue here: it doesn't know the version - unsigned int nTxPos = pindex->nBlockPos + ::GetSerializeSize(CBlock(), SER_DISK) - 1 + GetSizeOfCompactSize(vtx.size()); + unsigned int nTxPos = pindex->nBlockPos + ::GetSerializeSize(CBlock(), SER_DISK, CLIENT_VERSION) - 1 + GetSizeOfCompactSize(vtx.size()); map<uint256, CTxIndex> mapQueuedChanges; int64 nFees = 0; - int nSigOps = 0; + unsigned int nSigOps = 0; BOOST_FOREACH(CTransaction& tx, vtx) { nSigOps += tx.GetLegacySigOpCount(); @@ -1342,7 +1333,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex) return DoS(100, error("ConnectBlock() : too many sigops")); CDiskTxPos posThisTx(pindex->nFile, pindex->nBlockPos, nTxPos); - nTxPos += ::GetSerializeSize(tx, SER_DISK); + nTxPos += ::GetSerializeSize(tx, SER_DISK, CLIENT_VERSION); MapPrevTx mapInputs; if (!tx.IsCoinBase()) @@ -1487,7 +1478,7 @@ bool static Reorganize(CTxDB& txdb, CBlockIndex* pindexNew) // Delete redundant memory transactions that are in the connected branch BOOST_FOREACH(CTransaction& tx, vDelete) - tx.RemoveFromMemoryPool(); + mempool.remove(tx); printf("REORGANIZE: done\n"); @@ -1523,7 +1514,7 @@ bool CBlock::SetBestChainInner(CTxDB& txdb, CBlockIndex *pindexNew) // Delete redundant memory transactions BOOST_FOREACH(CTransaction& tx, vtx) - tx.RemoveFromMemoryPool(); + mempool.remove(tx); return true; } @@ -1678,7 +1669,7 @@ bool CBlock::CheckBlock() const // that can be verified before saving an orphan block. // Size limits - if (vtx.empty() || vtx.size() > MAX_BLOCK_SIZE || ::GetSerializeSize(*this, SER_NETWORK) > MAX_BLOCK_SIZE) + if (vtx.empty() || vtx.size() > MAX_BLOCK_SIZE || ::GetSerializeSize(*this, SER_NETWORK, PROTOCOL_VERSION) > MAX_BLOCK_SIZE) return DoS(100, error("CheckBlock() : size limits failed")); // Check proof of work matches claimed amount @@ -1711,7 +1702,7 @@ bool CBlock::CheckBlock() const if (uniqueTx.size() != vtx.size()) return DoS(100, error("CheckBlock() : duplicate transaction")); - int nSigOps = 0; + unsigned int nSigOps = 0; BOOST_FOREACH(const CTransaction& tx, vtx) { nSigOps += tx.GetLegacySigOpCount(); @@ -1780,7 +1771,7 @@ bool CBlock::AcceptBlock() } // Write block to history file - if (!CheckDiskSpace(::GetSerializeSize(*this, SER_DISK))) + if (!CheckDiskSpace(::GetSerializeSize(*this, SER_DISK, CLIENT_VERSION))) return error("AcceptBlock() : out of disk space"); unsigned int nFile = -1; unsigned int nBlockPos = 0; @@ -1792,10 +1783,12 @@ bool CBlock::AcceptBlock() // Relay inventory, but don't relay old inventory during initial block download int nBlockEstimate = Checkpoints::GetTotalBlocksEstimate(); if (hashBestChain == hash) - CRITICAL_BLOCK(cs_vNodes) - BOOST_FOREACH(CNode* pnode, vNodes) - if (nBestHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate)) - pnode->PushInventory(CInv(MSG_BLOCK, hash)); + { + LOCK(cs_vNodes); + BOOST_FOREACH(CNode* pnode, vNodes) + if (nBestHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate)) + pnode->PushInventory(CInv(MSG_BLOCK, hash)); + } return true; } @@ -1908,7 +1901,7 @@ bool CheckDiskSpace(uint64 nAdditionalBytes) string strMessage = _("Warning: Disk space is low"); strMiscWarning = strMessage; printf("*** %s\n", strMessage.c_str()); - ThreadSafeMessageBox(strMessage, "Bitcoin", wxOK | wxICON_EXCLAMATION); + ThreadSafeMessageBox(strMessage, "Bitcoin", wxOK | wxICON_EXCLAMATION | wxMODAL); StartShutdown(); return false; } @@ -1919,7 +1912,7 @@ FILE* OpenBlockFile(unsigned int nFile, unsigned int nBlockPos, const char* pszM { if (nFile == -1) return NULL; - FILE* file = fopen(strprintf("%s/blk%04d.dat", GetDataDir().c_str(), nFile).c_str(), pszMode); + FILE* file = fopen((GetDataDir() / strprintf("blk%04d.dat", nFile)).string().c_str(), pszMode); if (!file) return NULL; if (nBlockPos != 0 && !strchr(pszMode, 'a') && !strchr(pszMode, 'w')) @@ -2149,8 +2142,8 @@ string GetWarnings(string strFor) } // Alerts - CRITICAL_BLOCK(cs_mapAlerts) { + LOCK(cs_mapAlerts); BOOST_FOREACH(PAIRTYPE(const uint256, CAlert)& item, mapAlerts) { const CAlert& alert = item.second; @@ -2199,8 +2192,8 @@ bool CAlert::ProcessAlert() return false; } - CRITICAL_BLOCK(cs_mapAlerts) { + LOCK(cs_mapAlerts); // Cancel previous alerts for (map<uint256, CAlert>::iterator mi = mapAlerts.begin(); mi != mapAlerts.end();) { @@ -2259,16 +2252,18 @@ bool static AlreadyHave(CTxDB& txdb, const CInv& inv) case MSG_TX: { bool txInMap = false; - CRITICAL_BLOCK(cs_mapTransactions) - { - txInMap = (mapTransactions.count(inv.hash) != 0); - } + { + LOCK(mempool.cs); + txInMap = (mempool.exists(inv.hash)); + } return txInMap || mapOrphanTransactions.count(inv.hash) || txdb.ContainsTx(inv.hash); } - case MSG_BLOCK: return mapBlockIndex.count(inv.hash) || mapOrphanBlocks.count(inv.hash); + case MSG_BLOCK: + return mapBlockIndex.count(inv.hash) || + mapOrphanBlocks.count(inv.hash); } // Don't know what it is, just say we already got one return true; @@ -2315,7 +2310,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) CAddress addrFrom; uint64 nNonce = 1; vRecv >> pfrom->nVersion >> pfrom->nServices >> nTime >> addrMe; - if (pfrom->nVersion < 209) + if (pfrom->nVersion < MIN_PROTO_VERSION) { // Since February 20, 2012, the protocol is initiated at version 209, // and earlier versions are no longer supported @@ -2365,7 +2360,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) } // Get recent addresses - if (pfrom->nVersion >= 31402 || addrman.size() < 1000) + if (pfrom->nVersion >= CADDR_TIME_VERSION || addrman.size() < 1000) { pfrom->PushMessage("getaddr"); pfrom->fGetAddr = true; @@ -2382,7 +2377,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) // Ask the first connected node for block updates static int nAskedForBlocks = 0; if (!pfrom->fClient && - (pfrom->nVersion < 32000 || pfrom->nVersion >= 32400) && + (pfrom->nVersion < NOBLKS_VERSION_START || + pfrom->nVersion >= NOBLKS_VERSION_END) && (nAskedForBlocks < 1 || vNodes.size() <= 1)) { nAskedForBlocks++; @@ -2390,9 +2386,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) } // Relay alerts - CRITICAL_BLOCK(cs_mapAlerts) + { + LOCK(cs_mapAlerts); BOOST_FOREACH(PAIRTYPE(const uint256, CAlert)& item, mapAlerts) item.second.RelayTo(pfrom); + } pfrom->fSuccessfullyConnected = true; @@ -2422,7 +2420,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) vRecv >> vAddr; // Don't want addr from older versions unless seeding - if (pfrom->nVersion < 31402 && addrman.size() > 1000) + if (pfrom->nVersion < CADDR_TIME_VERSION && addrman.size() > 1000) return true; if (vAddr.size() > 1000) { @@ -2446,20 +2444,20 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) if (addr.nTime > nSince && !pfrom->fGetAddr && vAddr.size() <= 10 && addr.IsRoutable()) { // Relay to a limited number of other nodes - CRITICAL_BLOCK(cs_vNodes) { + LOCK(cs_vNodes); // Use deterministic randomness to send to the same nodes for 24 hours // at a time so the setAddrKnowns of the chosen nodes prevent repeats static uint256 hashSalt; if (hashSalt == 0) - RAND_bytes((unsigned char*)&hashSalt, sizeof(hashSalt)); + hashSalt = GetRandHash(); int64 hashAddr = addr.GetHash(); uint256 hashRand = hashSalt ^ (hashAddr<<32) ^ ((GetTime()+hashAddr)/(24*60*60)); hashRand = Hash(BEGIN(hashRand), END(hashRand)); multimap<uint256, CNode*> mapMix; BOOST_FOREACH(CNode* pnode, vNodes) { - if (pnode->nVersion < 31402) + if (pnode->nVersion < CADDR_TIME_VERSION) continue; unsigned int nPointer; memcpy(&nPointer, &pnode, sizeof(nPointer)); @@ -2572,8 +2570,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) else if (inv.IsKnownType()) { // Send stream from relay memory - CRITICAL_BLOCK(cs_mapRelay) { + LOCK(cs_mapRelay); map<CInv, CDataStream>::iterator mi = mapRelay.find(inv); if (mi != mapRelay.end()) pfrom->PushMessage(inv.GetCommand(), (*mi).second); @@ -2611,7 +2609,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) pfrom->PushInventory(CInv(MSG_BLOCK, pindex->GetBlockHash())); CBlock block; block.ReadFromDisk(pindex, true); - nBytes += block.GetSerializeSize(SER_NETWORK); + nBytes += block.GetSerializeSize(SER_NETWORK, PROTOCOL_VERSION); if (--nLimit <= 0 || nBytes >= SendBufferSize()/2) { // When this block is requested, we'll send an inv that'll make them @@ -2648,8 +2646,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) } vector<CBlock> vHeaders; - int nLimit = 2000 + locator.GetDistanceBack(); - printf("getheaders %d to %s limit %d\n", (pindex ? pindex->nHeight : -1), hashStop.ToString().substr(0,20).c_str(), nLimit); + int nLimit = 2000; + printf("getheaders %d to %s\n", (pindex ? pindex->nHeight : -1), hashStop.ToString().substr(0,20).c_str()); for (; pindex; pindex = pindex->pnext) { vHeaders.push_back(pindex->GetBlockHeader()); @@ -2665,6 +2663,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) vector<uint256> vWorkQueue; vector<uint256> vEraseQueue; CDataStream vMsg(vRecv); + CTxDB txdb("r"); CTransaction tx; vRecv >> tx; @@ -2672,7 +2671,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) pfrom->AddInventoryKnown(inv); bool fMissingInputs = false; - if (tx.AcceptToMemoryPool(true, &fMissingInputs)) + if (tx.AcceptToMemoryPool(txdb, true, &fMissingInputs)) { SyncWithWallets(tx, NULL, true); RelayMessage(inv, vMsg); @@ -2694,7 +2693,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) CInv inv(MSG_TX, tx.GetHash()); bool fMissingInputs2 = false; - if (tx.AcceptToMemoryPool(true, &fMissingInputs2)) + if (tx.AcceptToMemoryPool(txdb, true, &fMissingInputs2)) { printf(" accepted orphan tx %s\n", inv.hash.ToString().substr(0,10).c_str()); SyncWithWallets(tx, NULL, true); @@ -2720,9 +2719,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) AddOrphanTx(vMsg); // DoS prevention: do not allow mapOrphanTransactions to grow unbounded - int nEvicted = LimitOrphanTxSize(MAX_ORPHAN_TRANSACTIONS); + unsigned int nEvicted = LimitOrphanTxSize(MAX_ORPHAN_TRANSACTIONS); if (nEvicted > 0) - printf("mapOrphan overflow, removed %d tx\n", nEvicted); + printf("mapOrphan overflow, removed %u tx\n", nEvicted); } if (tx.nDoS) pfrom->Misbehaving(tx.nDoS); } @@ -2787,8 +2786,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) vRecv >> hashReply; CRequestTracker tracker; - CRITICAL_BLOCK(pfrom->cs_mapRequests) { + LOCK(pfrom->cs_mapRequests); map<uint256, CRequestTracker>::iterator mi = pfrom->mapRequests.find(hashReply); if (mi != pfrom->mapRequests.end()) { @@ -2803,6 +2802,23 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) else if (strCommand == "ping") { + if (pfrom->nVersion > BIP0031_VERSION) + { + uint64 nonce = 0; + vRecv >> nonce; + // Echo the message back with the nonce. This allows for two useful features: + // + // 1) A remote node can quickly check if the connection is operational + // 2) Remote nodes can measure the latency of the network thread. If this node + // is overloaded it won't respond to pings quickly and the remote node can + // avoid sending us more work, like chain download requests. + // + // The nonce stops the remote getting confused between different pings: without + // it, if the remote node sends a ping once per second and this node takes 5 + // seconds to respond to each, the 5th ping the remote sends would appear to + // return very quickly. + pfrom->PushMessage("pong", nonce); + } } @@ -2818,9 +2834,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) { // Relay pfrom->setKnown.insert(alertHash); - CRITICAL_BLOCK(cs_vNodes) + { + LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodes) alert.RelayTo(pnode); + } } else { // Small DoS penalty so peers that send us lots of @@ -2874,7 +2892,7 @@ bool ProcessMessages(CNode* pfrom) int nHeaderSize = vRecv.GetSerializeSize(CMessageHeader()); if (vRecv.end() - pstart < nHeaderSize) { - if (vRecv.size() > nHeaderSize) + if ((int)vRecv.size() > nHeaderSize) { printf("\n\nPROCESSMESSAGE MESSAGESTART NOT FOUND\n\n"); vRecv.erase(vRecv.begin(), vRecv.end() - nHeaderSize); @@ -2929,8 +2947,10 @@ bool ProcessMessages(CNode* pfrom) bool fRet = false; try { - CRITICAL_BLOCK(cs_main) + { + LOCK(cs_main); fRet = ProcessMessage(pfrom, strCommand, vMsg); + } if (fShutdown) return true; } @@ -2968,15 +2988,21 @@ bool ProcessMessages(CNode* pfrom) bool SendMessages(CNode* pto, bool fSendTrickle) { - TRY_CRITICAL_BLOCK(cs_main) - { + TRY_LOCK(cs_main, lockMain); + if (lockMain) { // Don't send anything until we get their version message if (pto->nVersion == 0) return true; - // Keep-alive ping - if (pto->nLastSend && GetTime() - pto->nLastSend > 30 * 60 && pto->vSend.empty()) - pto->PushMessage("ping"); + // Keep-alive ping. We send a nonce of zero because we don't use it anywhere + // right now. + if (pto->nLastSend && GetTime() - pto->nLastSend > 30 * 60 && pto->vSend.empty()) { + uint64 nonce = 0; + if (pto->nVersion > BIP0031_VERSION) + pto->PushMessage("ping", nonce); + else + pto->PushMessage("ping"); + } // Resend wallet transactions that haven't gotten in a block yet ResendWalletTransactions(); @@ -2985,8 +3011,8 @@ bool SendMessages(CNode* pto, bool fSendTrickle) static int64 nLastRebroadcast; if (!IsInitialBlockDownload() && (GetTime() - nLastRebroadcast > 24 * 60 * 60)) { - CRITICAL_BLOCK(cs_vNodes) { + LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodes) { // Periodically clear setAddrKnown to allow refresh broadcasts @@ -3037,8 +3063,8 @@ bool SendMessages(CNode* pto, bool fSendTrickle) // vector<CInv> vInv; vector<CInv> vInvWait; - CRITICAL_BLOCK(pto->cs_inventory) { + LOCK(pto->cs_inventory); vInv.reserve(pto->vInventoryToSend.size()); vInvWait.reserve(pto->vInventoryToSend.size()); BOOST_FOREACH(const CInv& inv, pto->vInventoryToSend) @@ -3052,7 +3078,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle) // 1/4 of tx invs blast to all immediately static uint256 hashSalt; if (hashSalt == 0) - RAND_bytes((unsigned char*)&hashSalt, sizeof(hashSalt)); + hashSalt = GetRandHash(); uint256 hashRand = inv.hash ^ hashSalt; hashRand = Hash(BEGIN(hashRand), END(hashRand)); bool fTrickleWait = ((hashRand & 3) != 0); @@ -3169,7 +3195,7 @@ void SHA256Transform(void* pstate, void* pinput, const void* pinit) ctx.h[i] = ((uint32_t*)pinit)[i]; SHA256_Update(&ctx, data, sizeof(data)); - for (int i = 0; i < 8; i++) + for (int i = 0; i < 8; i++) ((uint32_t*)pstate)[i] = ctx.h[i]; } @@ -3201,7 +3227,7 @@ unsigned int static ScanHash_CryptoPP(char* pmidstate, char* pdata, char* phash1 if ((nNonce & 0xffff) == 0) { nHashesDone = 0xffff+1; - return -1; + return (unsigned int) -1; } } } @@ -3253,9 +3279,8 @@ CBlock* CreateNewBlock(CReserveKey& reservekey) // Collect memory pool transactions into the block int64 nFees = 0; - CRITICAL_BLOCK(cs_main) - CRITICAL_BLOCK(cs_mapTransactions) { + LOCK2(cs_main, mempool.cs); pindexPrev = pindexBest; CTxDB txdb("r"); @@ -3263,7 +3288,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey) list<COrphan> vOrphan; // list memory doesn't move map<uint256, vector<COrphan*> > mapDependers; multimap<double, CTransaction*> mapPriority; - for (map<uint256, CTransaction>::iterator mi = mapTransactions.begin(); mi != mapTransactions.end(); ++mi) + for (map<uint256, CTransaction>::iterator mi = mempool.mapTx.begin(); mi != mempool.mapTx.end(); ++mi) { CTransaction& tx = (*mi).second; if (tx.IsCoinBase() || !tx.IsFinal()) @@ -3301,7 +3326,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey) } // Priority is sum(valuein * age) / txsize - dPriority /= ::GetSerializeSize(tx, SER_NETWORK); + dPriority /= ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION); if (porphan) porphan->dPriority = dPriority; @@ -3330,12 +3355,12 @@ CBlock* CreateNewBlock(CReserveKey& reservekey) mapPriority.erase(mapPriority.begin()); // Size limits - unsigned int nTxSize = ::GetSerializeSize(tx, SER_NETWORK); + unsigned int nTxSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION); if (nBlockSize + nTxSize >= MAX_BLOCK_SIZE_GEN) continue; // Legacy limits on sigOps: - int nTxSigOps = tx.GetLegacySigOpCount(); + unsigned int nTxSigOps = tx.GetLegacySigOpCount(); if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS) continue; @@ -3485,8 +3510,8 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey) printf("generated %s\n", FormatMoney(pblock->vtx[0].vout[0].nValue).c_str()); // Found a solution - CRITICAL_BLOCK(cs_main) { + LOCK(cs_main); if (pblock->hashPrevBlock != hashBestChain) return error("BitcoinMiner : generated block is stale"); @@ -3494,8 +3519,10 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey) reservekey.KeepKey(); // Track how many getdata requests this block gets - CRITICAL_BLOCK(wallet.cs_wallet) + { + LOCK(wallet.cs_wallet); wallet.mapRequestCount[pblock->GetHash()] = 0; + } // Process this block the same as if we had received it from another node if (!ProcessBlock(NULL, pblock)) @@ -3522,8 +3549,6 @@ void static BitcoinMiner(CWallet *pwallet) while (fGenerateBitcoins) { - if (AffinityBugWorkaround(ThreadBitcoinMiner)) - return; if (fShutdown) return; while (vNodes.empty() || IsInitialBlockDownload()) @@ -3581,7 +3606,7 @@ void static BitcoinMiner(CWallet *pwallet) (char*)&hash, nHashesDone); // Check if something found - if (nNonceFound != -1) + if (nNonceFound != (unsigned int) -1) { for (unsigned int i = 0; i < sizeof(hash)/4; i++) ((unsigned int*)&hash)[i] = ByteReverse(((unsigned int*)&hash)[i]); @@ -3611,15 +3636,13 @@ void static BitcoinMiner(CWallet *pwallet) if (GetTimeMillis() - nHPSTimerStart > 4000) { static CCriticalSection cs; - CRITICAL_BLOCK(cs) { + LOCK(cs); if (GetTimeMillis() - nHPSTimerStart > 4000) { dHashesPerSec = 1000.0 * nHashCounter / (GetTimeMillis() - nHPSTimerStart); nHPSTimerStart = GetTimeMillis(); nHashCounter = 0; - string strStatus = strprintf(" %.0f khash/s", dHashesPerSec/1000.0); - UIThreadCall(boost::bind(CalledSetStatusBar, strStatus, 0)); static int64 nLogTime; if (GetTime() - nLogTime > 30 * 60) { @@ -3676,7 +3699,6 @@ void static ThreadBitcoinMiner(void* parg) vnThreadsRunning[THREAD_MINER]--; PrintException(NULL, "ThreadBitcoinMiner()"); } - UIThreadCall(boost::bind(CalledSetStatusBar, "", 0)); nHPSTimerStart = 0; if (vnThreadsRunning[THREAD_MINER] == 0) dHashesPerSec = 0; diff --git a/src/main.h b/src/main.h index 99b55528ae..e562cec7c4 100644 --- a/src/main.h +++ b/src/main.h @@ -7,35 +7,29 @@ #include "bignum.h" #include "net.h" -#include "key.h" #include "script.h" -#include "db.h" + +#ifdef WIN32 +#include <io.h> /* for _commit */ +#endif #include <list> +class CWallet; class CBlock; class CBlockIndex; -class CWalletTx; -class CWallet; class CKeyItem; class CReserveKey; -class CWalletDB; class CAddress; class CInv; class CRequestTracker; class CNode; -static const int CLIENT_VERSION = 60010; -static const bool VERSION_IS_BETA = true; -extern const std::string CLIENT_NAME; - static const unsigned int MAX_BLOCK_SIZE = 1000000; static const unsigned int MAX_BLOCK_SIZE_GEN = MAX_BLOCK_SIZE/2; -static const int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50; -static const int MAX_ORPHAN_TRANSACTIONS = MAX_BLOCK_SIZE/100; -static const int64 COIN = 100000000; -static const int64 CENT = 1000000; +static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50; +static const unsigned int MAX_ORPHAN_TRANSACTIONS = MAX_BLOCK_SIZE/100; static const int64 MIN_TX_FEE = 50000; static const int64 MIN_RELAY_TX_FEE = 10000; static const int64 MAX_MONEY = 21000000 * COIN; @@ -66,7 +60,6 @@ extern CBigNum bnBestChainWork; extern CBigNum bnBestInvalidWork; extern uint256 hashBestChain; extern CBlockIndex* pindexBest; -extern uint64 nPooledTx; extern unsigned int nTransactionsUpdated; extern uint64 nLastBlockTx; extern uint64 nLastBlockSize; @@ -161,7 +154,7 @@ public: std::string ToString() const { if (IsNull()) - return strprintf("null"); + return "null"; else return strprintf("(nFile=%d, nBlockPos=%d, nTxPos=%d)", nFile, nBlockPos, nTxPos); } @@ -288,7 +281,7 @@ public: std::string ToString() const { std::string str; - str += strprintf("CTxIn("); + str += "CTxIn("; str += prevout.ToString(); if (prevout.IsNull()) str += strprintf(", coinbase %s", HexStr(scriptSig).c_str()); @@ -445,7 +438,7 @@ public: nBlockHeight = nBestHeight; if (nBlockTime == 0) nBlockTime = GetAdjustedTime(); - if ((int64)nLockTime < (nLockTime < LOCKTIME_THRESHOLD ? (int64)nBlockHeight : nBlockTime)) + if ((int64)nLockTime < ((int64)nLockTime < LOCKTIME_THRESHOLD ? (int64)nBlockHeight : nBlockTime)) return true; BOOST_FOREACH(const CTxIn& txin, vin) if (!txin.IsFinal()) @@ -503,7 +496,7 @@ public: @return number of sigops this transaction's outputs will produce when spent @see CTransaction::FetchInputs */ - int GetLegacySigOpCount() const; + unsigned int GetLegacySigOpCount() const; /** Count ECDSA signature operations in pay-to-script-hash inputs. @@ -511,7 +504,7 @@ public: @return maximum number of sigops required to validate this transaction's inputs @see CTransaction::FetchInputs */ - int GetP2SHSigOpCount(const MapPrevTx& mapInputs) const; + unsigned int GetP2SHSigOpCount(const MapPrevTx& mapInputs) const; /** Amount of bitcoins spent by this transaction. @return sum of all outputs (note: does not include fees) @@ -550,7 +543,7 @@ public: // Base fee is either MIN_TX_FEE or MIN_RELAY_TX_FEE int64 nBaseFee = (mode == GMF_RELAY) ? MIN_RELAY_TX_FEE : MIN_TX_FEE; - unsigned int nBytes = ::GetSerializeSize(*this, SER_NETWORK); + unsigned int nBytes = ::GetSerializeSize(*this, SER_NETWORK, PROTOCOL_VERSION); unsigned int nNewBlockSize = nBlockSize + nBytes; int64 nMinFee = (1 + (int64)nBytes / 1000) * nBaseFee; @@ -595,7 +588,7 @@ public: bool ReadFromDisk(CDiskTxPos pos, FILE** pfileRet=NULL) { - CAutoFile filein = OpenBlockFile(pos.nFile, 0, pfileRet ? "rb+" : "rb"); + CAutoFile filein = CAutoFile(OpenBlockFile(pos.nFile, 0, pfileRet ? "rb+" : "rb"), SER_DISK, CLIENT_VERSION); if (!filein) return error("CTransaction::ReadFromDisk() : OpenBlockFile failed"); @@ -692,13 +685,9 @@ public: bool ClientConnectInputs(); bool CheckTransaction() const; bool AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs=true, bool* pfMissingInputs=NULL); - bool AcceptToMemoryPool(bool fCheckInputs=true, bool* pfMissingInputs=NULL); protected: const CTxOut& GetOutputFor(const CTxIn& input, const MapPrevTx& inputs) const; - bool AddToMemoryPoolUnchecked(); -public: - bool RemoveFromMemoryPool(); }; @@ -714,7 +703,7 @@ public: int nIndex; // memory only - mutable char fMerkleVerified; + mutable bool fMerkleVerified; CMerkleTx() @@ -954,7 +943,7 @@ public: bool WriteToDisk(unsigned int& nFileRet, unsigned int& nBlockPosRet) { // Open history file to append - CAutoFile fileout = AppendBlockFile(nFileRet); + CAutoFile fileout = CAutoFile(AppendBlockFile(nFileRet), SER_DISK, CLIENT_VERSION); if (!fileout) return error("CBlock::WriteToDisk() : AppendBlockFile failed"); @@ -988,7 +977,7 @@ public: SetNull(); // Open history file to read - CAutoFile filein = OpenBlockFile(nFile, nBlockPos, "rb"); + CAutoFile filein = CAutoFile(OpenBlockFile(nFile, nBlockPos, "rb"), SER_DISK, CLIENT_VERSION); if (!filein) return error("CBlock::ReadFromDisk() : OpenBlockFile failed"); if (!fReadTransactions) @@ -1154,7 +1143,7 @@ public: bool EraseBlockFromDisk() { // Open history file - CAutoFile fileout = OpenBlockFile(nFile, nBlockPos, "rb+"); + CAutoFile fileout = CAutoFile(OpenBlockFile(nFile, nBlockPos, "rb+"), SER_DISK, CLIENT_VERSION); if (!fileout) return false; @@ -1620,7 +1609,7 @@ public: return error("CAlert::CheckSignature() : verify signature failed"); // Now unserialize the data - CDataStream sMsg(vchMsg); + CDataStream sMsg(vchMsg, SER_NETWORK, PROTOCOL_VERSION); sMsg >> *(CUnsignedAlert*)this; return true; } @@ -1628,4 +1617,35 @@ public: bool ProcessAlert(); }; +class CTxMemPool +{ +public: + mutable CCriticalSection cs; + std::map<uint256, CTransaction> mapTx; + std::map<COutPoint, CInPoint> mapNextTx; + + bool accept(CTxDB& txdb, CTransaction &tx, + bool fCheckInputs, bool* pfMissingInputs); + bool addUnchecked(CTransaction &tx); + bool remove(CTransaction &tx); + + unsigned long size() + { + LOCK(cs); + return mapTx.size(); + } + + bool exists(uint256 hash) + { + return (mapTx.count(hash) != 0); + } + + CTransaction& lookup(uint256 hash) + { + return mapTx[hash]; + } +}; + +extern CTxMemPool mempool; + #endif diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index 683020c37f..a6f676af04 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -7,6 +7,8 @@ DEPSDIR:=/usr/i586-mingw32msvc USE_UPNP:=0 INCLUDEPATHS= \ + -I"$(CURDIR)" \ + -I"$(CURDIR)"/obj \ -I"$(DEPSDIR)/boost_1_47_0" \ -I"$(DEPSDIR)/db-4.8.30.NC/build_unix" \ -I"$(DEPSDIR)/openssl-1.0.1b/include" \ @@ -26,10 +28,11 @@ LIBS= \ -l ssl \ -l crypto -DEFS=-D_MT -DWIN32 -D_WINDOWS -DNOPCH -DUSE_SSL -DBOOST_THREAD_USE_LIB +DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE DEBUGFLAGS=-g CFLAGS=-O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) +TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data) ifndef USE_UPNP override USE_UPNP = - @@ -46,6 +49,7 @@ LIBS += -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l w HEADERS = $(wildcard *.h) OBJS= \ + obj/version.o \ obj/checkpoints.o \ obj/netbase.o \ obj/addrman.o \ @@ -62,28 +66,37 @@ OBJS= \ obj/rpcdump.o \ obj/script.o \ obj/util.o \ - obj/wallet.o + obj/wallet.o \ + obj/walletdb.o \ + obj/noui.o all: bitcoind.exe +obj/build.h: FORCE + /bin/sh ../share/genbuild.sh obj/build.h +version.cpp: obj/build.h +DEFS += -DHAVE_BUILD_INFO + obj/%.o: %.cpp $(HEADERS) i586-mingw32msvc-g++ -c $(CFLAGS) -o $@ $< bitcoind.exe: $(OBJS:obj/%=obj/%) i586-mingw32msvc-g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) +TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) -obj/test/%.o: obj/test/%.cpp $(HEADERS) - i586-mingw32msvc-g++ -c $(CFLAGS) -o $@ $< +obj-test/%.o: test/%.cpp $(HEADERS) + i586-mingw32msvc-g++ -c $(TESTDEFS) $(CFLAGS) -o $@ $< -test_bitcoin.exe: obj/test/test_bitcoin.o $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) - i586-mingw32msvc-g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) -lboost_unit_test_framework-mt-s +test_bitcoin.exe: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) + i586-mingw32msvc-g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework-mt-s $(LIBS) clean: -rm -f obj/*.o - -rm -f obj/test/*.o - -rm -f test/*.o - -rm -f headers.h.gch -rm -f bitcoind.exe + -rm -f obj-test/*.o -rm -f test_bitcoin.exe + -rm -f obj/build.h + +FORCE: diff --git a/src/makefile.mingw b/src/makefile.mingw index 1d027fa9e4..2addb0c2b2 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -23,10 +23,11 @@ LIBS= \ -l ssl \ -l crypto -DEFS=-DWIN32 -D_WINDOWS -DNOPCH -DUSE_SSL -DBOOST_THREAD_USE_LIB +DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE DEBUGFLAGS=-g CFLAGS=-mthreads -O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) +TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data) ifndef USE_UPNP override USE_UPNP = - @@ -44,6 +45,7 @@ LIBS += -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell HEADERS = $(wildcard *.h) OBJS= \ + obj/version.o \ obj/checkpoints.o \ obj/netbase.o \ obj/addrman.o \ @@ -60,7 +62,9 @@ OBJS= \ obj/rpcdump.o \ obj/script.o \ obj/util.o \ - obj/wallet.o + obj/wallet.o \ + obj/walletdb.o \ + obj/noui.o all: bitcoind.exe @@ -71,16 +75,15 @@ obj/%.o: %.cpp $(HEADERS) bitcoind.exe: $(OBJS:obj/%=obj/%) g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) -obj/test/test_bitcoin.o: $(wildcard test/*.cpp) $(HEADERS) - g++ -c $(CFLAGS) -o $@ test/test_bitcoin.cpp +TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) -test_bitcoin.exe: obj/test/test_bitcoin.o $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) - g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) +obj-test/%.o: test/%.cpp $(HEADERS) + g++ -c $(TESTDEFS) $(CFLAGS) -o $@ $< + +test_bitcoin.exe: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) + g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework $(LIBS) clean: -del /Q bitcoind test_bitcoin -del /Q obj\* - -del /Q obj\nogui\* - -del /Q obj\test\* - -del /Q test\*.o - -del /Q headers.h.gch + -del /Q obj-test\* diff --git a/src/makefile.osx b/src/makefile.osx index 44e7d89f57..17cbce74ac 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -11,6 +11,7 @@ DEPSDIR=/opt/local INCLUDEPATHS= \ -I"$(CURDIR)" \ + -I"$(CURDIR)"/obj \ -I"$(DEPSDIR)/include" \ -I"$(DEPSDIR)/include/db48" @@ -21,6 +22,9 @@ LIBPATHS= \ USE_UPNP:=1 LIBS= -dead_strip + +TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data) + ifdef STATIC # Build STATIC if you are redistributing the bitcoind binary TESTLIBS += \ @@ -49,15 +53,23 @@ LIBS += \ TESTDEFS += -DBOOST_TEST_DYN_LINK endif -DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DUSE_SSL +DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE + +ifdef RELEASE +# Compile for maximum compatibility and smallest size. +# This requires that dependencies are compiled +# the same way. +CFLAGS = -mmacosx-version-min=10.5 -arch i386 -O3 +else +CFLAGS = -g +endif -DEBUGFLAGS=-g # ppc doesn't work because we don't support big-endian -CFLAGS=-mmacosx-version-min=10.5 -arch i386 -O3 \ - -Wextra -Wno-sign-compare -Wno-char-subscripts -Wno-invalid-offsetof -Wformat-security \ +CFLAGS += -Wextra -Wno-sign-compare -Wno-invalid-offsetof -Wformat-security \ $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) OBJS= \ + obj/version.o \ obj/checkpoints.o \ obj/netbase.o \ obj/addrman.o \ @@ -74,7 +86,9 @@ OBJS= \ obj/rpcdump.o \ obj/script.o \ obj/util.o \ - obj/wallet.o + obj/wallet.o \ + obj/walletdb.o \ + obj/noui.o ifndef USE_UPNP override USE_UPNP = - @@ -94,6 +108,11 @@ all: bitcoind -include obj/*.P -include obj-test/*.P +obj/build.h: FORCE + /bin/sh ../share/genbuild.sh obj/build.h +version.cpp: obj/build.h +DEFS += -DHAVE_BUILD_INFO + obj/%.o: %.cpp $(CXX) -c $(CFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< @cp $(@:%.o=%.d) $(@:%.o=%.P); \ @@ -122,3 +141,6 @@ clean: -rm -f obj-test/*.o -rm -f obj/*.P -rm -f obj-test/*.P + -rm -f obj/build.h + +FORCE: diff --git a/src/makefile.unix b/src/makefile.unix index 88306515a3..316cd19dd3 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -4,11 +4,13 @@ USE_UPNP:=0 -DEFS=-DNOPCH +DEFS=-DBOOST_SPIRIT_THREADSAFE -DEFS += $(addprefix -I,$(CURDIR) $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH)) +DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH)) LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH)) +TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data) + LMODE = dynamic LMODE2 = dynamic ifdef STATIC @@ -39,10 +41,6 @@ ifneq (${USE_UPNP}, -) DEFS += -DUSE_UPNP=$(USE_UPNP) endif -ifneq (${USE_SSL}, 0) - DEFS += -DUSE_SSL -endif - LIBS+= \ -Wl,-B$(LMODE2) \ -l z \ @@ -85,10 +83,11 @@ LIBS+= \ DEBUGFLAGS=-g CXXFLAGS=-O2 -xCXXFLAGS=-pthread -Wextra -Wno-sign-compare -Wno-char-subscripts -Wno-invalid-offsetof -Wformat -Wformat-security \ +xCXXFLAGS=-pthread -Wall -Wextra -Wno-sign-compare -Wno-invalid-offsetof -Wno-unused-parameter -Wformat -Wformat-security \ $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS) OBJS= \ + obj/version.o \ obj/checkpoints.o \ obj/netbase.o \ obj/addrman.o \ @@ -105,7 +104,9 @@ OBJS= \ obj/rpcdump.o \ obj/script.o \ obj/util.o \ - obj/wallet.o + obj/wallet.o \ + obj/walletdb.o \ + obj/noui.o all: bitcoind @@ -114,6 +115,11 @@ all: bitcoind -include obj/*.P -include obj-test/*.P +obj/build.h: FORCE + /bin/sh ../share/genbuild.sh obj/build.h +version.cpp: obj/build.h +DEFS += -DHAVE_BUILD_INFO + obj/%.o: %.cpp $(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< @cp $(@:%.o=%.d) $(@:%.o=%.P); \ @@ -142,3 +148,6 @@ clean: -rm -f obj-test/*.o -rm -f obj/*.P -rm -f obj-test/*.P + -rm -f obj/build.h + +FORCE: diff --git a/src/net.cpp b/src/net.cpp index 5ccedb52d5..836f48e769 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -3,18 +3,16 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "headers.h" #include "irc.h" #include "db.h" #include "net.h" #include "init.h" #include "strlcpy.h" #include "addrman.h" +#include "ui_interface.h" #ifdef WIN32 #include <string.h> -#else -#include <netinet/in.h> #endif #ifdef USE_UPNP @@ -37,7 +35,7 @@ void ThreadOpenAddedConnections2(void* parg); void ThreadMapPort2(void* parg); #endif void ThreadDNSAddressSeed2(void* parg); -bool OpenNetworkConnection(const CAddress& addrConnect); +bool OpenNetworkConnection(const CAddress& addrConnect, bool fUseGrant = true); @@ -66,7 +64,7 @@ map<CInv, int64> mapAlreadyAskedFor; set<CNetAddr> setservAddNodeAddresses; CCriticalSection cs_setservAddNodeAddresses; - +static CSemaphore *semOutbound = NULL; unsigned short GetListenPort() { @@ -271,9 +269,11 @@ void ThreadGetMyExternalIP(void* parg) // setAddrKnown automatically filters any duplicate sends. CAddress addr(addrLocalHost); addr.nTime = GetAdjustedTime(); - CRITICAL_BLOCK(cs_vNodes) + { + LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodes) pnode->PushAddress(addr); + } } } } @@ -291,111 +291,12 @@ void AddressCurrentlyConnected(const CService& addr) -void AbandonRequests(void (*fn)(void*, CDataStream&), void* param1) -{ - // If the dialog might get closed before the reply comes back, - // call this in the destructor so it doesn't get called after it's deleted. - CRITICAL_BLOCK(cs_vNodes) - { - BOOST_FOREACH(CNode* pnode, vNodes) - { - CRITICAL_BLOCK(pnode->cs_mapRequests) - { - for (map<uint256, CRequestTracker>::iterator mi = pnode->mapRequests.begin(); mi != pnode->mapRequests.end();) - { - CRequestTracker& tracker = (*mi).second; - if (tracker.fn == fn && tracker.param1 == param1) - pnode->mapRequests.erase(mi++); - else - mi++; - } - } - } - } -} - - - - - - - -// -// Subscription methods for the broadcast and subscription system. -// Channel numbers are message numbers, i.e. MSG_TABLE and MSG_PRODUCT. -// -// The subscription system uses a meet-in-the-middle strategy. -// With 100,000 nodes, if senders broadcast to 1000 random nodes and receivers -// subscribe to 1000 random nodes, 99.995% (1 - 0.99^1000) of messages will get through. -// - -bool AnySubscribed(unsigned int nChannel) -{ - if (pnodeLocalHost->IsSubscribed(nChannel)) - return true; - CRITICAL_BLOCK(cs_vNodes) - BOOST_FOREACH(CNode* pnode, vNodes) - if (pnode->IsSubscribed(nChannel)) - return true; - return false; -} - -bool CNode::IsSubscribed(unsigned int nChannel) -{ - if (nChannel >= vfSubscribe.size()) - return false; - return vfSubscribe[nChannel]; -} - -void CNode::Subscribe(unsigned int nChannel, unsigned int nHops) -{ - if (nChannel >= vfSubscribe.size()) - return; - - if (!AnySubscribed(nChannel)) - { - // Relay subscribe - CRITICAL_BLOCK(cs_vNodes) - BOOST_FOREACH(CNode* pnode, vNodes) - if (pnode != this) - pnode->PushMessage("subscribe", nChannel, nHops); - } - - vfSubscribe[nChannel] = true; -} - -void CNode::CancelSubscribe(unsigned int nChannel) -{ - if (nChannel >= vfSubscribe.size()) - return; - - // Prevent from relaying cancel if wasn't subscribed - if (!vfSubscribe[nChannel]) - return; - vfSubscribe[nChannel] = false; - - if (!AnySubscribed(nChannel)) - { - // Relay subscription cancel - CRITICAL_BLOCK(cs_vNodes) - BOOST_FOREACH(CNode* pnode, vNodes) - if (pnode != this) - pnode->PushMessage("sub-cancel", nChannel); - } -} - - - - - - - CNode* FindNode(const CNetAddr& ip) { - CRITICAL_BLOCK(cs_vNodes) { + LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodes) if ((CNetAddr)pnode->addr == ip) return (pnode); @@ -405,8 +306,8 @@ CNode* FindNode(const CNetAddr& ip) CNode* FindNode(const CService& addr) { - CRITICAL_BLOCK(cs_vNodes) { + LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodes) if ((CService)pnode->addr == addr) return (pnode); @@ -460,8 +361,10 @@ CNode* ConnectNode(CAddress addrConnect, int64 nTimeout) pnode->AddRef(nTimeout); else pnode->AddRef(); - CRITICAL_BLOCK(cs_vNodes) + { + LOCK(cs_vNodes); vNodes.push_back(pnode); + } pnode->nTimeConnected = GetTime(); return pnode; @@ -488,13 +391,6 @@ void CNode::CloseSocketDisconnect() void CNode::Cleanup() { - // All of a nodes broadcasts and subscriptions are automatically torn down - // when it goes down, so a node has to stay up to keep its broadcast going. - - // Cancel subscriptions - for (unsigned int nChannel = 0; nChannel < vfSubscribe.size(); nChannel++) - if (vfSubscribe[nChannel]) - CancelSubscribe(nChannel); } @@ -524,8 +420,8 @@ void CNode::ClearBanned() bool CNode::IsBanned(CNetAddr ip) { bool fResult = false; - CRITICAL_BLOCK(cs_setBanned) { + LOCK(cs_setBanned); std::map<CNetAddr, int64>::iterator i = setBanned.find(ip); if (i != setBanned.end()) { @@ -549,9 +445,11 @@ bool CNode::Misbehaving(int howmuch) if (nMisbehavior >= GetArg("-banscore", 100)) { int64 banTime = GetTime()+GetArg("-bantime", 60*60*24); // Default 24-hour ban - CRITICAL_BLOCK(cs_setBanned) + { + LOCK(cs_setBanned); if (setBanned[addr] < banTime) setBanned[addr] = banTime; + } CloseSocketDisconnect(); printf("Disconnected %s for misbehavior (score=%d)\n", addr.ToString().c_str(), nMisbehavior); return true; @@ -593,15 +491,15 @@ void ThreadSocketHandler2(void* parg) { printf("ThreadSocketHandler started\n"); list<CNode*> vNodesDisconnected; - int nPrevNodeCount = 0; + unsigned int nPrevNodeCount = 0; loop { // // Disconnect nodes // - CRITICAL_BLOCK(cs_vNodes) { + LOCK(cs_vNodes); // Disconnect unused nodes vector<CNode*> vNodesCopy = vNodes; BOOST_FOREACH(CNode* pnode, vNodesCopy) @@ -612,6 +510,10 @@ void ThreadSocketHandler2(void* parg) // remove from vNodes vNodes.erase(remove(vNodes.begin(), vNodes.end(), pnode), vNodes.end()); + if (pnode->fHasGrant) + semOutbound->post(); + pnode->fHasGrant = false; + // close socket and cleanup pnode->CloseSocketDisconnect(); pnode->Cleanup(); @@ -632,11 +534,23 @@ void ThreadSocketHandler2(void* parg) if (pnode->GetRefCount() <= 0) { bool fDelete = false; - TRY_CRITICAL_BLOCK(pnode->cs_vSend) - TRY_CRITICAL_BLOCK(pnode->cs_vRecv) - TRY_CRITICAL_BLOCK(pnode->cs_mapRequests) - TRY_CRITICAL_BLOCK(pnode->cs_inventory) - fDelete = true; + { + TRY_LOCK(pnode->cs_vSend, lockSend); + if (lockSend) + { + TRY_LOCK(pnode->cs_vRecv, lockRecv); + if (lockRecv) + { + TRY_LOCK(pnode->cs_mapRequests, lockReq); + if (lockReq) + { + TRY_LOCK(pnode->cs_inventory, lockInv); + if (lockInv) + fDelete = true; + } + } + } + } if (fDelete) { vNodesDisconnected.remove(pnode); @@ -674,8 +588,8 @@ void ThreadSocketHandler2(void* parg) hSocketMax = max(hSocketMax, hListenSocket); have_fds = true; } - CRITICAL_BLOCK(cs_vNodes) { + LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodes) { if (pnode->hSocket == INVALID_SOCKET) @@ -684,9 +598,11 @@ void ThreadSocketHandler2(void* parg) FD_SET(pnode->hSocket, &fdsetError); hSocketMax = max(hSocketMax, pnode->hSocket); have_fds = true; - TRY_CRITICAL_BLOCK(pnode->cs_vSend) - if (!pnode->vSend.empty()) + { + TRY_LOCK(pnode->cs_vSend, lockSend); + if (lockSend && !pnode->vSend.empty()) FD_SET(pnode->hSocket, &fdsetSend); + } } } @@ -725,10 +641,12 @@ void ThreadSocketHandler2(void* parg) if (hSocket != INVALID_SOCKET) addr = CAddress(sockaddr); - CRITICAL_BLOCK(cs_vNodes) + { + LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodes) - if (pnode->fInbound) - nInbound++; + if (pnode->fInbound) + nInbound++; + } if (hSocket == INVALID_SOCKET) { @@ -737,9 +655,11 @@ void ThreadSocketHandler2(void* parg) } else if (nInbound >= GetArg("-maxconnections", 125) - MAX_OUTBOUND_CONNECTIONS) { - CRITICAL_BLOCK(cs_setservAddNodeAddresses) + { + LOCK(cs_setservAddNodeAddresses); if (!setservAddNodeAddresses.count(addr)) closesocket(hSocket); + } } else if (CNode::IsBanned(addr)) { @@ -751,8 +671,10 @@ void ThreadSocketHandler2(void* parg) printf("accepted connection %s\n", addr.ToString().c_str()); CNode* pnode = new CNode(hSocket, addr, true); pnode->AddRef(); - CRITICAL_BLOCK(cs_vNodes) + { + LOCK(cs_vNodes); vNodes.push_back(pnode); + } } } @@ -761,8 +683,8 @@ void ThreadSocketHandler2(void* parg) // Service each socket // vector<CNode*> vNodesCopy; - CRITICAL_BLOCK(cs_vNodes) { + LOCK(cs_vNodes); vNodesCopy = vNodes; BOOST_FOREACH(CNode* pnode, vNodesCopy) pnode->AddRef(); @@ -779,7 +701,8 @@ void ThreadSocketHandler2(void* parg) continue; if (FD_ISSET(pnode->hSocket, &fdsetRecv) || FD_ISSET(pnode->hSocket, &fdsetError)) { - TRY_CRITICAL_BLOCK(pnode->cs_vRecv) + TRY_LOCK(pnode->cs_vRecv, lockRecv); + if (lockRecv) { CDataStream& vRecv = pnode->vRecv; unsigned int nPos = vRecv.size(); @@ -828,7 +751,8 @@ void ThreadSocketHandler2(void* parg) continue; if (FD_ISSET(pnode->hSocket, &fdsetSend)) { - TRY_CRITICAL_BLOCK(pnode->cs_vSend) + TRY_LOCK(pnode->cs_vSend, lockSend); + if (lockSend) { CDataStream& vSend = pnode->vSend; if (!vSend.empty()) @@ -882,8 +806,8 @@ void ThreadSocketHandler2(void* parg) } } } - CRITICAL_BLOCK(cs_vNodes) { + LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodesCopy) pnode->Release(); } @@ -1271,7 +1195,7 @@ void ThreadOpenConnections2(void* parg) { CAddress addr(CService(strAddr, GetDefaultPort(), fAllowDNS)); if (addr.IsValid()) - OpenNetworkConnection(addr); + OpenNetworkConnection(addr, false); for (int i = 0; i < 10 && i < nLoop; i++) { Sleep(500); @@ -1286,32 +1210,18 @@ void ThreadOpenConnections2(void* parg) int64 nStart = GetTime(); loop { - int nOutbound = 0; - vnThreadsRunning[THREAD_OPENCONNECTIONS]--; Sleep(500); vnThreadsRunning[THREAD_OPENCONNECTIONS]++; if (fShutdown) return; - // Limit outbound connections - loop - { - nOutbound = 0; - CRITICAL_BLOCK(cs_vNodes) - BOOST_FOREACH(CNode* pnode, vNodes) - if (!pnode->fInbound) - nOutbound++; - int nMaxOutboundConnections = MAX_OUTBOUND_CONNECTIONS; - nMaxOutboundConnections = min(nMaxOutboundConnections, (int)GetArg("-maxconnections", 125)); - if (nOutbound < nMaxOutboundConnections) - break; - vnThreadsRunning[THREAD_OPENCONNECTIONS]--; - Sleep(2000); - vnThreadsRunning[THREAD_OPENCONNECTIONS]++; - if (fShutdown) - return; - } + + vnThreadsRunning[THREAD_OPENCONNECTIONS]--; + semOutbound->wait(); + vnThreadsRunning[THREAD_OPENCONNECTIONS]++; + if (fShutdown) + return; // Add seed nodes if IRC isn't working bool fTOR = (fUseProxy && addrProxy.GetPort() == 9050); @@ -1341,12 +1251,17 @@ void ThreadOpenConnections2(void* parg) // Only connect out to one peer per network group (/16 for IPv4). // Do this here so we don't have to critsect vNodes inside mapAddresses critsect. + int nOutbound = 0; set<vector<unsigned char> > setConnected; - CRITICAL_BLOCK(cs_vNodes) - BOOST_FOREACH(CNode* pnode, vNodes) + { + LOCK(cs_vNodes); + BOOST_FOREACH(CNode* pnode, vNodes) { if (!pnode->fInbound) { setConnected.insert(pnode->addr.GetGroup()); + nOutbound++; } + } + } int64 nANow = GetAdjustedTime(); @@ -1376,6 +1291,8 @@ void ThreadOpenConnections2(void* parg) if (addrConnect.IsValid()) OpenNetworkConnection(addrConnect); + else + semOutbound->post(); } } @@ -1412,9 +1329,11 @@ void ThreadOpenAddedConnections2(void* parg) if(Lookup(strAddNode.c_str(), vservNode, GetDefaultPort(), fAllowDNS, 0)) { vservAddressesToAdd.push_back(vservNode); - CRITICAL_BLOCK(cs_setservAddNodeAddresses) + { + LOCK(cs_setservAddNodeAddresses); BOOST_FOREACH(CService& serv, vservNode) setservAddNodeAddresses.insert(serv); + } } } loop @@ -1422,7 +1341,8 @@ void ThreadOpenAddedConnections2(void* parg) vector<vector<CService> > vservConnectAddresses = vservAddressesToAdd; // Attempt to connect to each IP for each addnode entry until at least one is successful per addnode entry // (keeping in mind that addnode entries can have many IPs if fAllowDNS) - CRITICAL_BLOCK(cs_vNodes) + { + LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodes) for (vector<vector<CService> >::iterator it = vservConnectAddresses.begin(); it != vservConnectAddresses.end(); it++) BOOST_FOREACH(CService& addrNode, *(it)) @@ -1432,8 +1352,10 @@ void ThreadOpenAddedConnections2(void* parg) it--; break; } + } BOOST_FOREACH(vector<CService>& vserv, vservConnectAddresses) { + semOutbound->wait(); OpenNetworkConnection(CAddress(*(vserv.begin()))); Sleep(500); if (fShutdown) @@ -1449,7 +1371,14 @@ void ThreadOpenAddedConnections2(void* parg) } } -bool OpenNetworkConnection(const CAddress& addrConnect) +bool static ReleaseGrant(bool fUseGrant) { + if (fUseGrant) + semOutbound->post(); + return false; +} + +// only call this function when semOutbound has been waited for +bool OpenNetworkConnection(const CAddress& addrConnect, bool fUseGrant) { // // Initiate outbound network connection @@ -1458,7 +1387,7 @@ bool OpenNetworkConnection(const CAddress& addrConnect) return false; if ((CNetAddr)addrConnect == (CNetAddr)addrLocalHost || !addrConnect.IsIPv4() || FindNode((CNetAddr)addrConnect) || CNode::IsBanned(addrConnect)) - return false; + return ReleaseGrant(fUseGrant); vnThreadsRunning[THREAD_OPENCONNECTIONS]--; CNode* pnode = ConnectNode(addrConnect); @@ -1466,7 +1395,13 @@ bool OpenNetworkConnection(const CAddress& addrConnect) if (fShutdown) return false; if (!pnode) - return false; + return ReleaseGrant(fUseGrant); + if (pnode->fHasGrant) { + // node already has connection grant, release the one that was passed to us + ReleaseGrant(fUseGrant); + } else { + pnode->fHasGrant = fUseGrant; + } pnode->fNetworkNode = true; return true; @@ -1505,8 +1440,8 @@ void ThreadMessageHandler2(void* parg) while (!fShutdown) { vector<CNode*> vNodesCopy; - CRITICAL_BLOCK(cs_vNodes) { + LOCK(cs_vNodes); vNodesCopy = vNodes; BOOST_FOREACH(CNode* pnode, vNodesCopy) pnode->AddRef(); @@ -1519,20 +1454,26 @@ void ThreadMessageHandler2(void* parg) BOOST_FOREACH(CNode* pnode, vNodesCopy) { // Receive messages - TRY_CRITICAL_BLOCK(pnode->cs_vRecv) - ProcessMessages(pnode); + { + TRY_LOCK(pnode->cs_vRecv, lockRecv); + if (lockRecv) + ProcessMessages(pnode); + } if (fShutdown) return; // Send messages - TRY_CRITICAL_BLOCK(pnode->cs_vSend) - SendMessages(pnode, pnode == pnodeTrickle); + { + TRY_LOCK(pnode->cs_vSend, lockSend); + if (lockSend) + SendMessages(pnode, pnode == pnodeTrickle); + } if (fShutdown) return; } - CRITICAL_BLOCK(cs_vNodes) { + LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodesCopy) pnode->Release(); } @@ -1637,6 +1578,12 @@ bool BindListenPort(string& strError) void StartNode(void* parg) { + if (semOutbound == NULL) { + // initialize semaphore + int nMaxOutbound = min(MAX_OUTBOUND_CONNECTIONS, (int)GetArg("-maxconnections", 125)); + semOutbound = new CSemaphore(nMaxOutbound); + } + #ifdef USE_UPNP #if USE_UPNP fUseUPnP = GetBoolArg("-upnp", true); @@ -1655,12 +1602,16 @@ void StartNode(void* parg) { vector<CNetAddr> vaddr; if (LookupHost(pszHostName, vaddr)) + { BOOST_FOREACH (const CNetAddr &addr, vaddr) + { if (!addr.IsLocal()) { addrLocalHost.SetIP(addr); break; } + } + } } #else // Get local host IP @@ -1759,6 +1710,9 @@ bool StopNode() fShutdown = true; nTransactionsUpdated++; int64 nStart = GetTime(); + if (semOutbound) + for (int i=0; i<MAX_OUTBOUND_CONNECTIONS; i++) + semOutbound->post(); do { int nThreadsRunning = 0; @@ -29,7 +29,6 @@ extern int nBestHeight; inline unsigned int ReceiveBufferSize() { return 1000*GetArg("-maxreceivebuffer", 10*1000); } inline unsigned int SendBufferSize() { return 1000*GetArg("-maxsendbuffer", 10*1000); } -static const unsigned int PUBLISH_HOPS = 5; bool RecvLine(SOCKET hSocket, std::string& strLine); bool GetMyExternalIP(CNetAddr& ipRet); @@ -37,8 +36,6 @@ void AddressCurrentlyConnected(const CService& addr); CNode* FindNode(const CNetAddr& ip); CNode* FindNode(const CService& ip); CNode* ConnectNode(CAddress addrConnect, int64 nTimeout=0); -void AbandonRequests(void (*fn)(void*, CDataStream&), void* param1); -bool AnySubscribed(unsigned int nChannel); void MapPort(bool fMapPort); bool BindListenPort(std::string& strError=REF(std::string())); void StartNode(void* parg); @@ -120,7 +117,7 @@ public: int64 nLastRecv; int64 nLastSendEmpty; int64 nTimeConnected; - signed int nHeaderStart; + int nHeaderStart; unsigned int nMessageStart; CAddress addr; int nVersion; @@ -130,6 +127,7 @@ public: bool fNetworkNode; bool fSuccessfullyConnected; bool fDisconnect; + bool fHasGrant; // whether to call semOutbound.post() at disconnect protected: int nRefCount; @@ -160,17 +158,10 @@ public: CCriticalSection cs_inventory; std::multimap<int64, CInv> mapAskFor; - // publish and subscription - std::vector<char> vfSubscribe; - - CNode(SOCKET hSocketIn, CAddress addrIn, bool fInboundIn=false) + CNode(SOCKET hSocketIn, CAddress addrIn, bool fInboundIn=false) : vSend(SER_NETWORK, MIN_PROTO_VERSION), vRecv(SER_NETWORK, MIN_PROTO_VERSION) { nServices = 0; hSocket = hSocketIn; - vSend.SetType(SER_NETWORK); - vRecv.SetType(SER_NETWORK); - vSend.SetVersion(209); - vRecv.SetVersion(209); nLastSend = 0; nLastRecv = 0; nLastSendEmpty = GetTime(); @@ -181,6 +172,7 @@ public: nVersion = 0; strSubVer = ""; fClient = false; // set by version message + fHasGrant = false; fInbound = fInboundIn; fNetworkNode = false; fSuccessfullyConnected = false; @@ -192,7 +184,6 @@ public: hashLastGetBlocksEnd = 0; nStartingHeight = -1; fGetAddr = false; - vfSubscribe.assign(256, false); nMisbehavior = 0; setInventoryKnown.max_size(SendBufferSize() / 1000); @@ -254,15 +245,19 @@ public: void AddInventoryKnown(const CInv& inv) { - CRITICAL_BLOCK(cs_inventory) + { + LOCK(cs_inventory); setInventoryKnown.insert(inv); + } } void PushInventory(const CInv& inv) { - CRITICAL_BLOCK(cs_inventory) + { + LOCK(cs_inventory); if (!setInventoryKnown.count(inv)) vInventoryToSend.push_back(inv); + } } void AskFor(const CInv& inv) @@ -302,7 +297,7 @@ public: void AbortMessage() { - if (nHeaderStart == -1) + if (nHeaderStart < 0) return; vSend.resize(nHeaderStart); nHeaderStart = -1; @@ -322,7 +317,7 @@ public: return; } - if (nHeaderStart == -1) + if (nHeaderStart < 0) return; // Set the size @@ -347,7 +342,7 @@ public: void EndMessageAbortIfEmpty() { - if (nHeaderStart == -1) + if (nHeaderStart < 0) return; int nSize = vSend.size() - nMessageStart; if (nSize > 0) @@ -526,8 +521,10 @@ public: uint256 hashReply; RAND_bytes((unsigned char*)&hashReply, sizeof(hashReply)); - CRITICAL_BLOCK(cs_mapRequests) + { + LOCK(cs_mapRequests); mapRequests[hashReply] = CRequestTracker(fn, param1); + } PushMessage(pszCommand, hashReply); } @@ -539,8 +536,10 @@ public: uint256 hashReply; RAND_bytes((unsigned char*)&hashReply, sizeof(hashReply)); - CRITICAL_BLOCK(cs_mapRequests) + { + LOCK(cs_mapRequests); mapRequests[hashReply] = CRequestTracker(fn, param1); + } PushMessage(pszCommand, hashReply, a1); } @@ -552,8 +551,10 @@ public: uint256 hashReply; RAND_bytes((unsigned char*)&hashReply, sizeof(hashReply)); - CRITICAL_BLOCK(cs_mapRequests) + { + LOCK(cs_mapRequests); mapRequests[hashReply] = CRequestTracker(fn, param1); + } PushMessage(pszCommand, hashReply, a1, a2); } @@ -599,15 +600,17 @@ public: inline void RelayInventory(const CInv& inv) { // Put on lists to offer to the other nodes - CRITICAL_BLOCK(cs_vNodes) + { + LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodes) pnode->PushInventory(inv); + } } template<typename T> void RelayMessage(const CInv& inv, const T& a) { - CDataStream ss(SER_NETWORK); + CDataStream ss(SER_NETWORK, PROTOCOL_VERSION); ss.reserve(10000); ss << a; RelayMessage(inv, ss); @@ -616,8 +619,8 @@ void RelayMessage(const CInv& inv, const T& a) template<> inline void RelayMessage<>(const CInv& inv, const CDataStream& ss) { - CRITICAL_BLOCK(cs_mapRelay) { + LOCK(cs_mapRelay); // Expire old relay messages while (!vRelayExpiration.empty() && vRelayExpiration.front().first < GetTime()) { @@ -626,7 +629,7 @@ inline void RelayMessage<>(const CInv& inv, const CDataStream& ss) } // Save original serialized message so newer versions are preserved - mapRelay[inv] = ss; + mapRelay.insert(std::make_pair(inv, ss)); vRelayExpiration.push_back(std::make_pair(GetTime() + 15 * 60, inv)); } @@ -634,58 +637,4 @@ inline void RelayMessage<>(const CInv& inv, const CDataStream& ss) } - - - - - - -// -// Templates for the publish and subscription system. -// The object being published as T& obj needs to have: -// a set<unsigned int> setSources member -// specializations of AdvertInsert and AdvertErase -// Currently implemented for CTable and CProduct. -// - -template<typename T> -void AdvertStartPublish(CNode* pfrom, unsigned int nChannel, unsigned int nHops, T& obj) -{ - // Add to sources - obj.setSources.insert(pfrom->addr.ip); - - if (!AdvertInsert(obj)) - return; - - // Relay - CRITICAL_BLOCK(cs_vNodes) - BOOST_FOREACH(CNode* pnode, vNodes) - if (pnode != pfrom && (nHops < PUBLISH_HOPS || pnode->IsSubscribed(nChannel))) - pnode->PushMessage("publish", nChannel, nHops, obj); -} - -template<typename T> -void AdvertStopPublish(CNode* pfrom, unsigned int nChannel, unsigned int nHops, T& obj) -{ - uint256 hash = obj.GetHash(); - - CRITICAL_BLOCK(cs_vNodes) - BOOST_FOREACH(CNode* pnode, vNodes) - if (pnode != pfrom && (nHops < PUBLISH_HOPS || pnode->IsSubscribed(nChannel))) - pnode->PushMessage("pub-cancel", nChannel, nHops, hash); - - AdvertErase(obj); -} - -template<typename T> -void AdvertRemoveSource(CNode* pfrom, unsigned int nChannel, unsigned int nHops, T& obj) -{ - // Remove a source - obj.setSources.erase(pfrom->addr.ip); - - // If no longer supported by any sources, cancel it - if (obj.setSources.empty()) - AdvertStopPublish(pfrom, nChannel, nHops, obj); -} - #endif diff --git a/src/netbase.cpp b/src/netbase.cpp index b0f2903a65..81866ad1bc 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -543,7 +543,7 @@ std::vector<unsigned char> CNetAddr::GetGroup() const nClass = 1; nStartByte = 12; } - // for 6to4 tunneled addresses, use the encapsulated IPv4 address + // for 6to4 tunnelled addresses, use the encapsulated IPv4 address else if (IsRFC3964()) { nClass = 1; diff --git a/src/netbase.h b/src/netbase.h index 2543a02248..bc35f7da14 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -7,26 +7,15 @@ #include <string> #include <vector> -#ifdef WIN32 -#define _WIN32_WINNT 0x0501 -#include <winsock2.h> -#include <mswsock.h> -#include <ws2tcpip.h> -#else -#include <sys/types.h> -#include <sys/socket.h> -#include <arpa/inet.h> -#include <netdb.h> -#include <net/if.h> -#include <ifaddrs.h> -#include <netinet/in.h> -#endif - #include "serialize.h" #include "compat.h" extern int nConnectTimeout; +#ifdef WIN32 +// In MSVC, this is defined as a macro, undefine it to prevent a compile and link error +#undef SetPort +#endif /** IP address (IPv6, or IPv4 using mapped IPv6 range (::FFFF:0:0/96)) */ class CNetAddr @@ -79,7 +68,7 @@ class CNetAddr ) }; -/** A combnation of a network address (CNetAddr) and a (TCP) port */ +/** A combination of a network address (CNetAddr) and a (TCP) port */ class CService : public CNetAddr { protected: diff --git a/src/noui.cpp b/src/noui.cpp new file mode 100644 index 0000000000..6d984680b1 --- /dev/null +++ b/src/noui.cpp @@ -0,0 +1,44 @@ +// Copyright (c) 2010 Satoshi Nakamoto +// Copyright (c) 2009-2012 The Bitcoin developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include "ui_interface.h" + +#include <string> +#include "init.h" + +int ThreadSafeMessageBox(const std::string& message, const std::string& caption, int style) +{ + printf("%s: %s\n", caption.c_str(), message.c_str()); + fprintf(stderr, "%s: %s\n", caption.c_str(), message.c_str()); + return 4; +} + +bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption) +{ + return true; +} + +void MainFrameRepaint() +{ +} + +void AddressBookRepaint() +{ +} + +void InitMessage(const std::string &message) +{ +} + +std::string _(const char* psz) +{ + return psz; +} + +void QueueShutdown() +{ + // Without UI, Shutdown can simply be started in a new thread + CreateThread(Shutdown, NULL); +} + diff --git a/src/noui.h b/src/noui.h deleted file mode 100644 index 819e9de5d1..0000000000 --- a/src/noui.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2012 The Bitcoin developers -// Distributed under the MIT/X11 software license, see the accompanying -// file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_NOUI_H -#define BITCOIN_NOUI_H - -#include <string> -#include <boost/function.hpp> -#include "wallet.h" - -typedef void wxWindow; -#define wxYES 0x00000002 -#define wxOK 0x00000004 -#define wxNO 0x00000008 -#define wxYES_NO (wxYES|wxNO) -#define wxCANCEL 0x00000010 -#define wxAPPLY 0x00000020 -#define wxCLOSE 0x00000040 -#define wxOK_DEFAULT 0x00000000 -#define wxYES_DEFAULT 0x00000000 -#define wxNO_DEFAULT 0x00000080 -#define wxCANCEL_DEFAULT 0x80000000 -#define wxICON_EXCLAMATION 0x00000100 -#define wxICON_HAND 0x00000200 -#define wxICON_WARNING wxICON_EXCLAMATION -#define wxICON_ERROR wxICON_HAND -#define wxICON_QUESTION 0x00000400 -#define wxICON_INFORMATION 0x00000800 -#define wxICON_STOP wxICON_HAND -#define wxICON_ASTERISK wxICON_INFORMATION -#define wxICON_MASK (0x00000100|0x00000200|0x00000400|0x00000800) -#define wxFORWARD 0x00001000 -#define wxBACKWARD 0x00002000 -#define wxRESET 0x00004000 -#define wxHELP 0x00008000 -#define wxMORE 0x00010000 -#define wxSETUP 0x00020000 -// Force blocking, modal message box dialog (not just notification) -#define wxMODAL 0x00040000 - -inline int MyMessageBox(const std::string& message, const std::string& caption="Message", int style=wxOK, wxWindow* parent=NULL, int x=-1, int y=-1) -{ - printf("%s: %s\n", caption.c_str(), message.c_str()); - fprintf(stderr, "%s: %s\n", caption.c_str(), message.c_str()); - return 4; -} -#define wxMessageBox MyMessageBox - -inline int ThreadSafeMessageBox(const std::string& message, const std::string& caption, int style=wxOK, wxWindow* parent=NULL, int x=-1, int y=-1) -{ - return MyMessageBox(message, caption, style, parent, x, y); -} - -inline bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption, wxWindow* parent) -{ - return true; -} - -inline void CalledSetStatusBar(const std::string& strText, int nField) -{ -} - -inline void UIThreadCall(boost::function0<void> fn) -{ -} - -inline void MainFrameRepaint() -{ -} - -inline void InitMessage(const std::string &message) -{ -} - -#endif diff --git a/src/obj/nogui/.gitignore b/src/obj/nogui/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/src/obj/nogui/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/src/obj/test/.gitignore b/src/obj/test/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/src/obj/test/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/src/protocol.cpp b/src/protocol.cpp index 213e8a4d53..d6e340e366 100644 --- a/src/protocol.cpp +++ b/src/protocol.cpp @@ -128,7 +128,7 @@ bool operator<(const CInv& a, const CInv& b) bool CInv::IsKnownType() const { - return (type >= 1 && type < ARRAYLEN(ppszTypeName)); + return (type >= 1 && type < (int)ARRAYLEN(ppszTypeName)); } const char* CInv::GetCommand() const diff --git a/src/protocol.h b/src/protocol.h index 69e3996956..b516f1b897 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -12,7 +12,6 @@ #include "serialize.h" #include "netbase.h" -#include "util.h" #include <string> #include "uint256.h" @@ -79,9 +78,10 @@ class CAddress : public CService if (fRead) pthis->Init(); if (nType & SER_DISK) - READWRITE(nVersion); - if ((nType & SER_DISK) || (nVersion >= 31402 && !(nType & SER_GETHASH))) - READWRITE(nTime); + READWRITE(nVersion); + if ((nType & SER_DISK) || + (nVersion >= CADDR_TIME_VERSION && !(nType & SER_GETHASH))) + READWRITE(nTime); READWRITE(nServices); READWRITE(*pip); ) diff --git a/src/qt/aboutdialog.cpp b/src/qt/aboutdialog.cpp index 08d7774067..0b98befe8d 100644 --- a/src/qt/aboutdialog.cpp +++ b/src/qt/aboutdialog.cpp @@ -2,6 +2,8 @@ #include "ui_aboutdialog.h" #include "clientmodel.h" +#include "version.h" + AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDialog) diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index 11fbed88f0..2893580e5c 100644 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -43,15 +43,19 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) : ui->tableView->setFocus(); break; case ForEditing: - ui->buttonBox->hide(); + ui->buttonBox->setVisible(false); break; } switch(tab) { case SendingTab: - ui->labelExplanation->hide(); + ui->labelExplanation->setVisible(false); + ui->deleteButton->setVisible(true); + ui->signMessage->setVisible(false); break; case ReceivingTab: + ui->deleteButton->setVisible(false); + ui->signMessage->setVisible(true); break; } ui->tableView->setTabKeyNavigation(false); @@ -90,8 +94,6 @@ void AddressBookPage::setModel(AddressTableModel *model) this->model = model; if(!model) return; - // Refresh list from core - model->updateList(); proxyModel = new QSortFilterProxyModel(this); proxyModel->setSourceModel(model); @@ -130,6 +132,7 @@ void AddressBookPage::on_copyToClipboard_clicked() { GUIUtil::copyEntryData(ui->tableView, AddressTableModel::Address); } + void AddressBookPage::onCopyLabelAction() { GUIUtil::copyEntryData(ui->tableView, AddressTableModel::Label); @@ -221,14 +224,18 @@ void AddressBookPage::selectionChanged() case SendingTab: // In sending tab, allow deletion of selection ui->deleteButton->setEnabled(true); + ui->deleteButton->setVisible(true); deleteAction->setEnabled(true); ui->signMessage->setEnabled(false); + ui->signMessage->setVisible(false); break; case ReceivingTab: // Deleting receiving addresses, however, is not allowed ui->deleteButton->setEnabled(false); + ui->deleteButton->setVisible(false); deleteAction->setEnabled(false); ui->signMessage->setEnabled(true); + ui->signMessage->setVisible(true); break; } ui->copyToClipboard->setEnabled(true); @@ -300,16 +307,12 @@ void AddressBookPage::on_showQRCode_clicked() QTableView *table = ui->tableView; QModelIndexList indexes = table->selectionModel()->selectedRows(AddressTableModel::Address); - - QRCodeDialog *d; foreach (QModelIndex index, indexes) { - QString address = index.data().toString(), - label = index.sibling(index.row(), 0).data(Qt::EditRole).toString(), - title = QString("%1%2<< %3 >>").arg(label).arg(label.isEmpty() ? "" : " ").arg(address); + QString address = index.data().toString(), label = index.sibling(index.row(), 0).data(Qt::EditRole).toString(); - QRCodeDialog *d = new QRCodeDialog(title, address, label, tab == ReceivingTab, this); - d->show(); + QRCodeDialog *dialog = new QRCodeDialog(address, label, tab == ReceivingTab, this); + dialog->show(); } #endif } diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp index 5d724ea1d1..7b95f51c04 100644 --- a/src/qt/addresstablemodel.cpp +++ b/src/qt/addresstablemodel.cpp @@ -2,7 +2,7 @@ #include "guiutil.h" #include "walletmodel.h" -#include "headers.h" +#include "wallet.h" #include <QFont> #include <QColor> @@ -40,8 +40,8 @@ public: { cachedAddressTable.clear(); - CRITICAL_BLOCK(wallet->cs_wallet) { + LOCK(wallet->cs_wallet); BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, std::string)& item, wallet->mapAddressBook) { const CBitcoinAddress& address = item.first; @@ -170,8 +170,8 @@ bool AddressTableModel::setData(const QModelIndex & index, const QVariant & valu // Double-check that we're not overwriting a receiving address if(rec->type == AddressTableEntry::Sending) { - CRITICAL_BLOCK(wallet->cs_wallet) { + LOCK(wallet->cs_wallet); // Remove old entry wallet->DelAddressBookName(rec->address.toStdString()); // Add new entry with new address @@ -232,7 +232,7 @@ QModelIndex AddressTableModel::index(int row, int column, const QModelIndex & pa } } -void AddressTableModel::updateList() +void AddressTableModel::update() { // Update address book model from Bitcoin core beginResetModel(); @@ -255,8 +255,8 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con return QString(); } // Check for duplicate addresses - CRITICAL_BLOCK(wallet->cs_wallet) { + LOCK(wallet->cs_wallet); if(wallet->mapAddressBook.count(strAddress)) { editStatus = DUPLICATE_ADDRESS; @@ -286,10 +286,11 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con { return QString(); } - // Add entry and update list - CRITICAL_BLOCK(wallet->cs_wallet) + // Add entry + { + LOCK(wallet->cs_wallet); wallet->SetAddressBookName(strAddress, strLabel); - updateList(); + } return QString::fromStdString(strAddress); } @@ -303,25 +304,19 @@ bool AddressTableModel::removeRows(int row, int count, const QModelIndex & paren // Also refuse to remove receiving addresses. return false; } - CRITICAL_BLOCK(wallet->cs_wallet) { + LOCK(wallet->cs_wallet); wallet->DelAddressBookName(rec->address.toStdString()); } - updateList(); return true; } -void AddressTableModel::update() -{ - -} - /* Look up label for address in address book, if not found return empty string. */ QString AddressTableModel::labelForAddress(const QString &address) const { - CRITICAL_BLOCK(wallet->cs_wallet) { + LOCK(wallet->cs_wallet); CBitcoinAddress address_parsed(address.toStdString()); std::map<CBitcoinAddress, std::string>::iterator mi = wallet->mapAddressBook.find(address_parsed); if (mi != wallet->mapAddressBook.end()) diff --git a/src/qt/addresstablemodel.h b/src/qt/addresstablemodel.h index 0743300137..7fd07cfb81 100644 --- a/src/qt/addresstablemodel.h +++ b/src/qt/addresstablemodel.h @@ -56,10 +56,6 @@ public: */ QString addRow(const QString &type, const QString &label, const QString &address); - /* Update address list from core. Invalidates any indices. - */ - void updateList(); - /* Look up label for address in address book, if not found return empty string. */ QString labelForAddress(const QString &address) const; @@ -82,6 +78,8 @@ signals: void defaultAddressChanged(const QString &address); public slots: + /* Update address list from core. Invalidates any indices. + */ void update(); }; diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index d71073324d..1e7c582684 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -5,15 +5,14 @@ #include "clientmodel.h" #include "walletmodel.h" #include "optionsmodel.h" +#include "guiutil.h" -#include "headers.h" #include "init.h" +#include "ui_interface.h" #include "qtipcserver.h" -#include "util.h" #include <QApplication> #include <QMessageBox> -#include <QThread> #include <QTextCodec> #include <QLocale> #include <QTranslator> @@ -22,31 +21,32 @@ #include <boost/interprocess/ipc/message_queue.hpp> -// Need a global reference for the notifications to find the GUI -BitcoinGUI *guiref; -QSplashScreen *splashref; +#if defined(BITCOIN_NEED_QT_PLUGINS) && !defined(_BITCOIN_QT_PLUGINS_INCLUDED) +#define _BITCOIN_QT_PLUGINS_INCLUDED +#define __INSURE__ +#include <QtPlugin> +Q_IMPORT_PLUGIN(qcncodecs) +Q_IMPORT_PLUGIN(qjpcodecs) +Q_IMPORT_PLUGIN(qtwcodecs) +Q_IMPORT_PLUGIN(qkrcodecs) +Q_IMPORT_PLUGIN(qtaccessiblewidgets) +#endif -int MyMessageBox(const std::string& message, const std::string& caption, int style, wxWindow* parent, int x, int y) -{ - // Message from AppInit2(), always in main thread before main window is constructed - QMessageBox::critical(0, QString::fromStdString(caption), - QString::fromStdString(message), - QMessageBox::Ok, QMessageBox::Ok); - return 4; -} +// Need a global reference for the notifications to find the GUI +static BitcoinGUI *guiref; +static QSplashScreen *splashref; +static WalletModel *walletmodel; +static ClientModel *clientmodel; -int ThreadSafeMessageBox(const std::string& message, const std::string& caption, int style, wxWindow* parent, int x, int y) +int ThreadSafeMessageBox(const std::string& message, const std::string& caption, int style) { - bool modal = style & wxMODAL; - - if (modal) - while (!guiref) - Sleep(1000); - // Message from network thread if(guiref) { - QMetaObject::invokeMethod(guiref, "error", Qt::QueuedConnection, + bool modal = (style & wxMODAL); + // in case of modal message, use blocking connection to wait for user to click OK + QMetaObject::invokeMethod(guiref, "error", + modal ? GUIUtil::blockingGUIThreadConnection() : Qt::QueuedConnection, Q_ARG(QString, QString::fromStdString(caption)), Q_ARG(QString, QString::fromStdString(message)), Q_ARG(bool, modal)); @@ -59,7 +59,7 @@ int ThreadSafeMessageBox(const std::string& message, const std::string& caption, return 4; } -bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption, wxWindow* parent) +bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption) { if(!guiref) return false; @@ -67,15 +67,7 @@ bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption, wxWindo return true; bool payFee = false; - // Call slot on GUI thread. - // If called from another thread, use a blocking QueuedConnection. - Qt::ConnectionType connectionType = Qt::DirectConnection; - if(QThread::currentThread() != QCoreApplication::instance()->thread()) - { - connectionType = Qt::BlockingQueuedConnection; - } - - QMetaObject::invokeMethod(guiref, "askFee", connectionType, + QMetaObject::invokeMethod(guiref, "askFee", GUIUtil::blockingGUIThreadConnection(), Q_ARG(qint64, nFeeRequired), Q_ARG(bool*, &payFee)); @@ -87,31 +79,22 @@ void ThreadSafeHandleURI(const std::string& strURI) if(!guiref) return; - // Call slot on GUI thread. - // If called from another thread, use a blocking QueuedConnection. - Qt::ConnectionType connectionType = Qt::DirectConnection; - if(QThread::currentThread() != QCoreApplication::instance()->thread()) - { - connectionType = Qt::BlockingQueuedConnection; - } - QMetaObject::invokeMethod(guiref, "handleURI", connectionType, + QMetaObject::invokeMethod(guiref, "handleURI", GUIUtil::blockingGUIThreadConnection(), Q_ARG(QString, QString::fromStdString(strURI))); } -void CalledSetStatusBar(const std::string& strText, int nField) -{ - // Only used for built-in mining, which is disabled, simple ignore -} - -void UIThreadCall(boost::function0<void> fn) +void MainFrameRepaint() { - // Only used for built-in mining, which is disabled, simple ignore + if(clientmodel) + QMetaObject::invokeMethod(clientmodel, "update", Qt::QueuedConnection); + if(walletmodel) + QMetaObject::invokeMethod(walletmodel, "update", Qt::QueuedConnection); } -void MainFrameRepaint() +void AddressBookRepaint() { - if(guiref) - QMetaObject::invokeMethod(guiref, "refreshStatusBar", Qt::QueuedConnection); + if(walletmodel) + QMetaObject::invokeMethod(walletmodel, "updateAddressList", Qt::QueuedConnection); } void InitMessage(const std::string &message) @@ -145,6 +128,9 @@ static void handleRunawayException(std::exception *e) exit(1); } +#ifdef WIN32 +#define strncasecmp strnicmp +#endif #ifndef BITCOIN_QT_TEST int main(int argc, char *argv[]) { @@ -182,7 +168,7 @@ int main(int argc, char *argv[]) ParseParameters(argc, argv); // ... then bitcoin.conf: - if (!ReadConfigFile(mapArgs, mapMultiArgs)) + if (!boost::filesystem::is_directory(GetDataDir(false))) { // This message can not be translated, as translation is not initialized yet // (which not yet possible because lang=XX can be overridden in bitcoin.conf in the data directory) @@ -190,6 +176,7 @@ int main(int argc, char *argv[]) QString("Error: Specified data directory \"%1\" does not exist.").arg(QString::fromStdString(mapArgs["-datadir"]))); return 1; } + ReadConfigFile(mapArgs, mapMultiArgs); // Application identification (must be set before OptionsModel is initialized, // as it is used to locate QSettings) @@ -243,22 +230,24 @@ int main(int argc, char *argv[]) try { + BitcoinGUI window; + guiref = &window; if(AppInit2(argc, argv)) { { - // Put this in a block, so that BitcoinGUI is cleaned up properly before - // calling Shutdown() in case of exceptions. + // Put this in a block, so that the Model objects are cleaned up before + // calling Shutdown(). optionsModel.Upgrade(); // Must be done after AppInit2 - BitcoinGUI window; if (splashref) splash.finish(&window); ClientModel clientModel(&optionsModel); + clientmodel = &clientModel; WalletModel walletModel(pwalletMain, &optionsModel); + walletmodel = &walletModel; - guiref = &window; window.setClientModel(&clientModel); window.setWalletModel(&walletModel); @@ -296,7 +285,11 @@ int main(int argc, char *argv[]) app.exec(); window.hide(); + window.setClientModel(0); + window.setWalletModel(0); guiref = 0; + clientmodel = 0; + walletmodel = 0; } // Shutdown the core and its threads, but don't exit Bitcoin-Qt here Shutdown(NULL); diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index 8f2bba2737..e631a65155 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/icons" lang="edit"> + <qresource prefix="/icons"> <file alias="bitcoin">res/icons/bitcoin.png</file> <file alias="address-book">res/icons/address-book.png</file> <file alias="quit">res/icons/quit.png</file> diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 8c86cdaee0..d9754b2008 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -4,9 +4,6 @@ * W.J. van der Laan 2011-2012 * The Bitcoin Developers 2011-2012 */ - -#include "checkpoints.h" - #include "bitcoingui.h" #include "transactiontablemodel.h" #include "addressbookpage.h" @@ -26,6 +23,7 @@ #include "guiconstants.h" #include "askpassphrasedialog.h" #include "notificator.h" +#include "guiutil.h" #ifdef Q_WS_MAC #include "macdockiconhandler.h" @@ -142,11 +140,11 @@ BitcoinGUI::BitcoinGUI(QWidget *parent): frameBlocksLayout->addWidget(labelBlocksIcon); frameBlocksLayout->addStretch(); - // Progress bar for blocks download - progressBarLabel = new QLabel(tr("Synchronizing with network...")); + // Progress bar and label for blocks download + progressBarLabel = new QLabel(); progressBarLabel->setVisible(false); progressBar = new QProgressBar(); - progressBar->setToolTip(tr("Block chain synchronization in progress")); + progressBar->setAlignment(Qt::AlignCenter); progressBar->setVisible(false); // Override style sheet for progress bar for styles that have a segmented progress bar, @@ -247,8 +245,8 @@ void BitcoinGUI::createActions() optionsAction = new QAction(QIcon(":/icons/options"), tr("&Options..."), this); optionsAction->setToolTip(tr("Modify configuration options for bitcoin")); optionsAction->setMenuRole(QAction::PreferencesRole); - openBitcoinAction = new QAction(QIcon(":/icons/bitcoin"), tr("Open &Bitcoin"), this); - openBitcoinAction->setToolTip(tr("Show the Bitcoin window")); + toggleHideAction = new QAction(QIcon(":/icons/bitcoin"), tr("Show/Hide &Bitcoin"), this); + toggleHideAction->setToolTip(tr("Show or hide the Bitcoin window")); exportAction = new QAction(QIcon(":/icons/export"), tr("&Export..."), this); exportAction->setToolTip(tr("Export the data in the current tab to a file")); encryptWalletAction = new QAction(QIcon(":/icons/lock_closed"), tr("&Encrypt Wallet"), this); @@ -263,7 +261,7 @@ void BitcoinGUI::createActions() connect(optionsAction, SIGNAL(triggered()), this, SLOT(optionsClicked())); connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked())); connect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt())); - connect(openBitcoinAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized())); + connect(toggleHideAction, SIGNAL(triggered()), this, SLOT(toggleHidden())); connect(encryptWalletAction, SIGNAL(triggered(bool)), this, SLOT(encryptWallet(bool))); connect(backupWalletAction, SIGNAL(triggered()), this, SLOT(backupWallet())); connect(changePassphraseAction, SIGNAL(triggered()), this, SLOT(changePassphrase())); @@ -350,7 +348,7 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel) connect(clientModel, SIGNAL(numBlocksChanged(int)), this, SLOT(setNumBlocks(int))); // Report errors from network/worker thread - connect(clientModel, SIGNAL(error(QString,QString)), this, SLOT(error(QString,QString))); + connect(clientModel, SIGNAL(error(QString,QString, bool)), this, SLOT(error(QString,QString,bool))); } } @@ -360,7 +358,7 @@ void BitcoinGUI::setWalletModel(WalletModel *walletModel) if(walletModel) { // Report errors from wallet thread - connect(walletModel, SIGNAL(error(QString,QString)), this, SLOT(error(QString,QString))); + connect(walletModel, SIGNAL(error(QString,QString,bool)), this, SLOT(error(QString,QString,bool))); // Put transaction list in tabs transactionView->setModel(walletModel); @@ -390,7 +388,7 @@ void BitcoinGUI::createTrayIcon() trayIcon = new QSystemTrayIcon(this); trayIconMenu = new QMenu(this); trayIcon->setContextMenu(trayIconMenu); - trayIcon->setToolTip("Bitcoin client"); + trayIcon->setToolTip(tr("Bitcoin client")); trayIcon->setIcon(QIcon(":/icons/toolbar")); connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayIconActivated(QSystemTrayIcon::ActivationReason))); @@ -398,12 +396,11 @@ void BitcoinGUI::createTrayIcon() #else // Note: On Mac, the dock icon is used to provide the tray's functionality. MacDockIconHandler *dockIconHandler = MacDockIconHandler::instance(); - connect(dockIconHandler, SIGNAL(dockIconClicked()), openBitcoinAction, SLOT(trigger())); trayIconMenu = dockIconHandler->dockMenu(); #endif // Configuration of the tray icon (or dock icon) icon menu - trayIconMenu->addAction(openBitcoinAction); + trayIconMenu->addAction(toggleHideAction); trayIconMenu->addSeparator(); trayIconMenu->addAction(messageAction); #ifndef FIRST_CLASS_MESSAGING @@ -426,12 +423,34 @@ void BitcoinGUI::trayIconActivated(QSystemTrayIcon::ActivationReason reason) { if(reason == QSystemTrayIcon::Trigger) { - // Click on system tray icon triggers "open bitcoin" - openBitcoinAction->trigger(); + // Click on system tray icon triggers "show/hide bitcoin" + toggleHideAction->trigger(); } } #endif +void BitcoinGUI::toggleHidden() +{ + // activateWindow() (sometimes) helps with keyboard focus on Windows + if (isHidden()) + { + show(); + activateWindow(); + } + else if (isMinimized()) + { + showNormal(); + activateWindow(); + } + else if (GUIUtil::isObscured(this)) + { + raise(); + activateWindow(); + } + else + hide(); +} + void BitcoinGUI::optionsClicked() { if(!clientModel || !clientModel->getOptionsModel()) @@ -465,20 +484,31 @@ void BitcoinGUI::setNumConnections(int count) void BitcoinGUI::setNumBlocks(int count) { - if(!clientModel) + // don't show / hide progressBar and its label if we have no connection(s) to the network + if (!clientModel || clientModel->getNumConnections() == 0) + { + progressBarLabel->setVisible(false); + progressBar->setVisible(false); + return; - int total = clientModel->getNumBlocksOfPeers(); + } + + int nTotalBlocks = clientModel->getNumBlocksOfPeers(); QString tooltip; - if(count < total) + if(count < nTotalBlocks) { + int nRemainingBlocks = nTotalBlocks - count; + float nPercentageDone = count / (nTotalBlocks * 0.01f); + if (clientModel->getStatusBarWarnings() == "") { - progressBarLabel->setVisible(true); progressBarLabel->setText(tr("Synchronizing with network...")); - progressBar->setVisible(true); - progressBar->setMaximum(total); + progressBarLabel->setVisible(true); + progressBar->setFormat(tr("~%n block(s) remaining", "", nRemainingBlocks)); + progressBar->setMaximum(nTotalBlocks); progressBar->setValue(count); + progressBar->setVisible(true); } else { @@ -486,7 +516,7 @@ void BitcoinGUI::setNumBlocks(int count) progressBarLabel->setVisible(true); progressBar->setVisible(false); } - tooltip = tr("Downloaded %1 of %2 blocks of transaction history.").arg(count).arg(total); + tooltip = tr("Downloaded %1 of %2 blocks of transaction history (%3% done).").arg(count).arg(nTotalBlocks).arg(nPercentageDone, 0, 'f', 2); } else { @@ -529,10 +559,10 @@ void BitcoinGUI::setNumBlocks(int count) } // Set icon state: spinning if catching up, tick otherwise - if(secs < 90*60 && count >= Checkpoints::GetTotalBlocksEstimate()) + if(secs < 90*60 && count >= nTotalBlocks) { tooltip = tr("Up to date") + QString(".\n") + tooltip; - labelBlocksIcon->setPixmap(QIcon(":/icons/synced").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE)); + labelBlocksIcon->setPixmap(QIcon(":/icons/synced").pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE)); } else { @@ -552,23 +582,10 @@ void BitcoinGUI::setNumBlocks(int count) progressBar->setToolTip(tooltip); } -void BitcoinGUI::refreshStatusBar() -{ - /* Might display multiple times in the case of multiple alerts - static QString prevStatusBar; - QString newStatusBar = clientModel->getStatusBarWarnings(); - if (prevStatusBar != newStatusBar) - { - prevStatusBar = newStatusBar; - error(tr("Network Alert"), newStatusBar); - }*/ - setNumBlocks(clientModel->getNumBlocks()); -} - void BitcoinGUI::error(const QString &title, const QString &message, bool modal) { // Report errors from network/worker thread - if (modal) + if(modal) { QMessageBox::critical(this, title, message, QMessageBox::Ok, QMessageBox::Ok); } else { diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 9dec43cd02..1db43e4ad6 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -81,7 +81,7 @@ private: QAction *aboutAction; QAction *receiveCoinsAction; QAction *optionsAction; - QAction *openBitcoinAction; + QAction *toggleHideAction; QAction *exportAction; QAction *encryptWalletAction; QAction *backupWalletAction; @@ -113,11 +113,9 @@ public slots: @see WalletModel::EncryptionStatus */ void setEncryptionStatus(int status); - /** Set the status bar text if there are any warnings (removes sync progress bar if applicable) */ - void refreshStatusBar(); /** Notify the user of an error in the network or transaction handling code. */ - void error(const QString &title, const QString &message, bool modal = false); + void error(const QString &title, const QString &message, bool modal); /** Asks the user whether to pay the transaction fee or to cancel the transaction. It is currently not possible to pass a return value to another thread through BlockingQueuedConnection, so an indirected pointer is used. @@ -168,6 +166,8 @@ private slots: /** Show window if hidden, unminimize when minimized */ void showNormalIfMinimized(); + /** Hide window if visible, show if hidden */ + void toggleHidden(); }; #endif // BITCOINGUI_H diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 1fa15e71f4..c893f9831e 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -5,7 +5,40 @@ #else #define UNUSED #endif -static const char UNUSED *bitcoin_strings[] = {QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin version"), +static const char UNUSED *bitcoin_strings[] = {QT_TRANSLATE_NOOP("bitcoin-core", "Error: Wallet locked, unable to create transaction."), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"Error: This transaction requires a transaction fee of at least %s because of " +"its amount, complexity, or use of recently received funds."), +QT_TRANSLATE_NOOP("bitcoin-core", "Error: Transaction creation failed."), +QT_TRANSLATE_NOOP("bitcoin-core", "Sending..."), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"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."), +QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount"), +QT_TRANSLATE_NOOP("bitcoin-core", "Insufficient funds"), +QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Disk space is low"), +QT_TRANSLATE_NOOP("bitcoin-core", "To use the %s option"), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"%s, you must set a rpcpassword in the configuration file:\n" +" %s\n" +"It is recommended you use the following random password:\n" +"rpcuser=bitcoinrpc\n" +"rpcpassword=%s\n" +"(you do not need to remember this password)\n" +"If the file does not exist, create it with owner-readable-only file " +"permissions.\n"), +QT_TRANSLATE_NOOP("bitcoin-core", "Error"), +QT_TRANSLATE_NOOP("bitcoin-core", "An error occurred while setting up the RPC port %u for listening: %s"), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"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."), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"Warning: Please check that your computer's date and time are correct. If " +"your clock is wrong Bitcoin will not work properly."), +QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin version"), QT_TRANSLATE_NOOP("bitcoin-core", "Usage:"), QT_TRANSLATE_NOOP("bitcoin-core", "Send command to -server or bitcoind"), QT_TRANSLATE_NOOP("bitcoin-core", "List commands"), @@ -19,6 +52,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Start minimized"), QT_TRANSLATE_NOOP("bitcoin-core", "Show splash screen on startup (default: 1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"), QT_TRANSLATE_NOOP("bitcoin-core", "Set database cache size in megabytes (default: 25)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Set database disk log size in megabytes (default: 100)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify connection timeout (in milliseconds)"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect through socks4 proxy"), QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for addnode and connect"), @@ -38,6 +72,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection receive buffer, <n>*10 QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)"), QT_TRANSLATE_NOOP("bitcoin-core", "Use Universal Plug and Play to map the listening port (default: 1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Use Universal Plug and Play to map the listening port (default: 0)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"Detach block and address databases. Increases shutdown time (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Fee per KB to add to transactions you send"), QT_TRANSLATE_NOOP("bitcoin-core", "Accept command line and JSON-RPC commands"), QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"), @@ -69,9 +105,11 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:" "@STRENGTH)"), QT_TRANSLATE_NOOP("bitcoin-core", "This help message"), +QT_TRANSLATE_NOOP("bitcoin-core", "Usage"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Cannot obtain a lock on data directory %s. Bitcoin is probably already " +"Cannot obtain a lock on data directory %s. Bitcoin is probably already " "running."), +QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin"), QT_TRANSLATE_NOOP("bitcoin-core", "Loading addresses..."), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading addr.dat"), QT_TRANSLATE_NOOP("bitcoin-core", "Loading block index..."), @@ -92,12 +130,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Warning: -paytxfee is set very high. This is the transaction fee you will " "pay if you send a transaction."), QT_TRANSLATE_NOOP("bitcoin-core", "Error: CreateThread(StartNode) failed"), -QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Disk space is low"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Unable to bind to port %d on this computer. Bitcoin is probably already " "running."), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Warning: Please check that your computer's date and time are correct. If " -"your clock is wrong Bitcoin will not work properly."), -QT_TRANSLATE_NOOP("bitcoin-core", "beta"), };
\ No newline at end of file diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index 5a0b4aa83c..cb602ce327 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -4,21 +4,14 @@ #include "addresstablemodel.h" #include "transactiontablemodel.h" -#include "headers.h" +#include "main.h" -#include <QTimer> #include <QDateTime> ClientModel::ClientModel(OptionsModel *optionsModel, QObject *parent) : QObject(parent), optionsModel(optionsModel), cachedNumConnections(0), cachedNumBlocks(0) { - // Until signal notifications is built into the bitcoin core, - // simply update everything after polling using a timer. - QTimer *timer = new QTimer(this); - connect(timer, SIGNAL(timeout()), this, SLOT(update())); - timer->start(MODEL_UPDATE_DELAY); - numBlocksAtStartup = -1; } @@ -47,14 +40,23 @@ void ClientModel::update() { int newNumConnections = getNumConnections(); int newNumBlocks = getNumBlocks(); + QString newStatusBar = getStatusBarWarnings(); if(cachedNumConnections != newNumConnections) emit numConnectionsChanged(newNumConnections); - if(cachedNumBlocks != newNumBlocks) + if(cachedNumBlocks != newNumBlocks || cachedStatusBar != newStatusBar) + { + // Simply emit a numBlocksChanged for now in case the status message changes, + // so that the view updates the status bar. + // TODO: It should send a notification. + // (However, this might generate looped notifications and needs to be thought through and tested carefully) + // error(tr("Network Alert"), newStatusBar); emit numBlocksChanged(newNumBlocks); + } cachedNumConnections = newNumConnections; cachedNumBlocks = newNumBlocks; + cachedStatusBar = newStatusBar; } bool ClientModel::isTestNet() const @@ -86,3 +88,8 @@ QString ClientModel::formatFullVersion() const { return QString::fromStdString(FormatFullVersion()); } + +QString ClientModel::formatBuildDate() const +{ + return QString::fromStdString(CLIENT_DATE); +} diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h index 5a12c4fcd8..8e7431a2f3 100644 --- a/src/qt/clientmodel.h +++ b/src/qt/clientmodel.h @@ -37,12 +37,14 @@ public: QString getStatusBarWarnings() const; QString formatFullVersion() const; + QString formatBuildDate() const; private: OptionsModel *optionsModel; int cachedNumConnections; int cachedNumBlocks; + QString cachedStatusBar; int numBlocksAtStartup; @@ -51,7 +53,7 @@ signals: void numBlocksChanged(int count); //! Asynchronous error notification - void error(const QString &title, const QString &message); + void error(const QString &title, const QString &message, bool modal); public slots: diff --git a/src/qt/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui index 127b90965a..6e342e5e8a 100644 --- a/src/qt/forms/aboutdialog.ui +++ b/src/qt/forms/aboutdialog.ui @@ -52,6 +52,9 @@ <property name="text"> <string><b>Bitcoin</b> version</string> </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> + </property> </widget> </item> <item> @@ -62,6 +65,9 @@ <property name="textFormat"> <enum>Qt::RichText</enum> </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> + </property> </widget> </item> <item> @@ -93,6 +99,9 @@ This product includes software developed by the OpenSSL Project for use in the O <property name="wordWrap"> <bool>true</bool> </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> + </property> </widget> </item> <item> diff --git a/src/qt/forms/qrcodedialog.ui b/src/qt/forms/qrcodedialog.ui index fa960069d9..714b1d6cd8 100644 --- a/src/qt/forms/qrcodedialog.ui +++ b/src/qt/forms/qrcodedialog.ui @@ -47,7 +47,7 @@ <item> <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QCheckBox" name="chkReq"> + <widget class="QCheckBox" name="chkReqPayment"> <property name="enabled"> <bool>true</bool> </property> @@ -59,7 +59,7 @@ <item> <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QLabel" name="lblAm1"> + <widget class="QLabel" name="lblAmount"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <horstretch>0</horstretch> @@ -94,7 +94,7 @@ </widget> </item> <item> - <widget class="QLabel" name="lblAm2"> + <widget class="QLabel" name="lblBTC"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <horstretch>0</horstretch> @@ -116,7 +116,7 @@ <item> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> - <widget class="QLabel" name="label_3"> + <widget class="QLabel" name="lblLabel"> <property name="text"> <string>Label:</string> </property> @@ -139,7 +139,7 @@ </widget> </item> <item row="1" column="0"> - <widget class="QLabel" name="label_4"> + <widget class="QLabel" name="lblMessage"> <property name="text"> <string>Message:</string> </property> @@ -197,7 +197,7 @@ <resources/> <connections> <connection> - <sender>chkReq</sender> + <sender>chkReqPayment</sender> <signal>clicked(bool)</signal> <receiver>lnReqAmount</receiver> <slot>setEnabled(bool)</slot> diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index ccb2049476..f854115fb9 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -3,8 +3,6 @@ #include "walletmodel.h" #include "bitcoinunits.h" -#include "headers.h" - #include <QString> #include <QDateTime> #include <QDoubleValidator> @@ -17,32 +15,35 @@ #include <QClipboard> #include <QFileDialog> #include <QDesktopServices> +#include <QThread> + +namespace GUIUtil { -QString GUIUtil::dateTimeStr(qint64 nTime) +QString dateTimeStr(const QDateTime &date) { - return dateTimeStr(QDateTime::fromTime_t((qint32)nTime)); + return date.date().toString(Qt::SystemLocaleShortDate) + QString(" ") + date.toString("hh:mm"); } -QString GUIUtil::dateTimeStr(const QDateTime &date) +QString dateTimeStr(qint64 nTime) { - return date.date().toString(Qt::SystemLocaleShortDate) + QString(" ") + date.toString("hh:mm"); + return dateTimeStr(QDateTime::fromTime_t((qint32)nTime)); } -QFont GUIUtil::bitcoinAddressFont() +QFont bitcoinAddressFont() { QFont font("Monospace"); font.setStyleHint(QFont::TypeWriter); return font; } -void GUIUtil::setupAddressWidget(QLineEdit *widget, QWidget *parent) +void setupAddressWidget(QLineEdit *widget, QWidget *parent) { widget->setMaxLength(BitcoinAddressValidator::MaxAddressLength); widget->setValidator(new BitcoinAddressValidator(parent)); widget->setFont(bitcoinAddressFont()); } -void GUIUtil::setupAmountWidget(QLineEdit *widget, QWidget *parent) +void setupAmountWidget(QLineEdit *widget, QWidget *parent) { QDoubleValidator *amountValidator = new QDoubleValidator(parent); amountValidator->setDecimals(8); @@ -51,7 +52,7 @@ void GUIUtil::setupAmountWidget(QLineEdit *widget, QWidget *parent) widget->setAlignment(Qt::AlignRight|Qt::AlignVCenter); } -bool GUIUtil::parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out) +bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out) { if(uri.scheme() != QString("bitcoin")) return false; @@ -96,7 +97,7 @@ bool GUIUtil::parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out) return true; } -bool GUIUtil::parseBitcoinURI(QString uri, SendCoinsRecipient *out) +bool parseBitcoinURI(QString uri, SendCoinsRecipient *out) { // Convert bitcoin:// to bitcoin: // @@ -110,7 +111,7 @@ bool GUIUtil::parseBitcoinURI(QString uri, SendCoinsRecipient *out) return parseBitcoinURI(uriInstance, out); } -QString GUIUtil::HtmlEscape(const QString& str, bool fMultiLine) +QString HtmlEscape(const QString& str, bool fMultiLine) { QString escaped = Qt::escape(str); if(fMultiLine) @@ -120,12 +121,12 @@ QString GUIUtil::HtmlEscape(const QString& str, bool fMultiLine) return escaped; } -QString GUIUtil::HtmlEscape(const std::string& str, bool fMultiLine) +QString HtmlEscape(const std::string& str, bool fMultiLine) { return HtmlEscape(QString::fromStdString(str), fMultiLine); } -void GUIUtil::copyEntryData(QAbstractItemView *view, int column, int role) +void copyEntryData(QAbstractItemView *view, int column, int role) { if(!view || !view->selectionModel()) return; @@ -138,7 +139,7 @@ void GUIUtil::copyEntryData(QAbstractItemView *view, int column, int role) } } -QString GUIUtil::getSaveFileName(QWidget *parent, const QString &caption, +QString getSaveFileName(QWidget *parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedSuffixOut) @@ -184,3 +185,34 @@ QString GUIUtil::getSaveFileName(QWidget *parent, const QString &caption, return result; } +Qt::ConnectionType blockingGUIThreadConnection() +{ + if(QThread::currentThread() != QCoreApplication::instance()->thread()) + { + return Qt::BlockingQueuedConnection; + } + else + { + return Qt::DirectConnection; + } +} + +bool checkPoint(const QPoint &p, const QWidget *w) +{ + QWidget *atW = qApp->widgetAt(w->mapToGlobal(p)); + if(!atW) return false; + return atW->topLevelWidget() == w; +} + +bool isObscured(QWidget *w) +{ + + return !(checkPoint(QPoint(0, 0), w) + && checkPoint(QPoint(w->width() - 1, 0), w) + && checkPoint(QPoint(0, w->height() - 1), w) + && checkPoint(QPoint(w->width() - 1, w->height() - 1), w) + && checkPoint(QPoint(w->width()/2, w->height()/2), w)); +} + +} // namespace GUIUtil + diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h index 7e4399dc77..7561d0e100 100644 --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -13,30 +13,29 @@ class QAbstractItemView; QT_END_NAMESPACE class SendCoinsRecipient; -/** Static utility functions used by the Bitcoin Qt UI. +/** Utility functions used by the Bitcoin Qt UI. */ -class GUIUtil +namespace GUIUtil { -public: // Create human-readable string from date - static QString dateTimeStr(qint64 nTime); - static QString dateTimeStr(const QDateTime &datetime); + QString dateTimeStr(const QDateTime &datetime); + QString dateTimeStr(qint64 nTime); // Render bitcoin addresses in monospace font - static QFont bitcoinAddressFont(); + QFont bitcoinAddressFont(); // Set up widgets for address and amounts - static void setupAddressWidget(QLineEdit *widget, QWidget *parent); - static void setupAmountWidget(QLineEdit *widget, QWidget *parent); + void setupAddressWidget(QLineEdit *widget, QWidget *parent); + void setupAmountWidget(QLineEdit *widget, QWidget *parent); // Parse "bitcoin:" URI into recipient object, return true on successful parsing // See Bitcoin URI definition discussion here: https://bitcointalk.org/index.php?topic=33490.0 - static bool parseBitcoinURI(const QUrl &, SendCoinsRecipient *out); - static bool parseBitcoinURI(QString uri, SendCoinsRecipient *out); + bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out); + bool parseBitcoinURI(QString uri, SendCoinsRecipient *out); // HTML escaping for rich text controls - static QString HtmlEscape(const QString& str, bool fMultiLine=false); - static QString HtmlEscape(const std::string& str, bool fMultiLine=false); + QString HtmlEscape(const QString& str, bool fMultiLine=false); + QString HtmlEscape(const std::string& str, bool fMultiLine=false); /** Copy a field of the currently selected entry of a view to the clipboard. Does nothing if nothing is selected. @@ -44,7 +43,7 @@ public: @param[in] role Data role to extract from the model @see TransactionView::copyLabel, TransactionView::copyAmount, TransactionView::copyAddress */ - static void copyEntryData(QAbstractItemView *view, int column, int role=Qt::EditRole); + void copyEntryData(QAbstractItemView *view, int column, int role=Qt::EditRole); /** Get save filename, mimics QFileDialog::getSaveFileName, except that it appends a default suffix when no suffix is provided by the user. @@ -56,10 +55,20 @@ public: @param[out] selectedSuffixOut Pointer to return the suffix (file type) that was selected (or 0). Can be useful when choosing the save file format based on suffix. */ - static QString getSaveFileName(QWidget *parent=0, const QString &caption=QString(), + QString getSaveFileName(QWidget *parent=0, const QString &caption=QString(), const QString &dir=QString(), const QString &filter=QString(), QString *selectedSuffixOut=0); -}; + /** Get connection type to call object slot in GUI thread with invokeMethod. The call will be blocking. + + @returns If called from the GUI thread, return a Qt::DirectConnection. + If called from another thread, return a Qt::BlockingQueuedConnection. + */ + Qt::ConnectionType blockingGUIThreadConnection(); + + // Determine whether a widget is hidden behind other windows + bool isObscured(QWidget *w); + +} // namespace GUIUtil #endif // GUIUTIL_H diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts index 4c6dcc1d81..7b20d54740 100644 --- a/src/qt/locale/bitcoin_ca_ES.ts +++ b/src/qt/locale/bitcoin_ca_ES.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> versió</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -89,42 +89,42 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Borrar</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation type="unfinished">Editar</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>Borrar</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation type="unfinished"></translation> </message> @@ -292,117 +292,166 @@ Are you sure you wish to encrypt your wallet?</source> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> + <location filename="../bitcoingui.cpp" line="506"/> <source>Synchronizing with network...</source> <translation>Sincronització amb la xarxa ...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Sincronització de la cadena en el progrés</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="187"/> - <source>&Overview</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="186"/> <source>Show general overview of wallet</source> <translation>Mostra panorama general de la cartera</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> + <location filename="../bitcoingui.cpp" line="191"/> <source>&Transactions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="192"/> <source>Browse transaction history</source> <translation>Cerca a l'historial de transaccions</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> + <location filename="../bitcoingui.cpp" line="198"/> <source>Edit the list of stored addresses and labels</source> <translation>Edita la llista d'adreces emmagatzemada i etiquetes</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation>&Rebre monedes</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> - <source>&Send coins</source> - <translation type="unfinished">&Enviar monedes</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="212"/> + <location filename="../bitcoingui.cpp" line="210"/> <source>Send coins to a bitcoin address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> + <location filename="../bitcoingui.cpp" line="215"/> <source>Sign &message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> + <location filename="../bitcoingui.cpp" line="216"/> <source>Prove you control an address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> + <location filename="../bitcoingui.cpp" line="235"/> <source>E&xit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> - <source>Quit application</source> - <translation>Sortir de l'aplicació</translation> + <location filename="../bitcoingui.cpp" line="245"/> + <source>&Options...</source> + <translation>&Opcions ...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> - <source>Show information about Bitcoin</source> - <translation>Mostra informació sobre Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> - <source>Show information about Qt</source> - <translation type="unfinished">Mostra informació sobre Qt</translation> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> - <source>&Options...</source> - <translation>&Opcions ...</translation> + <location filename="../bitcoingui.cpp" line="250"/> + <source>&Export...</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> - <source>&Help</source> - <translation>&Ajuda</translation> + <location filename="../bitcoingui.cpp" line="251"/> + <source>Export the data in the current tab to a file</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> - <source>Actions toolbar</source> - <translation>Accions de la barra d'eines</translation> + <location filename="../bitcoingui.cpp" line="252"/> + <source>&Encrypt Wallet</source> + <translation type="unfinished">&Xifrar la Cartera</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="253"/> + <source>Encrypt or decrypt wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="255"/> + <source>&Backup Wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="256"/> + <source>Backup wallet to another location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="258"/> + <source>Change the passphrase used for wallet encryption</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="281"/> + <source>&File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="290"/> + <source>&Settings</source> + <translation type="unfinished">&Opcions</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="303"/> + <source>Tabs toolbar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="327"/> + <source>[testnet]</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="418"/> + <source>bitcoin-qt</source> + <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> - <source>%n active connection(s) to Bitcoin network</source> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> <translation type="unfinished"> <numerusform></numerusform> <numerusform></numerusform> <numerusform></numerusform> </translation> </message> + <message> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="531"/> + <source>Downloaded %1 blocks of transaction history.</source> + <translation type="unfinished"></translation> + </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -411,7 +460,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -420,7 +469,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -429,7 +478,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -438,191 +487,150 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation>Al dia</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>Posar-se al dia ...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> + <location filename="../bitcoingui.cpp" line="632"/> <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> - <source>Sent transaction</source> - <translation>Transacció enviada</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="199"/> - <source>&Address Book</source> - <translation>llibreta d'&adreces</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="73"/> - <source>Bitcoin Wallet</source> + <location filename="../bitcoingui.cpp" line="664"/> + <source>Incoming transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>&Sobre %1</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="244"/> - <source>About &Qt</source> - <translation>Sobre &Qt</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>Modificar les opcions de configuració per bitcoin</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> + <location filename="../bitcoingui.cpp" line="665"/> + <source>Date: %1 +Amount: %2 +Type: %3 +Address: %4 +</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> + <location filename="../bitcoingui.cpp" line="790"/> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> + <location filename="../bitcoingui.cpp" line="798"/> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> - <source>Export the data in the current tab to a file</source> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Backup Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation type="unfinished">&Xifrar la Cartera</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="255"/> - <source>Encrypt or decrypt wallet</source> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Wallet Data (*.dat)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> - <source>&Backup Wallet</source> + <location filename="../bitcoingui.cpp" line="824"/> + <source>Backup Failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> - <source>Backup wallet to another location</source> + <location filename="../bitcoingui.cpp" line="824"/> + <source>There was an error trying to save the wallet data to the new location.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="209"/> + <source>&Send coins</source> + <translation type="unfinished">&Enviar monedes</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> - <source>Change the passphrase used for wallet encryption</source> + <location filename="../bitcoingui.cpp" line="71"/> + <source>Bitcoin Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> - <source>&File</source> + <location filename="../bitcoingui.cpp" line="185"/> + <source>&Overview</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> - <source>&Settings</source> - <translation type="unfinished">&Opcions</translation> + <location filename="../bitcoingui.cpp" line="236"/> + <source>Quit application</source> + <translation>Sortir de l'aplicació</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> - <source>Tabs toolbar</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="240"/> + <source>Show information about Bitcoin</source> + <translation>Mostra informació sobre Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> - <source>[testnet]</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="243"/> + <source>Show information about Qt</source> + <translation type="unfinished">Mostra informació sobre Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> - <source>bitcoin-qt</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="296"/> + <source>&Help</source> + <translation>&Ajuda</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="314"/> + <source>Actions toolbar</source> + <translation>Accions de la barra d'eines</translation> </message> - <message> - <location filename="../bitcoingui.cpp" line="501"/> - <source>Downloaded %1 blocks of transaction history.</source> - <translation type="unfinished"></translation> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="482"/> + <source>%n active connection(s) to Bitcoin network</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> - <source>Sending...</source> - <translation>L'enviament de ...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="647"/> - <source>Incoming transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="648"/> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="773"/> - <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="663"/> + <source>Sent transaction</source> + <translation>Transacció enviada</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> - <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="197"/> + <source>&Address Book</source> + <translation>llibreta d'&adreces</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Backup Wallet</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>&Sobre %1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Wallet Data (*.dat)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="242"/> + <source>About &Qt</source> + <translation>Sobre &Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> - <source>Backup Failed</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>Modificar les opcions de configuració per bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> - <source>There was an error trying to save the wallet data to the new location.</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="636"/> + <source>Sending...</source> + <translation>L'enviament de ...</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -630,22 +638,22 @@ Address: %4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished"></translation> </message> @@ -721,85 +729,95 @@ Address: %4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="180"/> - <source>Map port using &UPnP</source> - <translation>Port obert amb &UPnP</translation> + <source>M&inimize on close</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="181"/> - <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="185"/> - <source>M&inimize on close</source> - <translation type="unfinished"></translation> + <source>Map port using &UPnP</source> + <translation>Port obert amb &UPnP</translation> </message> <message> <location filename="../optionsdialog.cpp" line="186"/> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> + <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessagePage</name> @@ -894,17 +912,17 @@ Address: %4 <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>Opcions</translation> </message> @@ -987,7 +1005,7 @@ Address: %4 <message> <location filename="../forms/qrcodedialog.ui" line="105"/> <source>BTC</source> - <translation></translation> + <translation type="unfinished"></translation> </message> <message> <location filename="../forms/qrcodedialog.ui" line="121"/> @@ -1005,17 +1023,22 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation type="unfinished"></translation> </message> @@ -1023,6 +1046,16 @@ Address: %4 <context> <name>SendCoinsDialog</name> <message> + <location filename="../forms/sendcoinsdialog.ui" line="106"/> + <source>Balance:</source> + <translation>Balanç:</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="129"/> + <source>The amount to pay must be larger than 0.</source> + <translation>La quantitat a pagar ha de ser major que 0.</translation> + </message> + <message> <location filename="../forms/sendcoinsdialog.ui" line="14"/> <location filename="../sendcoinsdialog.cpp" line="123"/> <location filename="../sendcoinsdialog.cpp" line="128"/> @@ -1055,9 +1088,9 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="106"/> - <source>Balance:</source> - <translation>Balanç:</translation> + <location filename="../forms/sendcoinsdialog.ui" line="113"/> + <source>123.456 BTC</source> + <translation></translation> </message> <message> <location filename="../forms/sendcoinsdialog.ui" line="144"/> @@ -1070,16 +1103,6 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="129"/> - <source>The amount to pay must be larger than 0.</source> - <translation>La quantitat a pagar ha de ser major que 0.</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="113"/> - <source>123.456 BTC</source> - <translation></translation> - </message> - <message> <location filename="../sendcoinsdialog.cpp" line="95"/> <source><b>%1</b> to %2 (%3)</source> <translation type="unfinished"></translation> @@ -1197,140 +1220,140 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="18"/> + <location filename="../transactiondesc.cpp" line="20"/> <source>Open for %1 blocks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> + <location filename="../transactiondesc.cpp" line="22"/> <source>Open until %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="28"/> + <location filename="../transactiondesc.cpp" line="30"/> <source>%1/unconfirmed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="92"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation type="unfinished"></translation> </message> @@ -1352,11 +1375,6 @@ Address: %4 <name>TransactionTableModel</name> <message> <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Address</source> - <translation>Direcció</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> <source>Date</source> <translation type="unfinished"></translation> </message> @@ -1473,6 +1491,11 @@ Address: %4 <source>Amount removed from or added to balance.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Address</source> + <translation>Direcció</translation> + </message> </context> <context> <name>TransactionView</name> @@ -1598,6 +1621,11 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> + <location filename="../transactionview.cpp" line="282"/> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> <location filename="../transactionview.cpp" line="283"/> <source>Address</source> <translation>Direcció</translation> @@ -1632,16 +1660,11 @@ Address: %4 <source>to</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../transactionview.cpp" line="282"/> - <source>Label</source> - <translation>Etiqueta</translation> - </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>L'enviament de ...</translation> </message> @@ -1649,400 +1672,484 @@ Address: %4 <context> <name>bitcoin-core</name> <message> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>L'enviament de ...</translation> + </message> + <message> <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Warning: Disk space is low</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="41"/> <source>Bitcoin version</source> <translation type="unfinished">Bitcoin versió</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> + <location filename="../bitcoinstrings.cpp" line="42"/> <source>Usage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> + <location filename="../bitcoinstrings.cpp" line="43"/> <source>Send command to -server or bitcoind</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> + <location filename="../bitcoinstrings.cpp" line="44"/> <source>List commands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> + <location filename="../bitcoinstrings.cpp" line="45"/> <source>Get help for a command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> + <location filename="../bitcoinstrings.cpp" line="46"/> <source>Options:</source> <translation type="unfinished">Opcions:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> + <location filename="../bitcoinstrings.cpp" line="47"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> + <location filename="../bitcoinstrings.cpp" line="48"/> <source>Specify pid file (default: bitcoind.pid)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> + <location filename="../bitcoinstrings.cpp" line="49"/> <source>Generate coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> + <location filename="../bitcoinstrings.cpp" line="50"/> <source>Don't generate coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> + <location filename="../bitcoinstrings.cpp" line="51"/> <source>Start minimized</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> + <location filename="../bitcoinstrings.cpp" line="52"/> <source>Show splash screen on startup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> + <location filename="../bitcoinstrings.cpp" line="53"/> <source>Specify data directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> + <location filename="../bitcoinstrings.cpp" line="54"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="56"/> <source>Specify connection timeout (in milliseconds)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> + <location filename="../bitcoinstrings.cpp" line="57"/> <source>Connect through socks4 proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> + <location filename="../bitcoinstrings.cpp" line="58"/> <source>Allow DNS lookups for addnode and connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> + <location filename="../bitcoinstrings.cpp" line="59"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> + <location filename="../bitcoinstrings.cpp" line="60"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> + <location filename="../bitcoinstrings.cpp" line="61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> + <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> + <location filename="../bitcoinstrings.cpp" line="63"/> <source>Find peers using internet relay chat (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> + <location filename="../bitcoinstrings.cpp" line="65"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> + <location filename="../bitcoinstrings.cpp" line="66"/> <source>Find peers using DNS lookup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> + <location filename="../bitcoinstrings.cpp" line="67"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> + <location filename="../bitcoinstrings.cpp" line="68"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> + <location filename="../bitcoinstrings.cpp" line="78"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> + <location filename="../bitcoinstrings.cpp" line="79"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> + <location filename="../bitcoinstrings.cpp" line="80"/> <source>Use the test network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> + <location filename="../bitcoinstrings.cpp" line="81"/> <source>Output extra debugging information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> + <location filename="../bitcoinstrings.cpp" line="82"/> <source>Prepend debug output with timestamp</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> + <location filename="../bitcoinstrings.cpp" line="83"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> + <location filename="../bitcoinstrings.cpp" line="84"/> <source>Send trace/debug info to debugger</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> + <location filename="../bitcoinstrings.cpp" line="85"/> <source>Username for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> + <location filename="../bitcoinstrings.cpp" line="86"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> + <location filename="../bitcoinstrings.cpp" line="87"/> <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> + <location filename="../bitcoinstrings.cpp" line="88"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> + <location filename="../bitcoinstrings.cpp" line="89"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> + <location filename="../bitcoinstrings.cpp" line="90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> + <location filename="../bitcoinstrings.cpp" line="93"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> + <location filename="../bitcoinstrings.cpp" line="94"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> + <location filename="../bitcoinstrings.cpp" line="95"/> <source>Rescan the block chain for missing wallet transactions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> + <location filename="../bitcoinstrings.cpp" line="96"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> + <location filename="../bitcoinstrings.cpp" line="97"/> <source>How thorough the block verification is (0-6, default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> + <location filename="../bitcoinstrings.cpp" line="101"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> + <location filename="../bitcoinstrings.cpp" line="102"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> + <location filename="../bitcoinstrings.cpp" line="103"/> <source>Server private key (default: server.pem)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> + <location filename="../bitcoinstrings.cpp" line="104"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> + <location filename="../bitcoinstrings.cpp" line="107"/> <source>This help message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="113"/> <source>Loading addresses...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> + <location filename="../bitcoinstrings.cpp" line="114"/> <source>Error loading addr.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> + <location filename="../bitcoinstrings.cpp" line="115"/> <source>Loading block index...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> + <location filename="../bitcoinstrings.cpp" line="116"/> <source>Error loading blkindex.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> + <location filename="../bitcoinstrings.cpp" line="117"/> <source>Loading wallet...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> + <location filename="../bitcoinstrings.cpp" line="118"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> + <location filename="../bitcoinstrings.cpp" line="119"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> + <location filename="../bitcoinstrings.cpp" line="120"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> + <location filename="../bitcoinstrings.cpp" line="121"/> <source>Error loading wallet.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> + <location filename="../bitcoinstrings.cpp" line="123"/> <source>Cannot initialize keypool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> + <location filename="../bitcoinstrings.cpp" line="124"/> <source>Cannot write default address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> + <location filename="../bitcoinstrings.cpp" line="125"/> <source>Rescanning...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> + <location filename="../bitcoinstrings.cpp" line="126"/> <source>Done loading</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> + <location filename="../bitcoinstrings.cpp" line="128"/> <source>Invalid amount for -paytxfee=<amount></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> + <location filename="../bitcoinstrings.cpp" line="129"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="96"/> + <location filename="../bitcoinstrings.cpp" line="133"/> <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../bitcoinstrings.cpp" line="99"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation type="unfinished"></translation> - </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts index 56d49dac57..47f1605315 100644 --- a/src/qt/locale/bitcoin_cs.ts +++ b/src/qt/locale/bitcoin_cs.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> verze</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -75,6 +75,11 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open <translation>Zobraz &QR kód</translation> </message> <message> + <location filename="../forms/addressbookpage.ui" line="96"/> + <source>Sign a message to prove you own this address</source> + <translation>Podepiš zprávu, čímž prokážeš, že jsi vlastníkem této adresy</translation> + </message> + <message> <location filename="../forms/addressbookpage.ui" line="99"/> <source>Sign &Message</source> <translation>Po&depiš zprávu</translation> @@ -90,47 +95,42 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open <translation>S&maž</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="96"/> - <source>Sign a message to prove you own this address</source> - <translation>Podepiš zprávu, čímž prokážeš, že jsi vlastníkem této adresy</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>Kopíruj adresu</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation>Kopíruj označení</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation>Uprav</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>Smaž</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation>Exportuj data adresáře</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation>CSV formát (*.csv)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>Chyba při exportu</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation>Nemohu zapisovat do souboru %1.</translation> </message> @@ -176,11 +176,6 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open <translation>Totéž heslo ještě jednou</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="94"/> - <source>TextLabel</source> - <translation>Textový popisek</translation> - </message> - <message> <location filename="../askpassphrasedialog.cpp" line="34"/> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> <translation>Zadej nové heslo k peněžence.<br/>Použij <b>alespoň 10 náhodných znaků</b> nebo <b>alespoň osm slov</b>.</translation> @@ -233,6 +228,22 @@ Are you sure you wish to encrypt your wallet?</source> Jsi si jistý, že chceš peněženku zašifrovat?</translation> </message> <message> + <location filename="../askpassphrasedialog.cpp" line="117"/> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>DŮLEŽITÉ: Všechny předchozí zálohy peněženky by měly být nahrazeny nově vygenerovanou, zašifrovanou peněženkou. Z bezpečnostních důvodů budou předchozí zálohy nešifrované peněženky nepoužitelné, jakmile zaneš používat novou zašifrovanou peněženku.</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="217"/> + <location filename="../askpassphrasedialog.cpp" line="241"/> + <source>Warning: The Caps Lock key is on.</source> + <translation>Upozornění: Caps Lock je zapnutý.</translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="94"/> + <source>TextLabel</source> + <translation>Textový popisek</translation> + </message> + <message> <location filename="../askpassphrasedialog.cpp" line="111"/> <location filename="../askpassphrasedialog.cpp" line="169"/> <source>Wallet encrypted</source> @@ -244,11 +255,6 @@ Jsi si jistý, že chceš peněženku zašifrovat?</translation> <translation>Bitcoin se teď ukončí, aby dokončil zašifrování. Pamatuj však, že pouhé zašifrování peněženky úplně nezabraňuje krádeži tvých bitcoinů malwarem, kterým se může počítač nakazit.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="117"/> - <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation>DŮLEŽITÉ: Všechny předchozí zálohy peněženky by měly být nahrazeny nově vygenerovanou, zašifrovanou peněženkou. Z bezpečnostních důvodů budou předchozí zálohy nešifrované peněženky nepoužitelné, jakmile zaneš používat novou zašifrovanou peněženku.</translation> - </message> - <message> <location filename="../askpassphrasedialog.cpp" line="126"/> <location filename="../askpassphrasedialog.cpp" line="133"/> <location filename="../askpassphrasedialog.cpp" line="175"/> @@ -289,173 +295,126 @@ Jsi si jistý, že chceš peněženku zašifrovat?</translation> <source>Wallet passphrase was successfully changed.</source> <translation>Heslo k peněžence bylo v pořádku změněno.</translation> </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="217"/> - <location filename="../askpassphrasedialog.cpp" line="241"/> - <source>Warning: The Caps Lock key is on.</source> - <translation>Upozornění: Caps Lock je zapnutý.</translation> - </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation>Zobraz seznam adres pro příjem plateb</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> + <location filename="../bitcoingui.cpp" line="506"/> <source>Synchronizing with network...</source> <translation>Synchronizuji se sítí...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="187"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>&Overview</source> <translation>&Přehled</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="186"/> <source>Show general overview of wallet</source> <translation>Zobraz celkový přehled peněženky</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> + <location filename="../bitcoingui.cpp" line="191"/> <source>&Transactions</source> <translation>&Transakce</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> + <location filename="../bitcoingui.cpp" line="250"/> <source>&Export...</source> <translation>&Export...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> + <location filename="../bitcoingui.cpp" line="197"/> <source>&Address Book</source> <translation>&Adresář</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="73"/> - <source>Bitcoin Wallet</source> - <translation>Bitcoinová peněženka</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="200"/> + <location filename="../bitcoingui.cpp" line="198"/> <source>Edit the list of stored addresses and labels</source> <translation>Uprav seznam uložených adres a jejich označení</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation>Pří&jem mincí</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> + <location filename="../bitcoingui.cpp" line="235"/> <source>E&xit</source> <translation>&Konec</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> - <source>Quit application</source> - <translation>Ukončit aplikaci</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="242"/> + <location filename="../bitcoingui.cpp" line="240"/> <source>Show information about Bitcoin</source> <translation>Zobraz informace o Bitcoinu</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> + <location filename="../bitcoingui.cpp" line="242"/> <source>About &Qt</source> <translation>O &Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> - <source>&Backup Wallet</source> - <translation>&Zazálohovat peněženku</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> + <location filename="../bitcoingui.cpp" line="245"/> <source>&Options...</source> <translation>&Možnosti...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="192"/> <source>Browse transaction history</source> <translation>Procházet historii transakcí</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> - <source>Backup wallet to another location</source> - <translation>Zazálohuj peněženku na jiné místo</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Provádí se synchronizace řetězce bloků</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="217"/> - <source>Sign &message</source> - <translation>Po&depiš zprávu</translation> + <location filename="../bitcoingui.cpp" line="71"/> + <source>Bitcoin Wallet</source> + <translation>Bitcoinová peněženka</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> + <location filename="../bitcoingui.cpp" line="664"/> <source>Incoming transaction</source> <translation>Příchozí transakce</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>&O %1</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="255"/> + <location filename="../bitcoingui.cpp" line="253"/> <source>Encrypt or decrypt wallet</source> <translation>Zašifruj nebo dešifruj peněženku</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Peněženka je <b>zašifrovaná</b> a momentálně <b>zamčená</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> - <source>&Send coins</source> - <translation>P&oslání mincí</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>Změň &heslo</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Backup Wallet</source> <translation>Záloha peněženky</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation>Data peněženky (*.dat)</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> + <location filename="../bitcoingui.cpp" line="290"/> <source>&Settings</source> <translation>&Nastavení</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> + <location filename="../bitcoingui.cpp" line="296"/> <source>&Help</source> <translation>Ná&pověda</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>včera</numerusform> @@ -464,37 +423,27 @@ Jsi si jistý, že chceš peněženku zašifrovat?</translation> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation>Aktuální</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> - <source>Actions toolbar</source> - <translation>Panel akcí</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="212"/> - <source>Send coins to a bitcoin address</source> - <translation>Pošli mince na Bitcoinovou adresu</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="501"/> - <source>Downloaded %1 blocks of transaction history.</source> - <translation>Staženo %1 bloků transakční historie.</translation> + <location filename="../bitcoingui.cpp" line="236"/> + <source>Quit application</source> + <translation>Ukončit aplikaci</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> - <source>Prove you control an address</source> - <translation>Prokaž vlastnictví adresy</translation> + <location filename="../bitcoingui.cpp" line="255"/> + <source>&Backup Wallet</source> + <translation>&Zazálohovat peněženku</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> + <location filename="../bitcoingui.cpp" line="663"/> <source>Sent transaction</source> <translation>Odeslané transakce</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -507,42 +456,95 @@ Adresa: %4 </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>Uprav nastavení Bitcoinu</translation> + <location filename="../bitcoingui.cpp" line="256"/> + <source>Backup wallet to another location</source> + <translation>Zazálohuj peněženku na jiné místo</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> - <source>Show information about Qt</source> - <translation>Zobraz informace o Qt</translation> + <location filename="../bitcoingui.cpp" line="281"/> + <source>&File</source> + <translation>&Soubor</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> - <source>Export the data in the current tab to a file</source> - <translation>Exportovat data z tohoto panelu do souboru</translation> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation>Bitcoin klient</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> + <location filename="../bitcoingui.cpp" line="258"/> <source>Change the passphrase used for wallet encryption</source> <translation>Změň heslo k šifrování peněženky</translation> </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="550"/> + <source>%n minute(s) ago</source> + <translation> + <numerusform>před minutou</numerusform> + <numerusform>před %n minutami</numerusform> + <numerusform>před %n minutami</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="554"/> + <source>%n hour(s) ago</source> + <translation> + <numerusform>před hodinou</numerusform> + <numerusform>před %n hodinami</numerusform> + <numerusform>před %n hodinami</numerusform> + </translation> + </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> - <source>&File</source> - <translation>&Soubor</translation> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>&O %1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> + <location filename="../bitcoingui.cpp" line="209"/> + <source>&Send coins</source> + <translation>P&oslání mincí</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="215"/> + <source>Sign &message</source> + <translation>Po&depiš zprávu</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="243"/> + <source>Show information about Qt</source> + <translation>Zobraz informace o Qt</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation>Zobrazit/Skrýt &Bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="252"/> + <source>&Encrypt Wallet</source> + <translation>Zaši&fruj peněženku</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation>Změň &heslo</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="303"/> <source>Tabs toolbar</source> <translation>Panel s listy</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> + <location filename="../bitcoingui.cpp" line="314"/> + <source>Actions toolbar</source> + <translation>Panel akcí</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="418"/> <source>bitcoin-qt</source> <translation>bitcoin-qt</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> + <location filename="../bitcoingui.cpp" line="482"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n aktivní spojení do Bitcoinové sítě</numerusform> @@ -551,12 +553,12 @@ Adresa: %4 </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>Staženo %1 z %2 bloků transakční historie.</translation> + <location filename="../bitcoingui.cpp" line="531"/> + <source>Downloaded %1 blocks of transaction history.</source> + <translation>Staženo %1 bloků transakční historie.</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation> <numerusform>před vteřinou</numerusform> @@ -564,76 +566,82 @@ Adresa: %4 <numerusform>před %n vteřinami</numerusform> </translation> </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> - <source>%n minute(s) ago</source> - <translation> - <numerusform>před minutou</numerusform> - <numerusform>před %n minutami</numerusform> - <numerusform>před %n minutami</numerusform> - </translation> - </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> - <source>%n hour(s) ago</source> - <translation> - <numerusform>před hodinou</numerusform> - <numerusform>před %n hodinami</numerusform> - <numerusform>před %n hodinami</numerusform> - </translation> - </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>Stahuji...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation>Poslední stažený blok byl vygenerován %1.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> + <location filename="../bitcoingui.cpp" line="632"/> <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> - <source>Sending...</source> - <translation>Posílám...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Peněženka je <b>zašifrovaná</b> a momentálně <b>odemčená</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation>Zálohování selhalo</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation>Při ukládání peněženky na nové místo se přihodila nějaká chyba.</translation> </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation> + <numerusform>zbývá ~%n blok</numerusform> + <numerusform>zbývá ~%n bloky</numerusform> + <numerusform>zbývá ~%n bloků</numerusform> + </translation> + </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation>Zaši&fruj peněženku</translation> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Send coins to a bitcoin address</source> + <translation>Pošli mince na Bitcoinovou adresu</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>Otevři &Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>Staženo %1 z %2 bloků transakční historie (%3 % hotovo).</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="216"/> + <source>Prove you control an address</source> + <translation>Prokaž vlastnictví adresy</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>Uprav nastavení Bitcoinu</translation> </message> <message> <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Zobraz okno Bitcoinu</translation> + <source>Export the data in the current tab to a file</source> + <translation>Exportovat data z tohoto panelu do souboru</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation>Zobraz nebo skryj okno Bitcoinu</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="636"/> + <source>Sending...</source> + <translation>Posílám...</translation> + </message> + <message> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Stala se fatální chyba. Bitcoin nemůže bezpečně pokračovat v činnosti, a proto skončí.</translation> </message> @@ -641,22 +649,22 @@ Adresa: %4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&Jednotka pro částky: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>Zvol výchozí podjednotku, která se bude zobrazovat v programu a při posílání mincí</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&Ukazovat adresy ve výpisu transakcí</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished">Zda ukazovat bitcoinové adresy ve výpisu transakcí nebo ne</translation> </message> @@ -732,82 +740,92 @@ Adresa: %4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>&Spustit Bitcoin při startu systému</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Automaticky spustí Bitcoin po zapnutí počítače</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>&Minimalizovávat do ikony v panelu</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>Po minimalizaci okna zobrazí pouze ikonu v panelu</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> + <location filename="../optionsdialog.cpp" line="185"/> <source>Map port using &UPnP</source> <translation>Namapovat port přes &UPnP</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="181"/> + <location filename="../optionsdialog.cpp" line="186"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Automaticky otevře potřebný port na routeru. Tohle funguje jen za předpokladu, že tvůj router podporuje UPnP a že je UPnP povolené.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="180"/> <source>M&inimize on close</source> <translation>&Zavřením minimalizovat</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="186"/> + <location filename="../optionsdialog.cpp" line="181"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>Zavřením se aplikace minimalizuje. Pokud je tato volba zaškrtnuta, tak se aplikace ukončí pouze zvolením Konec v menu.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>&Připojit přes SOCKS4 proxy:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Připojí se do Bitcoinové sítě přes SOCKS4 proxy (např. když se připojuje přes Tor)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>&IP adresa proxy:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>IP adresa proxy (např. 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>P&ort: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Port proxy (např. 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>Platit &transakční poplatek</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation>Při ukončování odpojit databáze</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation>Při ukončování odpojit databáze bloků a adres. To znamená, že mohou být přesunuty do jiného adresáře, ale prodlužuje to čas potřebný k ukončení. Peněženka je vždy odpojená.</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>Dobrovolný transakční poplatek za každý započatý kB dopomáhá k rychlému zpracování tvých transakcí. Většina transakcí má do 1 kB. Doporučená výše poplatku je 0.01.</translation> </message> @@ -905,17 +923,17 @@ Adresa: %4 <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>Hlavní</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>Zobrazení</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>Možnosti</translation> </message> @@ -938,19 +956,14 @@ Adresa: %4 <translation>Stav účtu:</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="61"/> - <source>0</source> - <translation>0</translation> - </message> - <message> <location filename="../forms/overviewpage.ui" line="88"/> <source>Wallet</source> <translation>Peněženka</translation> </message> <message> - <location filename="../overviewpage.cpp" line="103"/> - <source>Your current balance</source> - <translation>Aktuální stav tvého účtu</translation> + <location filename="../forms/overviewpage.ui" line="61"/> + <source>0</source> + <translation>0</translation> </message> <message> <location filename="../forms/overviewpage.ui" line="68"/> @@ -972,10 +985,20 @@ Adresa: %4 <source><b>Recent transactions</b></source> <translation><b>Poslední transakce</b></translation> </message> + <message> + <location filename="../overviewpage.cpp" line="103"/> + <source>Your current balance</source> + <translation>Aktuální stav tvého účtu</translation> + </message> </context> <context> <name>QRCodeDialog</name> <message> + <location filename="../forms/qrcodedialog.ui" line="144"/> + <source>Message:</source> + <translation>Zpráva:</translation> + </message> + <message> <location filename="../forms/qrcodedialog.ui" line="14"/> <source>Dialog</source> <translation>Dialog</translation> @@ -1006,30 +1029,30 @@ Adresa: %4 <translation>Označení:</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="144"/> - <source>Message:</source> - <translation>Zpráva:</translation> - </message> - <message> <location filename="../forms/qrcodedialog.ui" line="186"/> <source>&Save As...</source> <translation>&Ulož jako...</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation>Chyba při kódování URI do QR kódu.</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation>Ulož obrázek...</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation>PNG obrázky (*.png)</translation> </message> + <message> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>Výsledná URI je příliš dlouhá, zkus zkrátit text označení / zprávy.</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -1056,34 +1079,34 @@ Adresa: %4 <translation>Při&dej příjemce...</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="84"/> - <source>Remove all transaction fields</source> - <translation>Smaž všechny transakční formuláře</translation> - </message> - <message> <location filename="../forms/sendcoinsdialog.ui" line="87"/> <source>Clear all</source> <translation>Všechno smaž</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="106"/> - <source>Balance:</source> - <translation>Stav účtu:</translation> - </message> - <message> <location filename="../forms/sendcoinsdialog.ui" line="113"/> <source>123.456 BTC</source> <translation>123.456 BTC</translation> </message> <message> + <location filename="../forms/sendcoinsdialog.ui" line="147"/> + <source>S&end</source> + <translation>&Pošli</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="84"/> + <source>Remove all transaction fields</source> + <translation>Smaž všechny transakční formuláře</translation> + </message> + <message> <location filename="../forms/sendcoinsdialog.ui" line="144"/> <source>Confirm the send action</source> <translation>Potvrď odeslání</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="147"/> - <source>S&end</source> - <translation>&Pošli</translation> + <location filename="../forms/sendcoinsdialog.ui" line="106"/> + <source>Balance:</source> + <translation>Stav účtu:</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="95"/> @@ -1097,13 +1120,13 @@ Adresa: %4 </message> <message> <location filename="../sendcoinsdialog.cpp" line="101"/> - <source>Are you sure you want to send %1?</source> - <translation>Jsi si jistý, že chceš poslat %1?</translation> + <source> and </source> + <translation> a </translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="101"/> - <source> and </source> - <translation> a </translation> + <source>Are you sure you want to send %1?</source> + <translation>Jsi si jistý, že chceš poslat %1?</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="124"/> @@ -1111,6 +1134,11 @@ Adresa: %4 <translation>Adresa příjemce je neplatná, překontroluj ji prosím.</translation> </message> <message> + <location filename="../sendcoinsdialog.cpp" line="129"/> + <source>The amount to pay must be larger than 0.</source> + <translation>Odesílaná částka musí být větší než 0.</translation> + </message> + <message> <location filename="../sendcoinsdialog.cpp" line="134"/> <source>The amount exceeds your balance.</source> <translation>Částka překračuje stav účtu.</translation> @@ -1135,20 +1163,10 @@ Adresa: %4 <source>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.</source> <translation>Chyba Transakce byla odmítnuta. Tohle může nastat, pokud nějaké mince z tvé peněženky už jednou byly utraceny, například pokud používáš kopii souboru wallet.dat a mince byly utraceny v druhé kopii, ale nebyly označeny jako utracené v této.</translation> </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="129"/> - <source>The amount to pay must be larger than 0.</source> - <translation>Odesílaná částka musí být větší než 0.</translation> - </message> </context> <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="130"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> <location filename="../forms/sendcoinsentry.ui" line="14"/> <source>Form</source> <translation>Formulář</translation> @@ -1195,6 +1213,11 @@ Adresa: %4 <translation>Vlož adresu ze schránky</translation> </message> <message> + <location filename="../forms/sendcoinsentry.ui" line="130"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> <location filename="../forms/sendcoinsentry.ui" line="137"/> <source>Remove this recipient</source> <translation>Smaž tohoto příjemce</translation> @@ -1208,140 +1231,140 @@ Adresa: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="18"/> - <source>Open for %1 blocks</source> - <translation>Otevřeno pro %1 bloků</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="20"/> - <source>Open until %1</source> - <translation>Otřevřeno dokud %1</translation> + <location filename="../transactiondesc.cpp" line="30"/> + <source>%1/unconfirmed</source> + <translation>%1/nepotvrzeno</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> - <source>%1/offline?</source> - <translation>%1/offline?</translation> + <location filename="../transactiondesc.cpp" line="92"/> + <source>unknown</source> + <translation>neznámo</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="28"/> - <source>%1/unconfirmed</source> - <translation>%1/nepotvrzeno</translation> + <location filename="../transactiondesc.cpp" line="22"/> + <source>Open until %1</source> + <translation>Otřevřeno dokud %1</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation>%1 potvrzení</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> - <source><b>Status:</b> </source> - <translation><b>Stav:</b> </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation>, ještě nebylo rozesláno</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> - <source>, broadcast through %1 node</source> - <translation>, rozesláno přes %1 uzel</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="56"/> - <source>, broadcast through %1 nodes</source> - <translation>, rozesláno přes %1 uzlů</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="60"/> - <source><b>Date:</b> </source> - <translation><b>Datum:</b> </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>Zdroj:</b> Vygenerováno<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>Od:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation><b>Pro:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> - <source>(not accepted)</source> - <translation>(neakceptováno)</translation> + <location filename="../transactiondesc.cpp" line="223"/> + <source>Transaction ID:</source> + <translation>ID transakce:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> - <source>Message:</source> - <translation>Zpráva:</translation> + <location filename="../transactiondesc.cpp" line="226"/> + <source>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.</source> + <translation>Vygenerované mince musí čekat 120 bloků, než mohou být utraceny. Když jsi vygeneroval tenhle blok, tak byl rozposlán do sítě, aby byl přidán do řetězce bloků. Pokud se mu nepodaří dostat se do řetězce, změní se na "neakceptovaný" a nepůjde utratit. Občas se to může stát, když jiný uzel vygeneruje blok zhruba ve stejném okamžiku jako ty.</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> - <source>Comment:</source> - <translation>Komentář:</translation> + <location filename="../transactiondesc.cpp" line="96"/> + <source> (yours, label: </source> + <translation> (tvoje, označení: </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> - <source>Transaction ID:</source> - <translation>ID transakce:</translation> + <location filename="../transactiondesc.cpp" line="20"/> + <source>Open for %1 blocks</source> + <translation>Otevřeno pro %1 bloků</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> - <source>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.</source> - <translation>Vygenerované mince musí čekat 120 bloků, než mohou být utraceny. Když jsi vygeneroval tenhle blok, tak byl rozposlán do sítě, aby byl přidán do řetězce bloků. Pokud se mu nepodaří dostat se do řetězce, změní se na "neakceptovaný" a nepůjde utratit. Občas se to může stát, když jiný uzel vygeneruje blok zhruba ve stejném okamžiku jako ty.</translation> + <location filename="../transactiondesc.cpp" line="28"/> + <source>%1/offline?</source> + <translation>%1/offline?</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> - <source>unknown</source> - <translation>neznámo</translation> + <location filename="../transactiondesc.cpp" line="50"/> + <source><b>Status:</b> </source> + <translation><b>Stav:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> - <source> (yours, label: </source> - <translation> (tvoje, označení: </translation> + <location filename="../transactiondesc.cpp" line="57"/> + <source>, broadcast through %1 node</source> + <translation>, rozesláno přes %1 uzel</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="59"/> + <source>, broadcast through %1 nodes</source> + <translation>, rozesláno přes %1 uzlů</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="63"/> + <source><b>Date:</b> </source> + <translation><b>Datum:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation> (tvoje)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="139"/> + <source>(not accepted)</source> + <translation>(neakceptováno)</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="219"/> + <source>Message:</source> + <translation>Zpráva:</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="221"/> + <source>Comment:</source> + <translation>Komentář:</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation><b>Příjem:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation>(%1 dozraje po %2 blocích)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation><b>Výdaj:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation><b>Transakční poplatek:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>Čistá částka:</b> </translation> </message> @@ -1362,65 +1385,55 @@ Adresa: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="303"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Tento blok nedostal žádný jiný uzel a pravděpodobně nebude akceptován!</translation> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Amount</source> + <translation>Částka</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="306"/> - <source>Generated but not accepted</source> - <translation>Vygenerováno, ale neakceptováno</translation> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Address</source> + <translation>Adresa</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="349"/> - <source>Received with</source> - <translation>Přijato do</translation> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Date</source> + <translation>Datum</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="351"/> - <source>Received from</source> - <translation>Přijato od</translation> + <location filename="../transactiontablemodel.cpp" line="280"/> + <source>Open until %1</source> + <translation>Otřevřeno dokud %1</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="354"/> - <source>Sent to</source> - <translation>Posláno na</translation> + <location filename="../transactiontablemodel.cpp" line="283"/> + <source>Offline (%1 confirmations)</source> + <translation>Offline (%1 potvrzení)</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="595"/> - <source>Transaction status. Hover over this field to show number of confirmations.</source> - <translation>Stav transakce. Najetím myši na toto políčko si zobrazíš počet potvrzení.</translation> + <location filename="../transactiontablemodel.cpp" line="286"/> + <source>Unconfirmed (%1 of %2 confirmations)</source> + <translation>Nepotvrzeno (%1 z %2 potvrzení)</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="597"/> - <source>Date and time that the transaction was received.</source> - <translation>Datum a čas přijetí transakce.</translation> + <location filename="../transactiontablemodel.cpp" line="289"/> + <source>Confirmed (%1 confirmations)</source> + <translation>Potvrzeno (%1 potvrzení)</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="599"/> - <source>Type of transaction.</source> - <translation>Druh transakce.</translation> + <location filename="../transactiontablemodel.cpp" line="303"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Tento blok nedostal žádný jiný uzel a pravděpodobně nebude akceptován!</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Date</source> - <translation>Datum</translation> + <location filename="../transactiontablemodel.cpp" line="306"/> + <source>Generated but not accepted</source> + <translation>Vygenerováno, ale neakceptováno</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="214"/> <source>Type</source> <translation>Typ</translation> </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Amount</source> - <translation>Částka</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Address</source> - <translation>Adresa</translation> - </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="277"/> <source>Open for %n block(s)</source> @@ -1430,26 +1443,6 @@ Adresa: %4 <numerusform>Otevřeno pro %n bloků</numerusform> </translation> </message> - <message> - <location filename="../transactiontablemodel.cpp" line="280"/> - <source>Open until %1</source> - <translation>Otřevřeno dokud %1</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="283"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline (%1 potvrzení)</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="286"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Nepotvrzeno (%1 z %2 potvrzení)</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="289"/> - <source>Confirmed (%1 confirmations)</source> - <translation>Potvrzeno (%1 potvrzení)</translation> - </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="297"/> <source>Mined balance will be available in %n more blocks</source> @@ -1460,67 +1453,112 @@ Adresa: %4 </translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="349"/> + <source>Received with</source> + <translation>Přijato do</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="356"/> <source>Payment to yourself</source> <translation>Platba sama sobě</translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="351"/> + <source>Received from</source> + <translation>Přijato od</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="358"/> <source>Mined</source> <translation>Vytěženo</translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="354"/> + <source>Sent to</source> + <translation>Posláno na</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="396"/> <source>(n/a)</source> <translation>(n/a)</translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="595"/> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Stav transakce. Najetím myši na toto políčko si zobrazíš počet potvrzení.</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="601"/> <source>Destination address of transaction.</source> <translation>Cílová adresa transakce.</translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="597"/> + <source>Date and time that the transaction was received.</source> + <translation>Datum a čas přijetí transakce.</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="603"/> <source>Amount removed from or added to balance.</source> <translation>Částka odečtená z nebo přičtená k účtu.</translation> </message> + <message> + <location filename="../transactiontablemodel.cpp" line="599"/> + <source>Type of transaction.</source> + <translation>Druh transakce.</translation> + </message> </context> <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="281"/> - <source>Type</source> - <translation>Typ</translation> + <location filename="../transactionview.cpp" line="84"/> + <source>Enter address or label to search</source> + <translation>Zadej adresu nebo označení pro její vyhledání</translation> </message> <message> - <location filename="../transactionview.cpp" line="289"/> - <source>Could not write to file %1.</source> - <translation>Nemohu zapisovat do souboru %1.</translation> + <location filename="../transactionview.cpp" line="124"/> + <source>Copy address</source> + <translation>Kopíruj adresu</translation> </message> <message> - <location filename="../transactionview.cpp" line="285"/> - <source>ID</source> - <translation>ID</translation> + <location filename="../transactionview.cpp" line="125"/> + <source>Copy label</source> + <translation>Kopíruj její označení</translation> </message> <message> - <location filename="../transactionview.cpp" line="384"/> - <source>Range:</source> - <translation>Rozsah:</translation> + <location filename="../transactionview.cpp" line="126"/> + <source>Copy amount</source> + <translation>Kopíruj částku</translation> </message> <message> - <location filename="../transactionview.cpp" line="58"/> - <source>This month</source> - <translation>Tento měsíc</translation> + <location filename="../transactionview.cpp" line="127"/> + <source>Edit label</source> + <translation>Uprav označení</translation> </message> <message> - <location filename="../transactionview.cpp" line="59"/> - <source>Last month</source> - <translation>Minulý měsíc</translation> + <location filename="../transactionview.cpp" line="270"/> + <source>Export Transaction Data</source> + <translation>Exportuj transakční data</translation> </message> <message> - <location filename="../transactionview.cpp" line="60"/> - <source>This year</source> - <translation>Letos</translation> + <location filename="../transactionview.cpp" line="279"/> + <source>Confirmed</source> + <translation>Potvrzeno</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="90"/> + <source>Min amount</source> + <translation>Minimální částka</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="281"/> + <source>Type</source> + <translation>Typ</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="285"/> + <source>ID</source> + <translation>ID</translation> </message> <message> <location filename="../transactionview.cpp" line="76"/> @@ -1533,11 +1571,6 @@ Adresa: %4 <translation>Vytěženo</translation> </message> <message> - <location filename="../transactionview.cpp" line="90"/> - <source>Min amount</source> - <translation>Minimální částka</translation> - </message> - <message> <location filename="../transactionview.cpp" line="55"/> <location filename="../transactionview.cpp" line="71"/> <source>All</source> @@ -1554,6 +1587,21 @@ Adresa: %4 <translation>Tento týden</translation> </message> <message> + <location filename="../transactionview.cpp" line="58"/> + <source>This month</source> + <translation>Tento měsíc</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="59"/> + <source>Last month</source> + <translation>Minulý měsíc</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="60"/> + <source>This year</source> + <translation>Letos</translation> + </message> + <message> <location filename="../transactionview.cpp" line="61"/> <source>Range...</source> <translation>Rozsah...</translation> @@ -1574,51 +1622,16 @@ Adresa: %4 <translation>Ostatní</translation> </message> <message> - <location filename="../transactionview.cpp" line="84"/> - <source>Enter address or label to search</source> - <translation>Zadej adresu nebo označení pro její vyhledání</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="124"/> - <source>Copy address</source> - <translation>Kopíruj adresu</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="125"/> - <source>Copy label</source> - <translation>Kopíruj její označení</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="126"/> - <source>Copy amount</source> - <translation>Kopíruj částku</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="127"/> - <source>Edit label</source> - <translation>Uprav označení</translation> - </message> - <message> <location filename="../transactionview.cpp" line="128"/> <source>Show details...</source> <translation>Zobraz detaily....</translation> </message> <message> - <location filename="../transactionview.cpp" line="270"/> - <source>Export Transaction Data</source> - <translation>Exportuj transakční data</translation> - </message> - <message> <location filename="../transactionview.cpp" line="271"/> <source>Comma separated file (*.csv)</source> <translation>CSV formát (*.csv)</translation> </message> <message> - <location filename="../transactionview.cpp" line="279"/> - <source>Confirmed</source> - <translation>Potvrzeno</translation> - </message> - <message> <location filename="../transactionview.cpp" line="280"/> <source>Date</source> <translation>Datum</translation> @@ -1644,6 +1657,16 @@ Adresa: %4 <translation>Chyba při exportu</translation> </message> <message> + <location filename="../transactionview.cpp" line="289"/> + <source>Could not write to file %1.</source> + <translation>Nemohu zapisovat do souboru %1.</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="384"/> + <source>Range:</source> + <translation>Rozsah:</translation> + </message> + <message> <location filename="../transactionview.cpp" line="392"/> <source>to</source> <translation>až</translation> @@ -1652,7 +1675,7 @@ Adresa: %4 <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>Posílám...</translation> </message> @@ -1660,401 +1683,494 @@ Adresa: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Maintain at most <n> connections to peers (default: 125)</source> - <translation>Povol nejvýše <n> připojení k uzlům (výchozí: 125)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify configuration file (default: bitcoin.conf)</source> - <translation>Konfigurační soubor (výchozí: bitcoin.conf)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Zadej časový limit spojení (v milisekundách)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="20"/> + <location filename="../bitcoinstrings.cpp" line="53"/> <source>Specify data directory</source> <translation>Adresář pro data</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> + <location filename="../bitcoinstrings.cpp" line="67"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Práh pro odpojování nesprávně se chovajících uzlů (výchozí: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Usage:</source> - <translation>Užití:</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="10"/> + <location filename="../bitcoinstrings.cpp" line="43"/> <source>Send command to -server or bitcoind</source> <translation>Poslat příkaz pro -server nebo bitcoind</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> + <location filename="../bitcoinstrings.cpp" line="46"/> <source>Options:</source> <translation>Možnosti:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Posílat stopovací/ladicí informace do konzole místo do souboru debug.log</translation> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source>Rescanning...</source> + <translation>Přeskenovávám...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Send trace/debug info to debugger</source> - <translation>Posílat stopovací/ladicí informace do debuggeru</translation> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Prepend debug output with timestamp</source> + <translation>Připojit před ladicí výstup časové razítko</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>Posílat příkazy uzlu běžícím na <ip> (výchozí: 127.0.0.1)</translation> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Upgrade wallet to latest format</source> + <translation>Převést peněženku na nejnovější formát</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>Akceptovatelné šifry (výchozí: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> + <location filename="../bitcoinstrings.cpp" line="77"/> + <source>Fee per KB to add to transactions you send</source> + <translation>Poplatek za KB, který se přidá ke každé odeslané transakci</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="41"/> + <source>Bitcoin version</source> + <translation>Verze Bitcoinu</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>Username for JSON-RPC connections</source> + <translation>Uživatelské jméno pro JSON-RPC spojení</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="80"/> + <source>Use the test network</source> + <translation>Použít testovací síť (testnet)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>Error loading wallet.dat</source> + <translation>Chyba při načítání wallet.dat</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Loading wallet...</source> + <translation>Načítám peněženku...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="123"/> + <source>Cannot initialize keypool</source> + <translation>Nemohu inicializovat zásobník klíčů</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="49"/> + <source>Generate coins</source> + <translation>Generovat mince</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">Chyba: Vytvoření transakce selhalo.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">Chyba Transakce byla odmítnuta. Tohle může nastat, pokud nějaké mince z tvé peněženky už jednou byly utraceny, například pokud používáš kopii souboru wallet.dat a mince byly utraceny v druhé kopii, ale nebyly označeny jako utracené v této.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation>Při nastavování naslouchacího RPC portu %u nastala chyba: %s</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="62"/> + <source>Connect only to the specified node</source> + <translation>Připojovat se pouze k udanému uzlu</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Error loading blkindex.dat</source> + <translation>Chyba při načítání blkindex.dat</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="118"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Chyba při načítání wallet.dat: peněženka je poškozená</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation>Nemohu převést peněženku do staršího formátu</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> - <source>Cannot write default address</source> - <translation>Nemohu napsat výchozí adresu</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="88"/> + <location filename="../bitcoinstrings.cpp" line="126"/> <source>Done loading</source> <translation>Načítání dokončeno</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> - <source>Rescanning...</source> - <translation>Přeskenovávám...</translation> + <location filename="../bitcoinstrings.cpp" line="84"/> + <source>Send trace/debug info to debugger</source> + <translation>Posílat stopovací/ladicí informace do debuggeru</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> - <source>Loading block index...</source> - <translation>Načítám index bloků...</translation> + <location filename="../bitcoinstrings.cpp" line="50"/> + <source>Don't generate coins</source> + <translation>Negenerovat mince</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation>Doba ve vteřinách, po kterou se nebudou moci nesprávně se chovající uzly znovu připojit (výchozí: 86400)</translation> + <location filename="../bitcoinstrings.cpp" line="115"/> + <source>Loading block index...</source> + <translation>Načítám index bloků...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> - <source>Accept command line and JSON-RPC commands</source> - <translation>Akceptovat příkazy z příkazové řádky a přes JSON-RPC</translation> + <location filename="../bitcoinstrings.cpp" line="101"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>Použít OpenSSL (https) pro JSON-RPC spojení</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Spustit příkaz, když se změní nejlepší blok (%s se v příkazu nahradí hashem bloku)</translation> + <location filename="../bitcoinstrings.cpp" line="102"/> + <source>Server certificate file (default: server.cert)</source> + <translation>Soubor se serverovým certifikátem (výchozí: server.cert)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> - <source>Prepend debug output with timestamp</source> - <translation>Připojit před ladicí výstup časové razítko</translation> + <location filename="../bitcoinstrings.cpp" line="103"/> + <source>Server private key (default: server.pem)</source> + <translation>Soubor se serverovým soukromým klíčem (výchozí: server.pem)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Password for JSON-RPC connections</source> - <translation>Heslo pro JSON-RPC spojení</translation> + <location filename="../bitcoinstrings.cpp" line="120"/> + <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> + <translation>Soubor s peněženkou potřeboval přepsat: restartuj Bitcoin, aby se operace dokončila</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation>Čekat na JSON-RPC spojení na <portu> (výchozí: 8332)</translation> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation>%s, musíš nastavit rpcpassword v konfiguračním souboru: + %s +Je vhodné použít následující náhodné heslo: +rpcuser=bitcoinrpc +rpcpassword=%s +(není potřeba si ho pamatovat) +Pokud konfigurační soubor ještě neexistuje, vytvoř ho tak, aby ho mohl číst pouze vlastník. +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation>Nastavit zásobník klíčů na velikost <n> (výchozí: 100)</translation> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation>Musíš nastavit rpcpassword=<heslo> v konfiguračním souboru: +%s +Pokud konfigurační soubor ještě neexistuje, vytvoř ho tak, aby ho mohl číst pouze vlastník.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> - <source>Rescan the block chain for missing wallet transactions</source> - <translation>Přeskenovat řetězec bloků na chybějící transakce tvé pěněženky</translation> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation>Chyba</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> - <source>Error loading blkindex.dat</source> - <translation>Chyba při načítání blkindex.dat</translation> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Posílám...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> - <source>Upgrade wallet to latest format</source> - <translation>Převést peněženku na nejnovější formát</translation> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>Nedostatek prostředků</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> - <source>List commands</source> - <translation>Výpis příkazů</translation> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation>K použití volby %s</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Get help for a command</source> - <translation>Získat nápovědu pro příkaz</translation> + <location filename="../bitcoinstrings.cpp" line="63"/> + <source>Find peers using internet relay chat (default: 0)</source> + <translation>Hledat uzly přes IRC (výchozí: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> + <location filename="../bitcoinstrings.cpp" line="54"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Nastavit velikost databázové vyrovnávací paměti v megabajtech (výchozí: 25)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Find peers using internet relay chat (default: 0)</source> - <translation>Hledat uzly přes IRC (výchozí: 0)</translation> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation>Nastavit velikost databázového souboru s logy v megabajtech (výchozí: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Poplatek za KB, který se přidá ke každé odeslané transakci</translation> + <location filename="../bitcoinstrings.cpp" line="60"/> + <source>Maintain at most <n> connections to peers (default: 125)</source> + <translation>Povol nejvýše <n> připojení k uzlům (výchozí: 125)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> - <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation>Kolik bloků při startu zkontrolovat (výchozí: 2500, 0 = všechny)</translation> + <location filename="../bitcoinstrings.cpp" line="47"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation>Konfigurační soubor (výchozí: bitcoin.conf)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> - <source>How thorough the block verification is (0-6, default: 1)</source> - <translation>Jak moc důkladná má verifikace bloků být (0-6, výchozí: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Specify connection timeout (in milliseconds)</source> + <translation>Zadej časový limit spojení (v milisekundách)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Bitcoin version</source> - <translation>Verze Bitcoinu</translation> + <location filename="../bitcoinstrings.cpp" line="42"/> + <source>Usage:</source> + <translation>Užití:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation>Čekat na spojení na <portu> (výchozí: 8333 nebo testnet: 18333)</translation> + <location filename="../bitcoinstrings.cpp" line="68"/> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> + <translation>Doba ve vteřinách, po kterou se nebudou moci nesprávně se chovající uzly znovu připojit (výchozí: 86400)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> - <source>Run in the background as a daemon and accept commands</source> - <translation>Běžet na pozadí jako démon a akceptovat příkazy</translation> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>Nedaří se mi získat zámek na datový adresář %s. Bitcoin pravděpodobně už jednou běží.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>PID soubor (výchozí: bitcoind.pid)</translation> + <location filename="../bitcoinstrings.cpp" line="90"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation>Spustit příkaz, když se změní nejlepší blok (%s se v příkazu nahradí hashem bloku)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> - <source>Username for JSON-RPC connections</source> - <translation>Uživatelské jméno pro JSON-RPC spojení</translation> + <location filename="../bitcoinstrings.cpp" line="86"/> + <source>Password for JSON-RPC connections</source> + <translation>Heslo pro JSON-RPC spojení</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> - <source>Use the test network</source> - <translation>Použít testovací síť (testnet)</translation> + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>Čekat na JSON-RPC spojení na <portu> (výchozí: 8332)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> - <source>This help message</source> - <translation>Tato nápověda</translation> + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>Nastavit zásobník klíčů na velikost <n> (výchozí: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> - <source>Loading addresses...</source> - <translation>Načítám adresy...</translation> + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation>Přeskenovat řetězec bloků na chybějící transakce tvé pěněženky</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation>Chyba při načítání wallet.dat: peněženka vyžaduje novější verzi Bitcoinu</translation> + <location filename="../bitcoinstrings.cpp" line="44"/> + <source>List commands</source> + <translation>Výpis příkazů</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> - <source>Error loading wallet.dat</source> - <translation>Chyba při načítání wallet.dat</translation> + <location filename="../bitcoinstrings.cpp" line="45"/> + <source>Get help for a command</source> + <translation>Získat nápovědu pro příkaz</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="59"/> + <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> + <translation>Čekat na spojení na <portu> (výchozí: 8333 nebo testnet: 18333)</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="79"/> - <source>Loading wallet...</source> - <translation>Načítám peněženku...</translation> + <source>Run in the background as a daemon and accept commands</source> + <translation>Běžet na pozadí jako démon a akceptovat příkazy</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> - <source>Cannot initialize keypool</source> - <translation>Nemohu inicializovat zásobník klíčů</translation> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>PID soubor (výchozí: bitcoind.pid)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Generate coins</source> - <translation>Generovat mince</translation> + <location filename="../bitcoinstrings.cpp" line="107"/> + <source>This help message</source> + <translation>Tato nápověda</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Allow DNS lookups for addnode and connect</source> - <translation>Povolit DNS dotazy pro addnode (přidání uzlu) a connect (připojení)</translation> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation>Užití</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Connect only to the specified node</source> - <translation>Připojovat se pouze k udanému uzlu</translation> + <location filename="../bitcoinstrings.cpp" line="113"/> + <source>Loading addresses...</source> + <translation>Načítám adresy...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="58"/> + <source>Allow DNS lookups for addnode and connect</source> + <translation>Povolit DNS dotazy pro addnode (přidání uzlu) a connect (připojení)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation>Přijímat spojení zvenčí (výchozí: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> + <location filename="../bitcoinstrings.cpp" line="65"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation>Nastavit jazyk, například "de_DE" (výchozí: systémové nastavení)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> + <location filename="../bitcoinstrings.cpp" line="66"/> <source>Find peers using DNS lookup (default: 1)</source> <translation type="unfinished">Hledat uzly přes DNS (výchozí: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> - <translation>Maximální velikost přijímacího bufferu pro každé spojení, <n>*1000 bytů (výchozí: 10000)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished">Použít UPnP k namapování naslouchacího portu (výchozí: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> + <location filename="../bitcoinstrings.cpp" line="52"/> <source>Show splash screen on startup (default: 1)</source> <translation>Zobrazovat startovací obrazovku (výchozí: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> + <location filename="../bitcoinstrings.cpp" line="81"/> <source>Output extra debugging information</source> <translation>Tisknout speciální ladící informace</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> - <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation> -Možnosti SSL: (viz instrukce nastavení SSL v Bitcoin Wiki)</translation> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source>How many blocks to check at startup (default: 2500, 0 = all)</source> + <translation>Kolik bloků při startu zkontrolovat (výchozí: 2500, 0 = všechny)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> - <source>Error loading addr.dat</source> - <translation>Chyba při načítání addr.dat</translation> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>How thorough the block verification is (0-6, default: 1)</source> + <translation>Jak moc důkladná má verifikace bloků být (0-6, výchozí: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Warning: Disk space is low</source> + <translation>Upozornění: Na disku je málo místa</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="124"/> + <source>Cannot write default address</source> + <translation>Nemohu napsat výchozí adresu</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation>Neplatná -proxy adresa</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> + <location filename="../bitcoinstrings.cpp" line="128"/> <source>Invalid amount for -paytxfee=<amount></source> <translation>Neplatná částka pro -paytxfee=<částka></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> - <translation>Upozornění: Na disku je málo místa</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation>Chyba: Selhalo CreateThread(StartNode)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> + <location filename="../bitcoinstrings.cpp" line="133"/> <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> <translation>Nedaří se mi připojit na port %d na tomhle počítači. Bitcoin už pravděpodobně jednou běží.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> + <location filename="../bitcoinstrings.cpp" line="38"/> <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> <translation>Upozornění: Zkontroluj, že máš v počítači správně nastavený datum a čas. Pokud jsou nastaveny špatně, Bitcoin nebude fungovat správně.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> - <translation>Maximální velikost odesílacího bufferu pro každé spojení, <n>*1000 bytů (výchozí: 10000)</translation> + <location filename="../bitcoinstrings.cpp" line="78"/> + <source>Accept command line and JSON-RPC commands</source> + <translation>Akceptovat příkazy z příkazové řádky a přes JSON-RPC</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Don't generate coins</source> - <translation>Negenerovat mince</translation> + <location filename="../bitcoinstrings.cpp" line="72"/> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> + <translation>Maximální velikost odesílacího bufferu pro každé spojení, <n>*1000 bytů (výchozí: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> + <location filename="../bitcoinstrings.cpp" line="51"/> <source>Start minimized</source> <translation>Startovat minimalizovaně</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> + <location filename="../bitcoinstrings.cpp" line="57"/> + <source>Connect through socks4 proxy</source> + <translation>Připojovat se přes socks4 proxy</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="74"/> + <source>Use Universal Plug and Play to map the listening port (default: 0)</source> + <translation type="unfinished">Použít UPnP k namapování naslouchacího portu (výchozí: 0)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="129"/> + <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> + <translation>Upozornění: -paytxfee je nastaveno velmi vysoko. Toto je transakční poplatek, který zaplatíš za každou poslanou transakci.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="88"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Povolit JSON-RPC spojení ze specifikované IP adresy</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Connect through socks4 proxy</source> - <translation>Připojovat se přes socks4 proxy</translation> + <location filename="../bitcoinstrings.cpp" line="71"/> + <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> + <translation>Maximální velikost přijímacího bufferu pro každé spojení, <n>*1000 bytů (výchozí: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Add a node to connect to and attempt to keep the connection open</source> - <translation>Přidat uzel, ke kterému se připojit a snažit se spojení udržet</translation> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>Neplatná částka</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> - <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>Použít OpenSSL (https) pro JSON-RPC spojení</translation> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>Akceptovatelné šifry (výchozí: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> - <source>Server certificate file (default: server.cert)</source> - <translation>Soubor se serverovým certifikátem (výchozí: server.cert)</translation> + <location filename="../bitcoinstrings.cpp" line="61"/> + <source>Add a node to connect to and attempt to keep the connection open</source> + <translation>Přidat uzel, ke kterému se připojit a snažit se spojení udržet</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> - <source>Server private key (default: server.pem)</source> - <translation>Soubor se serverovým soukromým klíčem (výchozí: server.pem)</translation> + <location filename="../bitcoinstrings.cpp" line="98"/> + <source> +SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation> +Možnosti SSL: (viz instrukce nastavení SSL v Bitcoin Wiki)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Use Universal Plug and Play to map the listening port (default: 0)</source> - <translation type="unfinished">Použít UPnP k namapování naslouchacího portu (výchozí: 0)</translation> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation>Odpojit databázi bloků a adres. Prodlužuje čas potřebný k ukončení (výchozí: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> - <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> - <translation>Upozornění: -paytxfee je nastaveno velmi vysoko. Toto je transakční poplatek, který zaplatíš za každou poslanou transakci.</translation> + <location filename="../bitcoinstrings.cpp" line="114"/> + <source>Error loading addr.dat</source> + <translation>Chyba při načítání addr.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>beta</translation> + <location filename="../bitcoinstrings.cpp" line="119"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> + <translation>Chyba při načítání wallet.dat: peněženka vyžaduje novější verzi Bitcoinu</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> - <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation>Soubor s peněženkou potřeboval přepsat: restartuj Bitcoin, aby se operace dokončila</translation> + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>Posílat příkazy uzlu běžícím na <ip> (výchozí: 127.0.0.1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="83"/> + <source>Send trace/debug info to console instead of debug.log file</source> + <translation>Posílat stopovací/ladicí informace do konzole místo do souboru debug.log</translation> </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts index f1e3480b90..d5e72e12f3 100644 --- a/src/qt/locale/bitcoin_da.ts +++ b/src/qt/locale/bitcoin_da.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> version</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -55,49 +55,29 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <translation>Opret en ny adresse</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="71"/> - <source>Copy the currently selected address to the system clipboard</source> - <translation>Kopier den valgte adresse til systemets udklipsholder</translation> - </message> - <message> - <location filename="../forms/addressbookpage.ui" line="99"/> - <source>Sign &Message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="61"/> - <source>Copy address</source> - <translation>Kopier adresse</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="62"/> - <source>Copy label</source> - <translation>Kopier etiket</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="63"/> - <source>Edit</source> - <translation type="unfinished">Rediger</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation>Kommasepareret fil (*. csv)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>Fejl under eksport</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation>Kunne ikke skrive til filen %1.</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> - <source>Export Address Book Data</source> - <translation>Eksporter Adressekartoteketsdata</translation> + <location filename="../forms/addressbookpage.ui" line="60"/> + <source>&New Address...</source> + <translation>&Ny adresse ...</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="71"/> + <source>Copy the currently selected address to the system clipboard</source> + <translation>Kopier den valgte adresse til systemets udklipsholder</translation> </message> <message> <location filename="../forms/addressbookpage.ui" line="74"/> @@ -115,6 +95,11 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <translation type="unfinished"></translation> </message> <message> + <location filename="../forms/addressbookpage.ui" line="99"/> + <source>Sign &Message</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/addressbookpage.ui" line="110"/> <source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source> <translation>Slet den valgte adresse fra listen. Kun adresser brugt til afsendelse kan slettes.</translation> @@ -125,27 +110,42 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <translation>&Slet</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="60"/> - <source>&New Address...</source> - <translation>&Ny adresse ...</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation type="unfinished">Slet</translation> </message> + <message> + <location filename="../addressbookpage.cpp" line="65"/> + <source>Copy address</source> + <translation>Kopier adresse</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="66"/> + <source>Copy label</source> + <translation>Kopier etiket</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="67"/> + <source>Edit</source> + <translation type="unfinished">Rediger</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="285"/> + <source>Export Address Book Data</source> + <translation>Eksporter Adressekartoteketsdata</translation> + </message> </context> <context> <name>AddressTableModel</name> <message> <location filename="../addresstablemodel.cpp" line="78"/> - <source>Address</source> - <translation>Adresse</translation> + <source>Label</source> + <translation>Etiket</translation> </message> <message> <location filename="../addresstablemodel.cpp" line="78"/> - <source>Label</source> - <translation>Etiket</translation> + <source>Address</source> + <translation>Adresse</translation> </message> <message> <location filename="../addresstablemodel.cpp" line="114"/> @@ -156,29 +156,29 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <context> <name>AskPassphraseDialog</name> <message> - <location filename="../forms/askpassphrasedialog.ui" line="94"/> - <source>TextLabel</source> - <translation>TekstEtiket</translation> + <location filename="../forms/askpassphrasedialog.ui" line="61"/> + <source>New passphrase</source> + <translation>Ny adgangskode</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="35"/> - <source>Encrypt wallet</source> - <translation>Krypter tegnebog</translation> + <location filename="../forms/askpassphrasedialog.ui" line="75"/> + <source>Repeat new passphrase</source> + <translation>Gentag ny adgangskode</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="38"/> - <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>Denne funktion har brug for din tegnebogs kodeord for at låse tegnebogen op.</translation> + <location filename="../askpassphrasedialog.cpp" line="54"/> + <source>Change passphrase</source> + <translation>Skift adgangskode</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="43"/> - <source>Unlock wallet</source> - <translation>Lås tegnebog op</translation> + <location filename="../forms/askpassphrasedialog.ui" line="47"/> + <source>Enter passphrase</source> + <translation>Indtast adgangskode</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="61"/> - <source>New passphrase</source> - <translation>Ny adgangskode</translation> + <location filename="../askpassphrasedialog.cpp" line="51"/> + <source>Decrypt wallet</source> + <translation>Dekryptér tegnebog</translation> </message> <message> <location filename="../forms/askpassphrasedialog.ui" line="26"/> @@ -186,43 +186,42 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open <translation>Dialog</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="47"/> - <source>Enter passphrase</source> - <translation>Indtast adgangskode</translation> + <location filename="../askpassphrasedialog.cpp" line="126"/> + <location filename="../askpassphrasedialog.cpp" line="133"/> + <location filename="../askpassphrasedialog.cpp" line="175"/> + <location filename="../askpassphrasedialog.cpp" line="181"/> + <source>Wallet encryption failed</source> + <translation>Tegnebogskryptering mislykkedes</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="170"/> - <source>Wallet passphrase was successfully changed.</source> - <translation>Tegnebogskodeord blev ændret.</translation> + <location filename="../forms/askpassphrasedialog.ui" line="94"/> + <source>TextLabel</source> + <translation>TekstEtiket</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="113"/> - <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> - <translation>Bitcoin will close now to finish the encryption process. Husk, at kryptere din tegnebog vil ikke fuldt ud beskytte dine bitcoins mod at blive stjålet af malware på din computer.</translation> + <location filename="../askpassphrasedialog.cpp" line="34"/> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>Indtast den nye adgangskode til tegnebogen.<br/>Brug venligst en adgangskode på <b>10 eller flere tilfældige tegn</b>, eller <b>otte eller flere ord</b>.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="146"/> - <location filename="../askpassphrasedialog.cpp" line="157"/> - <location filename="../askpassphrasedialog.cpp" line="176"/> - <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation>Det angivne kodeord for tegnebogsdekrypteringen er forkert.</translation> + <location filename="../askpassphrasedialog.cpp" line="46"/> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Denne funktion har brug for din tegnebogs kodeord for at dekryptere tegnebogen.</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="75"/> - <source>Repeat new passphrase</source> - <translation>Gentag ny adgangskode</translation> + <location filename="../askpassphrasedialog.cpp" line="43"/> + <source>Unlock wallet</source> + <translation>Lås tegnebog op</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="54"/> - <source>Change passphrase</source> - <translation>Skift adgangskode</translation> + <location filename="../askpassphrasedialog.cpp" line="38"/> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Denne funktion har brug for din tegnebogs kodeord for at låse tegnebogen op.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="102"/> - <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! -Are you sure you wish to encrypt your wallet?</source> - <translation>ADVARSEL: Hvis du krypterer din tegnebog og mister dit kodeord vil du <b>miste alle dine BITCOINS</b>! -Er du sikker på at du ønsker at kryptere din tegnebog?</translation> + <location filename="../askpassphrasedialog.cpp" line="101"/> + <source>Confirm wallet encryption</source> + <translation>Bekræft tegnebogskryptering</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="117"/> @@ -235,39 +234,26 @@ Er du sikker på at du ønsker at kryptere din tegnebog?</translation> <translation>Tegnebogskryptering mislykkedes på grund af en intern fejl. Din tegnebog blev ikke krypteret.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="134"/> - <location filename="../askpassphrasedialog.cpp" line="182"/> - <source>The supplied passphrases do not match.</source> - <translation>De angivne kodeord stemmer ikke overens.</translation> - </message> - <message> <location filename="../askpassphrasedialog.cpp" line="217"/> <location filename="../askpassphrasedialog.cpp" line="241"/> <source>Warning: The Caps Lock key is on.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="34"/> - <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>Indtast den nye adgangskode til tegnebogen.<br/>Brug venligst en adgangskode på <b>10 eller flere tilfældige tegn</b>, eller <b>otte eller flere ord</b>.</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="126"/> - <location filename="../askpassphrasedialog.cpp" line="133"/> - <location filename="../askpassphrasedialog.cpp" line="175"/> - <location filename="../askpassphrasedialog.cpp" line="181"/> - <source>Wallet encryption failed</source> - <translation>Tegnebogskryptering mislykkedes</translation> + <location filename="../askpassphrasedialog.cpp" line="35"/> + <source>Encrypt wallet</source> + <translation>Krypter tegnebog</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="46"/> - <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>Denne funktion har brug for din tegnebogs kodeord for at dekryptere tegnebogen.</translation> + <location filename="../askpassphrasedialog.cpp" line="134"/> + <location filename="../askpassphrasedialog.cpp" line="182"/> + <source>The supplied passphrases do not match.</source> + <translation>De angivne kodeord stemmer ikke overens.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="51"/> - <source>Decrypt wallet</source> - <translation>Dekryptér tegnebog</translation> + <location filename="../askpassphrasedialog.cpp" line="156"/> + <source>Wallet decryption failed</source> + <translation>Tegnebogsdekryptering mislykkedes</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="145"/> @@ -280,14 +266,18 @@ Er du sikker på at du ønsker at kryptere din tegnebog?</translation> <translation>Indtast den gamle og nye adgangskode til tegnebogen.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="156"/> - <source>Wallet decryption failed</source> - <translation>Tegnebogsdekryptering mislykkedes</translation> + <location filename="../askpassphrasedialog.cpp" line="146"/> + <location filename="../askpassphrasedialog.cpp" line="157"/> + <location filename="../askpassphrasedialog.cpp" line="176"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Det angivne kodeord for tegnebogsdekrypteringen er forkert.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="101"/> - <source>Confirm wallet encryption</source> - <translation>Bekræft tegnebogskryptering</translation> + <location filename="../askpassphrasedialog.cpp" line="102"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! +Are you sure you wish to encrypt your wallet?</source> + <translation>ADVARSEL: Hvis du krypterer din tegnebog og mister dit kodeord vil du <b>miste alle dine BITCOINS</b>! +Er du sikker på at du ønsker at kryptere din tegnebog?</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="111"/> @@ -295,122 +285,151 @@ Er du sikker på at du ønsker at kryptere din tegnebog?</translation> <source>Wallet encrypted</source> <translation>Tegnebog krypteret</translation> </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="113"/> + <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>Bitcoin will close now to finish the encryption process. Husk, at kryptere din tegnebog vil ikke fuldt ud beskytte dine bitcoins mod at blive stjålet af malware på din computer.</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="170"/> + <source>Wallet passphrase was successfully changed.</source> + <translation>Tegnebogskodeord blev ændret.</translation> + </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="186"/> + <source>Show general overview of wallet</source> + <translation>Vis generel oversigt over tegnebog</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="192"/> <source>Browse transaction history</source> <translation>Gennemse transaktionshistorik</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> - <source>Edit the list of stored addresses and labels</source> - <translation>Rediger listen over gemte adresser og etiketter</translation> + <location filename="../bitcoingui.cpp" line="245"/> + <source>&Options...</source> + <translation>&Indstillinger ...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> - <source>Show general overview of wallet</source> - <translation>Vis generel oversigt over tegnebog</translation> + <location filename="../bitcoingui.cpp" line="197"/> + <source>&Address Book</source> + <translation>&Adressebog</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> - <translation>&Eksporter...</translation> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>Rediger konfigurationsindstillinger af bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> - <source>Show information about Bitcoin</source> - <translation>Vis oplysninger om Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="185"/> + <source>&Overview</source> + <translation>&Oversigt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> - <source>Show information about Qt</source> - <translation>Vis oplysninger om Qt</translation> + <location filename="../bitcoingui.cpp" line="203"/> + <source>&Receive coins</source> + <translation>&Modtag coins</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> - <source>Show the list of addresses for receiving payments</source> - <translation>Vis listen over adresser for at modtage betalinger</translation> + <location filename="../bitcoingui.cpp" line="663"/> + <source>Sent transaction</source> + <translation>Afsendt transaktion</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> - <source>Actions toolbar</source> - <translation>Handlingsværktøjslinje</translation> + <location filename="../bitcoingui.cpp" line="198"/> + <source>Edit the list of stored addresses and labels</source> + <translation>Rediger listen over gemte adresser og etiketter</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="73"/> - <source>Bitcoin Wallet</source> - <translation>Bitcoin Tegnebog</translation> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Send coins to a bitcoin address</source> + <translation>Send coins til en bitcoinadresse</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> + <location filename="../bitcoingui.cpp" line="252"/> <source>&Encrypt Wallet</source> <translation>&Kryptér tegnebog</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> - <source>Synchronizing with network...</source> - <translation>Synkroniserer med netværk ...</translation> + <location filename="../bitcoingui.cpp" line="253"/> + <source>Encrypt or decrypt wallet</source> + <translation>Kryptér eller dekryptér tegnebog</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> - <source>&Transactions</source> - <translation>&Transaktioner</translation> + <location filename="../bitcoingui.cpp" line="243"/> + <source>Show information about Qt</source> + <translation>Vis oplysninger om Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> - <source>&Receive coins</source> - <translation>&Modtag coins</translation> + <location filename="../bitcoingui.cpp" line="204"/> + <source>Show the list of addresses for receiving payments</source> + <translation>Vis listen over adresser for at modtage betalinger</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> + <location filename="../bitcoingui.cpp" line="209"/> <source>&Send coins</source> <translation>&Send coins</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> + <location filename="../bitcoingui.cpp" line="250"/> + <source>&Export...</source> + <translation>&Eksporter...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="235"/> <source>E&xit</source> <translation>&Luk</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> - <source>&Address Book</source> - <translation>&Adressebog</translation> + <location filename="../bitcoingui.cpp" line="240"/> + <source>Show information about Bitcoin</source> + <translation>Vis oplysninger om Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="255"/> - <source>Encrypt or decrypt wallet</source> - <translation>Kryptér eller dekryptér tegnebog</translation> + <location filename="../bitcoingui.cpp" line="71"/> + <source>Bitcoin Wallet</source> + <translation>Bitcoin Tegnebog</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> + <location filename="../bitcoingui.cpp" line="281"/> <source>&File</source> <translation>&Fil</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> - <source>&Options...</source> - <translation>&Indstillinger ...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>Downloadet %1 af %2 blokke af transaktionshistorie.</translation> + <location filename="../bitcoingui.cpp" line="506"/> + <source>Synchronizing with network...</source> + <translation>Synkroniserer med netværk ...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> - <source>Sent transaction</source> - <translation>Afsendt transaktion</translation> + <location filename="../bitcoingui.cpp" line="191"/> + <source>&Transactions</source> + <translation>&Transaktioner</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> + <location filename="../bitcoingui.cpp" line="258"/> <source>Change the passphrase used for wallet encryption</source> <translation>Skift kodeord anvendt til tegnebogskryptering</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="236"/> + <source>Quit application</source> + <translation>Afslut program</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="632"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="664"/> + <source>Incoming transaction</source> + <translation>Indgående transaktion</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -423,52 +442,60 @@ Adresse: %4 </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>&Om %1</translation> + <location filename="../bitcoingui.cpp" line="790"/> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation>Tegnebog er <b>krypteret</b> og i øjeblikket <b>ulåst</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> - <source>&Settings</source> - <translation>&Indstillinger</translation> + <location filename="../bitcoingui.cpp" line="296"/> + <source>&Help</source> + <translation>&Hjælp</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> - <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="798"/> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation>Tegnebog er <b>krypteret</b> og i øjeblikket <b>låst</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> - <source>Sending...</source> - <translation>Sender...</translation> + <location filename="../bitcoingui.cpp" line="314"/> + <source>Actions toolbar</source> + <translation>Handlingsværktøjslinje</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> - <source>Incoming transaction</source> - <translation>Indgående transaktion</translation> + <location filename="../bitcoingui.cpp" line="531"/> + <source>Downloaded %1 blocks of transaction history.</source> + <translation>Downloadet %1 blokke af transaktionshistorie.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> - <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation>Tegnebog er <b>krypteret</b> og i øjeblikket <b>ulåst</b></translation> + <location filename="../bitcoingui.cpp" line="303"/> + <source>Tabs toolbar</source> + <translation>Faneværktøjslinje</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> - <source>Send coins to a bitcoin address</source> - <translation>Send coins til en bitcoinadresse</translation> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>&Om %1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> - <source>Quit application</source> - <translation>Afslut program</translation> + <location filename="../bitcoingui.cpp" line="242"/> + <source>About &Qt</source> + <translation>Om &Qt</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> + <location filename="../bitcoingui.cpp" line="482"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n aktiv(e) forbindelse(r) til Bitcoinnetværket</numerusform> @@ -476,90 +503,70 @@ Adresse: %4 </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>Rediger konfigurationsindstillinger af bitcoin</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="253"/> + <location filename="../bitcoingui.cpp" line="251"/> <source>Export the data in the current tab to a file</source> <translation>Eksportér den aktuelle visning til en fil</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> - <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation>Tegnebog er <b>krypteret</b> og i øjeblikket <b>låst</b></translation> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation>&Skift adgangskode</translation> </message> - <message> - <location filename="../bitcoingui.cpp" line="501"/> - <source>Downloaded %1 blocks of transaction history.</source> - <translation>Downloadet %1 blokke af transaktionshistorie.</translation> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="546"/> + <source>%n second(s) ago</source> + <translation> + <numerusform>%n sekund(er) siden</numerusform> + <numerusform>%n sekund(er) siden</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Blokkæde synkronisering i gang</translation> + <location filename="../bitcoingui.cpp" line="290"/> + <source>&Settings</source> + <translation>&Indstillinger</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> + <location filename="../bitcoingui.cpp" line="215"/> <source>Sign &message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> + <location filename="../bitcoingui.cpp" line="216"/> <source>Prove you control an address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>Åbn &Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Vis Bitcoinvinduet</translation> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation type="unfinished">Vis Bitcoinvinduet</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> + <location filename="../bitcoingui.cpp" line="255"/> <source>&Backup Wallet</source> <translation type="unfinished">&Backup tegnebog</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> + <location filename="../bitcoingui.cpp" line="256"/> <source>Backup wallet to another location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>&Skift adgangskode</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="298"/> - <source>&Help</source> - <translation>&Hjælp</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="305"/> - <source>Tabs toolbar</source> - <translation>Faneværktøjslinje</translation> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> - <source>bitcoin-qt</source> - <translation>bitcoin-qt</translation> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>Downloadet %1 af %2 blokke af transaktionshistorie (%3% done).</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> - <source>%n second(s) ago</source> - <translation> - <numerusform>%n sekund(er) siden</numerusform> - <numerusform>%n sekund(er) siden</numerusform> - </translation> - </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation> <numerusform>%n minut(ter) siden</numerusform> @@ -567,7 +574,7 @@ Adresse: %4 </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation> <numerusform>%n time(r) siden</numerusform> @@ -575,7 +582,7 @@ Adresse: %4 </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>%n dag(e) siden</numerusform> @@ -583,52 +590,52 @@ Adresse: %4 </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation>Opdateret</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>Indhenter...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation>Sidst modtagne blok blev genereret %1.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="636"/> + <source>Sending...</source> + <translation>Sender...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Backup Wallet</source> + <translation>Backup tegnebog</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Backup Wallet</source> - <translation>Backup tegnebog</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="244"/> - <source>About &Qt</source> - <translation>Om &Qt</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="187"/> - <source>&Overview</source> - <translation>&Oversigt</translation> + <location filename="../bitcoingui.cpp" line="418"/> + <source>bitcoin-qt</source> + <translation>bitcoin-qt</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -636,22 +643,22 @@ Adresse: %4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&Enhed at vise beløb i: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>Vælg den standard underopdelingsenhed som skal vises i brugergrænsefladen, og når du sender coins</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&Vis adresser i transaktionensliste</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished"></translation> </message> @@ -714,98 +721,108 @@ Adresse: %4 <translation>Kunne ikke låse tegnebog op.</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="106"/> - <source>New key generation failed.</source> - <translation>Ny nøglegenerering mislykkedes.</translation> - </message> - <message> <location filename="../editaddressdialog.cpp" line="96"/> <source>The entered address "%1" is not a valid bitcoin address.</source> <translation>Den indtastede adresse "%1" er ikke en gyldig bitcoinadresse.</translation> </message> + <message> + <location filename="../editaddressdialog.cpp" line="106"/> + <source>New key generation failed.</source> + <translation>Ny nøglegenerering mislykkedes.</translation> + </message> </context> <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Porten på proxyen (f.eks. 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>&Start Bitcoin når systemet startes</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Start Bitcoin automatisk efter at computeren er tændt</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>&Minimer til systembakken i stedet for proceslinjen</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>Vis kun et systembakkeikon efter minimering af vinduet</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> + <location filename="../optionsdialog.cpp" line="185"/> <source>Map port using &UPnP</source> <translation>Konfigurer port vha. &UPnP</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="180"/> <source>M&inimize on close</source> <translation>M&inimer ved lukning</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="181"/> + <location filename="../optionsdialog.cpp" line="186"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Åbn Bitcoinklient-porten på routeren automatisk. Dette virker kun når din router understøtter UPnP og UPnP er aktiveret.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="186"/> + <location filename="../optionsdialog.cpp" line="181"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>Minimer i stedet for at afslutte programmet når vinduet lukkes. Når denne indstilling er valgt vil programmet kun blive lukket når du har valgt Afslut i menuen.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>&Forbind gennem SOCKS4 proxy:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Opret forbindelse til Bitconnetværket via en SOCKS4 proxy (f.eks. ved tilslutning gennem Tor)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>Proxy-&IP:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>IP-adressen på proxyen (f.eks. 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>&Port:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>Valgfri transaktionsgebyr pr. kB, der hjælper dine transaktioner med at blive behandlet hurtigt. De fleste transaktioner er på 1 kB. Gebyr på 0.01 anbefales.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>Betal transaktions&gebyr</translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessagePage</name> @@ -840,33 +857,6 @@ Adresse: %4 <translation>Alt+P</translation> </message> <message> - <location filename="../messagepage.cpp" line="74"/> - <source>%1 is not a valid address.</source> - <translation type="unfinished">Den indtastede adresse "%1" er ikke en gyldig bitcoinadresse.</translation> - </message> - <message> - <location filename="../messagepage.cpp" line="74"/> - <location filename="../messagepage.cpp" line="89"/> - <location filename="../messagepage.cpp" line="101"/> - <source>Error signing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../messagepage.cpp" line="89"/> - <source>Private key for %1 is not available.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../messagepage.cpp" line="101"/> - <source>Sign failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../forms/messagepage.ui" line="71"/> - <source>Paste address from clipboard</source> - <translation>Indsæt adresse fra udklipsholderen</translation> - </message> - <message> <location filename="../forms/messagepage.ui" line="93"/> <source>Enter the message you want to sign here</source> <translation type="unfinished"></translation> @@ -896,23 +886,50 @@ Adresse: %4 <source>&Copy to Clipboard</source> <translation>&Kopier til Udklipsholder</translation> </message> + <message> + <location filename="../forms/messagepage.ui" line="71"/> + <source>Paste address from clipboard</source> + <translation>Indsæt adresse fra udklipsholderen</translation> + </message> + <message> + <location filename="../messagepage.cpp" line="74"/> + <source>%1 is not a valid address.</source> + <translation type="unfinished">Den indtastede adresse "%1" er ikke en gyldig bitcoinadresse.</translation> + </message> + <message> + <location filename="../messagepage.cpp" line="74"/> + <location filename="../messagepage.cpp" line="89"/> + <location filename="../messagepage.cpp" line="101"/> + <source>Error signing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../messagepage.cpp" line="89"/> + <source>Private key for %1 is not available.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../messagepage.cpp" line="101"/> + <source>Sign failed</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> - <source>Main</source> - <translation>Generelt</translation> + <location filename="../optionsdialog.cpp" line="85"/> + <source>Display</source> + <translation>Visning</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>Indstillinger</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> - <source>Display</source> - <translation>Visning</translation> + <location filename="../optionsdialog.cpp" line="80"/> + <source>Main</source> + <translation>Generelt</translation> </message> </context> <context> @@ -928,6 +945,11 @@ Adresse: %4 <translation>Saldo:</translation> </message> <message> + <location filename="../overviewpage.cpp" line="111"/> + <source>Total number of transactions in wallet</source> + <translation>Samlede antal transaktioner i tegnebogen</translation> + </message> + <message> <location filename="../forms/overviewpage.ui" line="54"/> <source>Number of transactions:</source> <translation>Antal transaktioner:</translation> @@ -938,14 +960,9 @@ Adresse: %4 <translation>0</translation> </message> <message> - <location filename="../overviewpage.cpp" line="103"/> - <source>Your current balance</source> - <translation>Din nuværende saldo</translation> - </message> - <message> - <location filename="../overviewpage.cpp" line="108"/> - <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> - <translation>Summen af transaktioner, der endnu ikke er bekræftet, og endnu ikke er inkluderet i den nuværende saldo</translation> + <location filename="../forms/overviewpage.ui" line="68"/> + <source>Unconfirmed:</source> + <translation>Ubekræftede:</translation> </message> <message> <location filename="../forms/overviewpage.ui" line="88"/> @@ -958,39 +975,29 @@ Adresse: %4 <translation><b>Nyeste transaktioner</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="111"/> - <source>Total number of transactions in wallet</source> - <translation>Samlede antal transaktioner i tegnebogen</translation> + <location filename="../overviewpage.cpp" line="103"/> + <source>Your current balance</source> + <translation>Din nuværende saldo</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="68"/> - <source>Unconfirmed:</source> - <translation>Ubekræftede:</translation> + <location filename="../overviewpage.cpp" line="108"/> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> + <translation>Summen af transaktioner, der endnu ikke er bekræftet, og endnu ikke er inkluderet i den nuværende saldo</translation> </message> </context> <context> <name>QRCodeDialog</name> <message> + <location filename="../forms/qrcodedialog.ui" line="144"/> + <source>Message:</source> + <translation>Besked:</translation> + </message> + <message> <location filename="../forms/qrcodedialog.ui" line="70"/> <source>Amount:</source> <translation>Beløb:</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="105"/> - <source>BTC</source> - <translation></translation> - </message> - <message> - <location filename="../forms/qrcodedialog.ui" line="121"/> - <source>Label:</source> - <translation>Etiket:</translation> - </message> - <message> - <location filename="../forms/qrcodedialog.ui" line="14"/> - <source>Dialog</source> - <translation>Dialog</translation> - </message> - <message> <location filename="../forms/qrcodedialog.ui" line="32"/> <source>QR Code</source> <translation type="unfinished"></translation> @@ -1001,9 +1008,14 @@ Adresse: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="144"/> - <source>Message:</source> - <translation>Besked:</translation> + <location filename="../forms/qrcodedialog.ui" line="105"/> + <source>BTC</source> + <translation></translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="121"/> + <source>Label:</source> + <translation>Etiket:</translation> </message> <message> <location filename="../forms/qrcodedialog.ui" line="186"/> @@ -1011,17 +1023,27 @@ Adresse: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../forms/qrcodedialog.ui" line="14"/> + <source>Dialog</source> + <translation>Dialog</translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation type="unfinished"></translation> </message> @@ -1029,6 +1051,21 @@ Adresse: %4 <context> <name>SendCoinsDialog</name> <message> + <location filename="../forms/sendcoinsdialog.ui" line="144"/> + <source>Confirm the send action</source> + <translation>Bekræft afsendelsen</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="95"/> + <source><b>%1</b> to %2 (%3)</source> + <translation><b>%1</b> til %2 (%3)</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="100"/> + <source>Confirm send coins</source> + <translation>Bekræft afsendelse af coins</translation> + </message> + <message> <location filename="../sendcoinsdialog.cpp" line="101"/> <source>Are you sure you want to send %1?</source> <translation>Er du sikker på at du vil sende %1?</translation> @@ -1039,11 +1076,6 @@ Adresse: %4 <translation> og </translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="129"/> - <source>The amount to pay must be larger than 0.</source> - <translation>Beløbet til betaling skal være større end 0.</translation> - </message> - <message> <location filename="../forms/sendcoinsdialog.ui" line="14"/> <location filename="../sendcoinsdialog.cpp" line="123"/> <location filename="../sendcoinsdialog.cpp" line="128"/> @@ -1061,6 +1093,11 @@ Adresse: %4 <translation>Send til flere modtagere på én gang</translation> </message> <message> + <location filename="../forms/sendcoinsdialog.ui" line="67"/> + <source>&Add recipient...</source> + <translation>&Tilføj modtager...</translation> + </message> + <message> <location filename="../forms/sendcoinsdialog.ui" line="84"/> <source>Remove all transaction fields</source> <translation type="unfinished"></translation> @@ -1071,21 +1108,6 @@ Adresse: %4 <translation>Ryd alle</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="147"/> - <source>S&end</source> - <translation>&Afsend</translation> - </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="100"/> - <source>Confirm send coins</source> - <translation>Bekræft afsendelse af coins</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="67"/> - <source>&Add recipient...</source> - <translation>&Tilføj modtager...</translation> - </message> - <message> <location filename="../forms/sendcoinsdialog.ui" line="106"/> <source>Balance:</source> <translation>Saldo:</translation> @@ -1096,14 +1118,9 @@ Adresse: %4 <translation>123.456 BTC</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="144"/> - <source>Confirm the send action</source> - <translation>Bekræft afsendelsen</translation> - </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="95"/> - <source><b>%1</b> to %2 (%3)</source> - <translation><b>%1</b> til %2 (%3)</translation> + <location filename="../forms/sendcoinsdialog.ui" line="147"/> + <source>S&end</source> + <translation>&Afsend</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="124"/> @@ -1111,6 +1128,11 @@ Adresse: %4 <translation>Modtagerens adresse er ikke gyldig. Tjek venligst adressen igen.</translation> </message> <message> + <location filename="../sendcoinsdialog.cpp" line="129"/> + <source>The amount to pay must be larger than 0.</source> + <translation>Beløbet til betaling skal være større end 0.</translation> + </message> + <message> <location filename="../sendcoinsdialog.cpp" line="134"/> <source>The amount exceeds your balance.</source> <translation>Beløbet overstiger din saldo.</translation> @@ -1175,11 +1197,6 @@ Adresse: %4 <translation>Vælg adresse fra adressebog</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="113"/> - <source>Alt+A</source> - <translation>Alt+A</translation> - </message> - <message> <location filename="../forms/sendcoinsentry.ui" line="120"/> <source>Paste address from clipboard</source> <translation>Indsæt adresse fra udklipsholderen</translation> @@ -1190,6 +1207,11 @@ Adresse: %4 <translation>Alt+P</translation> </message> <message> + <location filename="../forms/sendcoinsentry.ui" line="113"/> + <source>Alt+A</source> + <translation>Alt+A</translation> + </message> + <message> <location filename="../forms/sendcoinsentry.ui" line="137"/> <source>Remove this recipient</source> <translation>Fjern denne modtager</translation> @@ -1203,140 +1225,140 @@ Adresse: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="20"/> + <source>Open for %1 blocks</source> + <translation>Åben for %1 blokke</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation><b>Status:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation>, er ikke blevet transmitteret endnu</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> - <source>, broadcast through %1 node</source> - <translation>, transmitteret via %1 node</translation> + <location filename="../transactiondesc.cpp" line="59"/> + <source>, broadcast through %1 nodes</source> + <translation>, transmitteret via %1 noder</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="18"/> - <source>Open for %1 blocks</source> - <translation>Åben for %1 blokke</translation> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> + <source><b>From:</b> </source> + <translation><b>Fra:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> - <source>Open until %1</source> - <translation>Åben indtil %1</translation> + <location filename="../transactiondesc.cpp" line="96"/> + <source> (yours, label: </source> + <translation> (din, etiket:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> - <source>%1/offline?</source> - <translation>%1/offline?</translation> + <location filename="../transactiondesc.cpp" line="98"/> + <source> (yours)</source> + <translation> (din)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="28"/> - <source>%1/unconfirmed</source> - <translation>%1/ubekræftet</translation> + <location filename="../transactiondesc.cpp" line="22"/> + <source>Open until %1</source> + <translation>Åben indtil %1</translation> </message> <message> <location filename="../transactiondesc.cpp" line="30"/> - <source>%1 confirmations</source> - <translation>%1 bekræftelser</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="56"/> - <source>, broadcast through %1 nodes</source> - <translation>, transmitteret via %1 noder</translation> + <source>%1/unconfirmed</source> + <translation>%1/ubekræftet</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> - <source><b>Date:</b> </source> - <translation><b>Dato:</b> </translation> + <location filename="../transactiondesc.cpp" line="92"/> + <source>unknown</source> + <translation>ukendt</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> - <source><b>Source:</b> Generated<br></source> - <translation><b>Kilde:</b> Genereret<br></translation> + <location filename="../transactiondesc.cpp" line="135"/> + <source>(%1 matures in %2 more blocks)</source> + <translation>(%1 modnes i %2 blokke mere)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> - <source><b>From:</b> </source> - <translation><b>Fra:</b> </translation> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> + <source><b>Credit:</b> </source> + <translation><b>Kredit:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> - <source>unknown</source> - <translation>ukendt</translation> + <location filename="../transactiondesc.cpp" line="28"/> + <source>%1/offline?</source> + <translation>%1/offline?</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> - <source><b>To:</b> </source> - <translation><b>Til:</b></translation> + <location filename="../transactiondesc.cpp" line="32"/> + <source>%1 confirmations</source> + <translation>%1 bekræftelser</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> - <source> (yours, label: </source> - <translation> (din, etiket:</translation> + <location filename="../transactiondesc.cpp" line="57"/> + <source>, broadcast through %1 node</source> + <translation>, transmitteret via %1 node</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> - <source> (yours)</source> - <translation> (din)</translation> + <location filename="../transactiondesc.cpp" line="63"/> + <source><b>Date:</b> </source> + <translation><b>Dato:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> - <source><b>Credit:</b> </source> - <translation><b>Kredit:</b> </translation> + <location filename="../transactiondesc.cpp" line="70"/> + <source><b>Source:</b> Generated<br></source> + <translation><b>Kilde:</b> Genereret<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> - <source>(%1 matures in %2 more blocks)</source> - <translation>(%1 modnes i %2 blokke mere)</translation> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> + <source><b>To:</b> </source> + <translation><b>Til:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation>(ikke accepteret)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation><b>Debet:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation><b>Transaktionsgebyr:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>Nettobeløb:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>Besked:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>Kommentar:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation>Genererede coins skal vente 120 blokke, før de kan blive brugt. Da du genererede denne blok blev det transmitteret til netværket, for at blive føjet til blokkæden. Hvis det mislykkes at komme ind i kæden, vil den skifte til "ikke godkendt", og ikke blive kunne bruges. Dette kan lejlighedsvis ske, hvis en anden node genererer en blok inden for få sekunder af din.</translation> </message> @@ -1357,11 +1379,34 @@ Adresse: %4 <context> <name>TransactionTableModel</name> <message> + <location filename="../transactiontablemodel.cpp" line="358"/> + <source>Mined</source> + <translation>Minerede</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Amount</source> + <translation>Beløb</translation> + </message> + <message numerus="yes"> + <location filename="../transactiontablemodel.cpp" line="277"/> + <source>Open for %n block(s)</source> + <translation> + <numerusform>Åben for %n blok(ke)</numerusform> + <numerusform>Åben for %n blok(ke)</numerusform> + </translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="280"/> <source>Open until %1</source> <translation>Åben indtil %1</translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Address</source> + <translation>Adresse</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="283"/> <source>Offline (%1 confirmations)</source> <translation>Offline (%1 bekræftelser)</translation> @@ -1372,11 +1417,6 @@ Adresse: %4 <translation>Betaling til dig selv</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="358"/> - <source>Mined</source> - <translation>Minerede</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="289"/> <source>Confirmed (%1 confirmations)</source> <translation>Bekræftet (%1 bekræftelser)</translation> @@ -1433,26 +1473,13 @@ Adresse: %4 </message> <message> <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Amount</source> - <translation>Beløb</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> <source>Date</source> <translation>Dato</translation> </message> - <message numerus="yes"> - <location filename="../transactiontablemodel.cpp" line="277"/> - <source>Open for %n block(s)</source> - <translation> - <numerusform>Åben for %n blok(ke)</numerusform> - <numerusform>Åben for %n blok(ke)</numerusform> - </translation> - </message> <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Address</source> - <translation>Adresse</translation> + <location filename="../transactiontablemodel.cpp" line="286"/> + <source>Unconfirmed (%1 of %2 confirmations)</source> + <translation>Ubekræftet (%1 af %2 bekræftelser)</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="214"/> @@ -1460,9 +1487,9 @@ Adresse: %4 <translation>Type</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="286"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Ubekræftet (%1 af %2 bekræftelser)</translation> + <location filename="../transactiontablemodel.cpp" line="351"/> + <source>Received from</source> + <translation>Modtaget fra</translation> </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="297"/> @@ -1472,28 +1499,38 @@ Adresse: %4 <numerusform>Minerede balance vil være tilgængelig om %n blok(ke)</numerusform> </translation> </message> - <message> - <location filename="../transactiontablemodel.cpp" line="351"/> - <source>Received from</source> - <translation>Modtaget fra</translation> - </message> </context> <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="72"/> - <source>Received with</source> - <translation>Modtaget med</translation> + <location filename="../transactionview.cpp" line="78"/> + <source>Other</source> + <translation>Andet</translation> </message> <message> - <location filename="../transactionview.cpp" line="90"/> - <source>Min amount</source> - <translation>Min. beløb</translation> + <location filename="../transactionview.cpp" line="124"/> + <source>Copy address</source> + <translation>Kopier adresse</translation> </message> <message> - <location filename="../transactionview.cpp" line="283"/> - <source>Address</source> - <translation>Adresse</translation> + <location filename="../transactionview.cpp" line="125"/> + <source>Copy label</source> + <translation>Kopier etiket</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="126"/> + <source>Copy amount</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactionview.cpp" line="279"/> + <source>Confirmed</source> + <translation>Bekræftet</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="281"/> + <source>Type</source> + <translation>Type</translation> </message> <message> <location filename="../transactionview.cpp" line="282"/> @@ -1501,15 +1538,30 @@ Adresse: %4 <translation>Etiket</translation> </message> <message> + <location filename="../transactionview.cpp" line="289"/> + <source>Error exporting</source> + <translation>Fejl under eksport</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="384"/> + <source>Range:</source> + <translation>Interval:</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="284"/> + <source>Amount</source> + <translation>Beløb</translation> + </message> + <message> <location filename="../transactionview.cpp" line="55"/> <location filename="../transactionview.cpp" line="71"/> <source>All</source> <translation>Alle</translation> </message> <message> - <location filename="../transactionview.cpp" line="56"/> - <source>Today</source> - <translation>I dag</translation> + <location filename="../transactionview.cpp" line="61"/> + <source>Range...</source> + <translation>Interval...</translation> </message> <message> <location filename="../transactionview.cpp" line="57"/> @@ -1517,11 +1569,6 @@ Adresse: %4 <translation>Denne uge</translation> </message> <message> - <location filename="../transactionview.cpp" line="61"/> - <source>Range...</source> - <translation>Interval...</translation> - </message> - <message> <location filename="../transactionview.cpp" line="58"/> <source>This month</source> <translation>Denne måned</translation> @@ -1537,34 +1584,14 @@ Adresse: %4 <translation>Dette år</translation> </message> <message> - <location filename="../transactionview.cpp" line="84"/> - <source>Enter address or label to search</source> - <translation>Indtast adresse eller etiket for at søge</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="126"/> - <source>Copy amount</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../transactionview.cpp" line="270"/> - <source>Export Transaction Data</source> - <translation>Eksportér Transaktionsdata</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="271"/> - <source>Comma separated file (*.csv)</source> - <translation>Kommasepareret fil (*.csv)</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="280"/> - <source>Date</source> - <translation>Dato</translation> + <location filename="../transactionview.cpp" line="72"/> + <source>Received with</source> + <translation>Modtaget med</translation> </message> <message> - <location filename="../transactionview.cpp" line="279"/> - <source>Confirmed</source> - <translation>Bekræftet</translation> + <location filename="../transactionview.cpp" line="74"/> + <source>Sent to</source> + <translation>Sendt til</translation> </message> <message> <location filename="../transactionview.cpp" line="76"/> @@ -1582,44 +1609,49 @@ Adresse: %4 <translation>Minerede</translation> </message> <message> - <location filename="../transactionview.cpp" line="384"/> - <source>Range:</source> - <translation>Interval:</translation> + <location filename="../transactionview.cpp" line="84"/> + <source>Enter address or label to search</source> + <translation>Indtast adresse eller etiket for at søge</translation> </message> <message> - <location filename="../transactionview.cpp" line="125"/> - <source>Copy label</source> - <translation>Kopier etiket</translation> + <location filename="../transactionview.cpp" line="270"/> + <source>Export Transaction Data</source> + <translation>Eksportér Transaktionsdata</translation> </message> <message> - <location filename="../transactionview.cpp" line="127"/> - <source>Edit label</source> - <translation>Rediger etiket</translation> + <location filename="../transactionview.cpp" line="271"/> + <source>Comma separated file (*.csv)</source> + <translation>Kommasepareret fil (*.csv)</translation> </message> <message> - <location filename="../transactionview.cpp" line="281"/> - <source>Type</source> - <translation>Type</translation> + <location filename="../transactionview.cpp" line="283"/> + <source>Address</source> + <translation>Adresse</translation> </message> <message> - <location filename="../transactionview.cpp" line="289"/> - <source>Error exporting</source> - <translation>Fejl under eksport</translation> + <location filename="../transactionview.cpp" line="285"/> + <source>ID</source> + <translation>ID</translation> </message> <message> - <location filename="../transactionview.cpp" line="74"/> - <source>Sent to</source> - <translation>Sendt til</translation> + <location filename="../transactionview.cpp" line="392"/> + <source>to</source> + <translation>til</translation> </message> <message> - <location filename="../transactionview.cpp" line="78"/> - <source>Other</source> - <translation>Andet</translation> + <location filename="../transactionview.cpp" line="56"/> + <source>Today</source> + <translation>I dag</translation> </message> <message> - <location filename="../transactionview.cpp" line="124"/> - <source>Copy address</source> - <translation>Kopier adresse</translation> + <location filename="../transactionview.cpp" line="90"/> + <source>Min amount</source> + <translation>Min. beløb</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="127"/> + <source>Edit label</source> + <translation>Rediger etiket</translation> </message> <message> <location filename="../transactionview.cpp" line="128"/> @@ -1627,25 +1659,15 @@ Adresse: %4 <translation>Vis detaljer...</translation> </message> <message> - <location filename="../transactionview.cpp" line="284"/> - <source>Amount</source> - <translation>Beløb</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="285"/> - <source>ID</source> - <translation>ID</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="392"/> - <source>to</source> - <translation>til</translation> + <location filename="../transactionview.cpp" line="280"/> + <source>Date</source> + <translation>Dato</translation> </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>Sender...</translation> </message> @@ -1653,430 +1675,514 @@ Adresse: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Usage:</source> - <translation>Anvendelse:</translation> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>Kan låse data-biblioteket %s. Bitcoin kører sikkert allerede.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> - <source>Done loading</source> - <translation>Indlæsning gennemført</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="8"/> + <location filename="../bitcoinstrings.cpp" line="41"/> <source>Bitcoin version</source> <translation>Bitcoinversion</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> + <location filename="../bitcoinstrings.cpp" line="113"/> <source>Loading addresses...</source> <translation>Indlæser adresser...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> + <location filename="../bitcoinstrings.cpp" line="115"/> <source>Loading block index...</source> <translation>Indlæser blok-indeks...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> - <source>Loading wallet...</source> - <translation>Indlæser tegnebog...</translation> + <location filename="../bitcoinstrings.cpp" line="132"/> + <source>Error: CreateThread(StartNode) failed</source> + <translation>Fejl: CreateThread(StartNode) mislykkedes</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> + <location filename="../bitcoinstrings.cpp" line="38"/> <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> <translation>Advarsel: Undersøg venligst at din computers dato og klokkeslet er korrekt indstillet. Hvis der er fejl i disse vil Bitcoin ikke fungere korrekt.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation>Ugyldig -proxy adresse</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> - <translation>Advarsel: Diskplads er lav</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="87"/> - <source>Rescanning...</source> - <translation>Genindlæser...</translation> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Error loading blkindex.dat</source> + <translation>Fejl ved indlæsning af blkindex.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> + <location filename="../bitcoinstrings.cpp" line="129"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation>Advarsel:-paytxfee er sat meget højt. Dette er det gebyr du vil betale, hvis du sender en transaktion.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> - <source>Invalid amount for -paytxfee=<amount></source> - <translation>Ugyldigt beløb for -paytxfee=<amount></translation> + <location filename="../bitcoinstrings.cpp" line="118"/> + <source>Error loading wallet.dat: Wallet corrupted</source> + <translation>Fejl ved indlæsning af wallet.dat: Tegnebog ødelagt</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> - <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> - <translation>Kunne ikke binde sig til port %d på denne computer. Bitcoin kører sikkert allerede.</translation> + <location filename="../bitcoinstrings.cpp" line="119"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> + <translation>Fejl ved indlæsning af wallet.dat: Tegnebog kræver en nyere version af Bitcoin</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>Error loading wallet.dat</source> + <translation>Fejl ved indlæsning af wallet.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> + <location filename="../bitcoinstrings.cpp" line="43"/> <source>Send command to -server or bitcoind</source> <translation>Send kommando til -server eller bitcoind </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> + <location filename="../bitcoinstrings.cpp" line="44"/> <source>List commands</source> <translation>Liste over kommandoer </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> + <location filename="../bitcoinstrings.cpp" line="46"/> <source>Options:</source> <translation>Indstillinger: </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> + <location filename="../bitcoinstrings.cpp" line="47"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Angiv konfigurationsfil (standard: bitcoin.conf) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> + <location filename="../bitcoinstrings.cpp" line="53"/> <source>Specify data directory</source> <translation>Angiv databibliotek </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>Angiv pid-fil (default: bitcoind.pid) -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="16"/> + <location filename="../bitcoinstrings.cpp" line="49"/> <source>Generate coins</source> <translation>Generér coins </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> + <location filename="../bitcoinstrings.cpp" line="50"/> <source>Don't generate coins</source> <translation>Generér ikke coins </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Angiv tilslutningstimeout (i millisekunder) + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>Username for JSON-RPC connections</source> + <translation>Brugernavn til JSON-RPC-forbindelser </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Allow JSON-RPC connections from specified IP address</source> - <translation>Tillad JSON-RPC-forbindelser fra bestemt IP-adresse + <location filename="../bitcoinstrings.cpp" line="78"/> + <source>Accept command line and JSON-RPC commands</source> + <translation>Accepter kommandolinje- og JSON-RPC-kommandoer </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>Send kommandoer til node, der kører på <ip> (standard: 127.0.0.1) -</translation> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> - <source>Username for JSON-RPC connections</source> - <translation>Brugernavn til JSON-RPC-forbindelser + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">Fejl: Oprettelse af transaktionen mislykkedes.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">Fejl: Transaktionen blev afvist. Dette kan ske hvis nogle af dine coins i din tegnebog allerede var brugt, som hvis du brugte en kopi af wallet.dat og dine coins er blevet brugt i kopien, men ikke er markeret som brugt her.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="79"/> + <source>Run in the background as a daemon and accept commands</source> + <translation>Kør i baggrunden som en service, og acceptér kommandoer </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> + <location filename="../bitcoinstrings.cpp" line="81"/> + <source>Output extra debugging information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Prepend debug output with timestamp</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="83"/> + <source>Send trace/debug info to console instead of debug.log file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="84"/> + <source>Send trace/debug info to debugger</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="90"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Upgrade wallet to latest format</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source>How many blocks to check at startup (default: 2500, 0 = all)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>How thorough the block verification is (0-6, default: 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="101"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Brug OpenSSL (https) for JSON-RPC-forbindelser </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> + <location filename="../bitcoinstrings.cpp" line="103"/> <source>Server private key (default: server.pem)</source> <translation>Server private nøgle (standard: server.pem) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> + <location filename="../bitcoinstrings.cpp" line="104"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Acceptabele ciphers (standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> + <location filename="../bitcoinstrings.cpp" line="107"/> <source>This help message</source> <translation>Denne hjælpebesked </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> + <location filename="../bitcoinstrings.cpp" line="51"/> <source>Start minimized</source> <translation>Start minimeret </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="52"/> <source>Show splash screen on startup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> + <location filename="../bitcoinstrings.cpp" line="54"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="57"/> <source>Connect through socks4 proxy</source> <translation>Tilslut via SOCKS4 proxy </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> + <location filename="../bitcoinstrings.cpp" line="58"/> <source>Allow DNS lookups for addnode and connect</source> <translation>Tillad DNS-opslag for addnode og connect </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> + <location filename="../bitcoinstrings.cpp" line="60"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> + <location filename="../bitcoinstrings.cpp" line="61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Tilføj en node til at forbinde til and attempt to keep the connection open</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> + <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation>Tilslut kun til den angivne node </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> + <location filename="../bitcoinstrings.cpp" line="63"/> <source>Find peers using internet relay chat (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation type="unfinished">Acceptér forbindelser udefra</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> + <location filename="../bitcoinstrings.cpp" line="65"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> + <location filename="../bitcoinstrings.cpp" line="66"/> <source>Find peers using DNS lookup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> + <location filename="../bitcoinstrings.cpp" line="67"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> + <location filename="../bitcoinstrings.cpp" line="68"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> <source>Fee per KB to add to transactions you send</source> <translation>Gebyr pr. kB, som skal tilføjes til transaktioner du sender</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> - <source>Output extra debugging information</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="73"/> + <source>Use Universal Plug and Play to map the listening port (default: 1)</source> + <translation type="unfinished">Forsøg at bruge UPnP til at kofnigurere den lyttende port (standard: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> - <source>Prepend debug output with timestamp</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="74"/> + <source>Use Universal Plug and Play to map the listening port (default: 0)</source> + <translation type="unfinished">Forsøg at bruge UPnP til at kofnigurere den lyttende port (standard: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="98"/> + <source> +SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation> +SSL-indstillinger: (se Bitcoin Wiki for SSL opsætningsinstruktioner)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Send trace/debug info to debugger</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="42"/> + <source>Usage:</source> + <translation>Anvendelse:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>Done loading</source> + <translation>Indlæsning gennemført</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> - <source>Upgrade wallet to latest format</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Warning: Disk space is low</source> + <translation>Advarsel: Diskplads er lav</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> - <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Loading wallet...</source> + <translation>Indlæser tegnebog...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> - <source>How thorough the block verification is (0-6, default: 1)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="128"/> + <source>Invalid amount for -paytxfee=<amount></source> + <translation>Ugyldigt beløb for -paytxfee=<amount></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> - <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation> -SSL-indstillinger: (se Bitcoin Wiki for SSL opsætningsinstruktioner)</translation> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Sender...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>Du har ikke penge nok</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation type="unfinished">Anvendelse</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="120"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> + <location filename="../bitcoinstrings.cpp" line="123"/> <source>Cannot initialize keypool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> + <location filename="../bitcoinstrings.cpp" line="124"/> <source>Cannot write default address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> - <source>Error: CreateThread(StartNode) failed</source> - <translation>Fejl: CreateThread(StartNode) mislykkedes</translation> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source>Rescanning...</source> + <translation>Genindlæser...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> - <source>Error loading blkindex.dat</source> - <translation>Fejl ved indlæsning af blkindex.dat</translation> + <location filename="../bitcoinstrings.cpp" line="133"/> + <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> + <translation>Kunne ikke binde sig til port %d på denne computer. Bitcoin kører sikkert allerede.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>beta</translation> + <location filename="../bitcoinstrings.cpp" line="114"/> + <source>Error loading addr.dat</source> + <translation>Fejl ved indlæsning af addr.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> + <location filename="../bitcoinstrings.cpp" line="45"/> <source>Get help for a command</source> <translation>Få hjælp til en kommando </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation>Lyt til forbindelser på <port> (standard: 8333 or testnet: 18333)</translation> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Use Universal Plug and Play to map the listening port (default: 1)</source> - <translation type="unfinished">Forsøg at bruge UPnP til at kofnigurere den lyttende port (standard: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>Angiv pid-fil (default: bitcoind.pid) +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Use Universal Plug and Play to map the listening port (default: 0)</source> - <translation type="unfinished">Forsøg at bruge UPnP til at kofnigurere den lyttende port (standard: 0)</translation> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>Ugyldigt beløb</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> - <source>Accept command line and JSON-RPC commands</source> - <translation>Accepter kommandolinje- og JSON-RPC-kommandoer + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Specify connection timeout (in milliseconds)</source> + <translation>Angiv tilslutningstimeout (i millisekunder) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> - <source>Run in the background as a daemon and accept commands</source> - <translation>Kør i baggrunden som en service, og acceptér kommandoer -</translation> + <location filename="../bitcoinstrings.cpp" line="59"/> + <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> + <translation>Lyt til forbindelser på <port> (standard: 8333 or testnet: 18333)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> + <location filename="../bitcoinstrings.cpp" line="80"/> <source>Use the test network</source> <translation>Brug test-netværket </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> + <location filename="../bitcoinstrings.cpp" line="86"/> <source>Password for JSON-RPC connections</source> <translation>Password til JSON-RPC-forbindelser </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> + <location filename="../bitcoinstrings.cpp" line="87"/> <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation>Lyt til JSON-RPC-forbindelser på <port> (standard: 8332) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> + <location filename="../bitcoinstrings.cpp" line="88"/> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation>Tillad JSON-RPC-forbindelser fra bestemt IP-adresse +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>Send kommandoer til node, der kører på <ip> (standard: 127.0.0.1) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="94"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Sæt nøglepoolstørrelse til <n> (standard: 100) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> + <location filename="../bitcoinstrings.cpp" line="95"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>Gennemsøg blokkæden for manglende tegnebogstransaktioner </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> + <location filename="../bitcoinstrings.cpp" line="102"/> <source>Server certificate file (default: server.cert)</source> <translation>Servercertifikat-fil (standard: server.cert) </translation> </message> - <message> - <location filename="../bitcoinstrings.cpp" line="76"/> - <source>Error loading addr.dat</source> - <translation>Fejl ved indlæsning af addr.dat</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="80"/> - <source>Error loading wallet.dat: Wallet corrupted</source> - <translation>Fejl ved indlæsning af wallet.dat: Tegnebog ødelagt</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="81"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation>Fejl ved indlæsning af wallet.dat: Tegnebog kræver en nyere version af Bitcoin</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="83"/> - <source>Error loading wallet.dat</source> - <translation>Fejl ved indlæsning af wallet.dat</translation> - </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts index 814be52617..a135d93147 100644 --- a/src/qt/locale/bitcoin_de.ts +++ b/src/qt/locale/bitcoin_de.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> Version</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -75,16 +75,6 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open <translation>&QR-Code anzeigen</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="99"/> - <source>Sign &Message</source> - <translation>&Nachricht signieren...</translation> - </message> - <message> - <location filename="../forms/addressbookpage.ui" line="110"/> - <source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source> - <translation>Die ausgewählte Adresse aus der Liste entfernen. Sie können nur Zahlungsadressen entfernen.</translation> - </message> - <message> <location filename="../forms/addressbookpage.ui" line="113"/> <source>&Delete</source> <translation>&Löschen</translation> @@ -95,54 +85,59 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open <translation>Eine Nachricht signieren, um den Besitz einer Adresse zu beweisen</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> - <source>Export Address Book Data</source> - <translation>Adressbuch exportieren</translation> + <location filename="../forms/addressbookpage.ui" line="99"/> + <source>Sign &Message</source> + <translation>&Nachricht signieren...</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> - <source>Error exporting</source> - <translation>Fehler beim Exportieren</translation> + <location filename="../forms/addressbookpage.ui" line="110"/> + <source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source> + <translation>Die ausgewählte Adresse aus der Liste entfernen. Sie können nur Zahlungsadressen entfernen.</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation>Bezeichnung kopieren</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="68"/> + <source>Delete</source> + <translation>Löschen</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="286"/> + <source>Comma separated file (*.csv)</source> + <translation>Kommagetrennte Datei (*.csv)</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="299"/> + <source>Could not write to file %1.</source> + <translation>Konnte nicht in Datei %1 schreiben.</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>Adresse kopieren</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation>Bearbeiten</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> - <source>Delete</source> - <translation>Löschen</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="292"/> - <source>Could not write to file %1.</source> - <translation>Konnte nicht in Datei %1 schreiben.</translation> + <location filename="../addressbookpage.cpp" line="285"/> + <source>Export Address Book Data</source> + <translation>Adressbuch exportieren</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> - <source>Comma separated file (*.csv)</source> - <translation>Kommagetrennte Datei (*.csv)</translation> + <location filename="../addressbookpage.cpp" line="299"/> + <source>Error exporting</source> + <translation>Fehler beim Exportieren</translation> </message> </context> <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="78"/> - <source>Label</source> - <translation>Bezeichnung</translation> - </message> - <message> <location filename="../addresstablemodel.cpp" line="114"/> <source>(no label)</source> <translation>(keine Bezeichnung)</translation> @@ -152,23 +147,23 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open <source>Address</source> <translation>Adresse</translation> </message> + <message> + <location filename="../addresstablemodel.cpp" line="78"/> + <source>Label</source> + <translation>Bezeichnung</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> <message> - <location filename="../askpassphrasedialog.cpp" line="127"/> - <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>Die Verschlüsselung der Brieftasche ist aufgrund eines internen Fehlers fehlgeschlagen. Ihre Brieftasche wurde nicht verschlüsselt.</translation> - </message> - <message> - <location filename="../forms/askpassphrasedialog.ui" line="47"/> - <source>Enter passphrase</source> - <translation>Passphrase eingeben</translation> + <location filename="../askpassphrasedialog.cpp" line="38"/> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Dieser Vorgang benötigt Ihre Passphrase um die Brieftasche zu entsperren.</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="61"/> - <source>New passphrase</source> - <translation>Neue Passphrase</translation> + <location filename="../forms/askpassphrasedialog.ui" line="94"/> + <source>TextLabel</source> + <translation>Textbezeichnung</translation> </message> <message> <location filename="../forms/askpassphrasedialog.ui" line="75"/> @@ -176,19 +171,24 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open <translation>Neue Passphrase wiederholen</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="94"/> - <source>TextLabel</source> - <translation>Textbezeichnung</translation> + <location filename="../askpassphrasedialog.cpp" line="170"/> + <source>Wallet passphrase was successfully changed.</source> + <translation>Die Passphrase der Brieftasche wurde erfolgreich geändert.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="156"/> - <source>Wallet decryption failed</source> - <translation>Entschlüsselung der Brieftasche fehlgeschlagen</translation> + <location filename="../askpassphrasedialog.cpp" line="46"/> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Dieser Vorgang benötigt Ihre Passphrase um die Brieftasche zu entschlüsseln.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="43"/> - <source>Unlock wallet</source> - <translation>Brieftasche entsperren</translation> + <location filename="../askpassphrasedialog.cpp" line="35"/> + <source>Encrypt wallet</source> + <translation>Brieftasche verschlüsseln</translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="61"/> + <source>New passphrase</source> + <translation>Neue Passphrase</translation> </message> <message> <location filename="../forms/askpassphrasedialog.ui" line="26"/> @@ -196,6 +196,22 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open <translation>Dialog</translation> </message> <message> + <location filename="../askpassphrasedialog.cpp" line="111"/> + <location filename="../askpassphrasedialog.cpp" line="169"/> + <source>Wallet encrypted</source> + <translation>Brieftasche verschlüsselt</translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="47"/> + <source>Enter passphrase</source> + <translation>Passphrase eingeben</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="43"/> + <source>Unlock wallet</source> + <translation>Brieftasche entsperren</translation> + </message> + <message> <location filename="../askpassphrasedialog.cpp" line="51"/> <source>Decrypt wallet</source> <translation>Brieftasche entschlüsseln</translation> @@ -211,9 +227,15 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open <translation>Geben Sie die alte und die neue Passphrase der Brieftasche ein.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="101"/> - <source>Confirm wallet encryption</source> - <translation>Verschlüsselung der Brieftasche bestätigen</translation> + <location filename="../askpassphrasedialog.cpp" line="102"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! +Are you sure you wish to encrypt your wallet?</source> + <translation>WARNUNG: Wenn Sie Ihre Brieftasche verschlüsseln und Ihre Passphrase verlieren, werden Sie <b>ALLE IHRE BITCOINS VERLIEREN</b>!<br><br>Sind Sie sich sicher, dass Sie Ihre Brieftasche verschlüsseln möchten?</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="113"/> + <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>Bitcoin wird jetzt beendet, um den Verschlüsselungsprozess abzuschließen. Bitte beachten Sie, dass die Verschlüsselung Ihrer Brieftasche nicht vollständig vor Diebstahl Ihrer Bitcoins durch Schadsoftware schützt, die Ihren Computer befällt.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="117"/> @@ -221,36 +243,9 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open <translation>WICHTIG: Alle vorherigen Sicherungen Ihrer Brieftasche sollten durch die neu erzeugte, verschlüsselte Brieftasche ersetzt werden. Aus Sicherheitsgründen werden vorherige Sicherungen der unverschlüsselten Brieftasche nutzlos, sobald Sie die neue, verschlüsselte Brieftasche verwenden.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="126"/> - <location filename="../askpassphrasedialog.cpp" line="133"/> - <location filename="../askpassphrasedialog.cpp" line="175"/> - <location filename="../askpassphrasedialog.cpp" line="181"/> - <source>Wallet encryption failed</source> - <translation>Verschlüsselung der Brieftasche fehlgeschlagen</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="134"/> - <location filename="../askpassphrasedialog.cpp" line="182"/> - <source>The supplied passphrases do not match.</source> - <translation>Die eingegebenen Passphrasen stimmen nicht überein.</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="146"/> - <location filename="../askpassphrasedialog.cpp" line="157"/> - <location filename="../askpassphrasedialog.cpp" line="176"/> - <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation>Die eingegebene Passphrase zum Entschlüsseln der Brieftasche war nicht korrekt.</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="111"/> - <location filename="../askpassphrasedialog.cpp" line="169"/> - <source>Wallet encrypted</source> - <translation>Brieftasche verschlüsselt</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="170"/> - <source>Wallet passphrase was successfully changed.</source> - <translation>Die Passphrase der Brieftasche wurde erfolgreich geändert.</translation> + <location filename="../askpassphrasedialog.cpp" line="127"/> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Die Verschlüsselung der Brieftasche ist aufgrund eines internen Fehlers fehlgeschlagen. Ihre Brieftasche wurde nicht verschlüsselt.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="217"/> @@ -259,25 +254,28 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open <translation>Warnung: Die Feststelltaste ist aktiviert.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="46"/> - <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>Dieser Vorgang benötigt Ihre Passphrase um die Brieftasche zu entschlüsseln.</translation> + <location filename="../askpassphrasedialog.cpp" line="34"/> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>Geben Sie die neue Passphrase für die Brieftasche ein.<br>Bitte benutzen Sie eine Passphrase bestehend aus <b>10 oder mehr zufälligen Zeichen</b> oder <b>8 oder mehr Wörtern</b>.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="38"/> - <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>Dieser Vorgang benötigt Ihre Passphrase um die Brieftasche zu entsperren.</translation> + <location filename="../askpassphrasedialog.cpp" line="134"/> + <location filename="../askpassphrasedialog.cpp" line="182"/> + <source>The supplied passphrases do not match.</source> + <translation>Die eingegebenen Passphrasen stimmen nicht überein.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="102"/> - <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! -Are you sure you wish to encrypt your wallet?</source> - <translation>WARNUNG: Wenn Sie Ihre Brieftasche verschlüsseln und Ihre Passphrase verlieren, werden Sie <b>ALLE IHRE BITCOINS VERLIEREN</b>!<br><br>Sind Sie sich sicher, dass Sie Ihre Brieftasche verschlüsseln möchten?</translation> + <location filename="../askpassphrasedialog.cpp" line="126"/> + <location filename="../askpassphrasedialog.cpp" line="133"/> + <location filename="../askpassphrasedialog.cpp" line="175"/> + <location filename="../askpassphrasedialog.cpp" line="181"/> + <source>Wallet encryption failed</source> + <translation>Verschlüsselung der Brieftasche fehlgeschlagen</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="113"/> - <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> - <translation>Bitcoin wird jetzt beendet, um den Verschlüsselungsprozess abzuschließen. Bitte beachten Sie, dass die Verschlüsselung Ihrer Brieftasche nicht vollständig vor Diebstahl Ihrer Bitcoins durch Schadsoftware schützt, die Ihren Computer befällt.</translation> + <location filename="../askpassphrasedialog.cpp" line="101"/> + <source>Confirm wallet encryption</source> + <translation>Verschlüsselung der Brieftasche bestätigen</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="145"/> @@ -285,225 +283,187 @@ Are you sure you wish to encrypt your wallet?</source> <translation>Entsperrung der Brieftasche fehlgeschlagen</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="34"/> - <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>Geben Sie die neue Passphrase für die Brieftasche ein.<br>Bitte benutzen Sie eine Passphrase bestehend aus <b>10 oder mehr zufälligen Zeichen</b> oder <b>8 oder mehr Wörtern</b>.</translation> + <location filename="../askpassphrasedialog.cpp" line="146"/> + <location filename="../askpassphrasedialog.cpp" line="157"/> + <location filename="../askpassphrasedialog.cpp" line="176"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Die eingegebene Passphrase zum Entschlüsseln der Brieftasche war nicht korrekt.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="35"/> - <source>Encrypt wallet</source> - <translation>Brieftasche verschlüsseln</translation> + <location filename="../askpassphrasedialog.cpp" line="156"/> + <source>Wallet decryption failed</source> + <translation>Entschlüsselung der Brieftasche fehlgeschlagen</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="194"/> - <source>Browse transaction history</source> - <translation>Transaktionsverlauf durchsehen</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="205"/> - <source>&Receive coins</source> - <translation>Bitcoins &empfangen</translation> + <location filename="../bitcoingui.cpp" line="185"/> + <source>&Overview</source> + <translation>&Übersicht</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> - <source>&Options...</source> - <translation>&Erweiterte Einstellungen...</translation> + <location filename="../bitcoingui.cpp" line="191"/> + <source>&Transactions</source> + <translation>&Transaktionen</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> - <source>&File</source> - <translation>&Datei</translation> + <location filename="../bitcoingui.cpp" line="192"/> + <source>Browse transaction history</source> + <translation>Transaktionsverlauf durchsehen</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> - <source>&Settings</source> - <translation>&Einstellungen</translation> + <location filename="../bitcoingui.cpp" line="197"/> + <source>&Address Book</source> + <translation>&Adressbuch</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> - <source>&Transactions</source> - <translation>&Transaktionen</translation> + <location filename="../bitcoingui.cpp" line="204"/> + <source>Show the list of addresses for receiving payments</source> + <translation>Liste der Empfangsadressen anzeigen</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="187"/> - <source>&Overview</source> - <translation>&Übersicht</translation> + <location filename="../bitcoingui.cpp" line="203"/> + <source>&Receive coins</source> + <translation>Bitcoins &empfangen</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> + <location filename="../bitcoingui.cpp" line="235"/> <source>E&xit</source> <translation>&Beenden</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> + <location filename="../bitcoingui.cpp" line="242"/> <source>About &Qt</source> <translation>Über &Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> - <source>Change the passphrase used for wallet encryption</source> - <translation>Ändert die Passphrase, die für die Verschlüsselung der Brieftasche benutzt wird</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="211"/> + <location filename="../bitcoingui.cpp" line="209"/> <source>&Send coins</source> <translation>Bitcoins &überweisen</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> + <location filename="../bitcoingui.cpp" line="255"/> + <source>&Backup Wallet</source> + <translation>Brieftasche &sichern...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="236"/> <source>Quit application</source> <translation>Anwendung beenden</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> + <location filename="../bitcoingui.cpp" line="240"/> <source>Show information about Bitcoin</source> <translation>Informationen über Bitcoin anzeigen</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> + <location filename="../bitcoingui.cpp" line="243"/> <source>Show information about Qt</source> <translation>Informationen über Qt anzeigen</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> - <translation>&Exportieren...</translation> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Send coins to a bitcoin address</source> + <translation>Bitcoins an eine Bitcoin-Adresse überweisen</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> - <source>Export the data in the current tab to a file</source> - <translation>Daten der aktuellen Ansicht in eine Datei exportieren</translation> + <location filename="../bitcoingui.cpp" line="636"/> + <source>Sending...</source> + <translation>Transaktionsgebühr bestätigen</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> - <source>Backup wallet to another location</source> - <translation>Eine Sicherungskopie der Brieftasche erstellen und abspeichern</translation> + <location filename="../bitcoingui.cpp" line="245"/> + <source>&Options...</source> + <translation>&Erweiterte Einstellungen...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> - <source>Show general overview of wallet</source> - <translation>Allgemeine Übersicht der Brieftasche anzeigen</translation> + <location filename="../bitcoingui.cpp" line="250"/> + <source>&Export...</source> + <translation>&Exportieren...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="255"/> - <source>Encrypt or decrypt wallet</source> - <translation>Brieftasche ent- oder verschlüsseln</translation> + <location filename="../bitcoingui.cpp" line="251"/> + <source>Export the data in the current tab to a file</source> + <translation>Daten der aktuellen Ansicht in eine Datei exportieren</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> - <source>Send coins to a bitcoin address</source> - <translation>Bitcoins an eine Bitcoin-Adresse überweisen</translation> + <location filename="../bitcoingui.cpp" line="303"/> + <source>Tabs toolbar</source> + <translation>Registerkartenleiste</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> - <source>Edit the list of stored addresses and labels</source> - <translation>Liste der gespeicherten Zahlungsadressen und Bezeichnungen bearbeiten</translation> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation>Zeige/Verstecke &Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="73"/> - <source>Bitcoin Wallet</source> - <translation>Bitcoin-Brieftasche</translation> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation>Zeige oder verstecke das Bitcoin Fenster</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> - <source>&Address Book</source> - <translation>&Adressbuch</translation> + <location filename="../bitcoingui.cpp" line="281"/> + <source>&File</source> + <translation>&Datei</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> - <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="253"/> + <source>Encrypt or decrypt wallet</source> + <translation>Brieftasche ent- oder verschlüsseln</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> - <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation>Brieftasche ist <b>verschlüsselt</b> und aktuell <b>entsperrt</b></translation> + <location filename="../bitcoingui.cpp" line="71"/> + <source>Bitcoin Wallet</source> + <translation>Bitcoin-Brieftasche</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> - <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation>Brieftasche ist <b>verschlüsselt</b> und aktuell <b>gesperrt</b></translation> + <location filename="../bitcoingui.cpp" line="186"/> + <source>Show general overview of wallet</source> + <translation>Allgemeine Übersicht der Brieftasche anzeigen</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Backup Wallet</source> - <translation>Brieftasche sichern</translation> + <location filename="../bitcoingui.cpp" line="296"/> + <source>&Help</source> + <translation>&Hilfe</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Wallet Data (*.dat)</source> - <translation>Brieftaschendaten (*.dat)</translation> + <location filename="../bitcoingui.cpp" line="632"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation>Sicherung der Brieftasche fehlgeschlagen</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation>Fehler beim Abspeichern der Sicherungskopie der Brieftasche.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> - <source>Tabs toolbar</source> - <translation>Registerkartenleiste</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>&Über %1</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Synchronisation der Blockkette wird durchgeführt</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="206"/> - <source>Show the list of addresses for receiving payments</source> - <translation>Liste der Empfangsadressen anzeigen</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="217"/> - <source>Sign &message</source> - <translation>&Nachricht signieren...</translation> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation>Bitcoin Client</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> + <location filename="../bitcoingui.cpp" line="216"/> <source>Prove you control an address</source> <translation>Beweisen Sie die Kontrolle einer Adresse</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>Erweiterte Bitcoin-Einstellungen ändern</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>&Bitcoin öffnen</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="257"/> - <source>&Backup Wallet</source> - <translation>Brieftasche &sichern...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="329"/> - <source>[testnet]</source> - <translation>[Testnetz]</translation> + <location filename="../bitcoingui.cpp" line="418"/> + <source>bitcoin-qt</source> + <translation>bitcoin-qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> + <location filename="../bitcoingui.cpp" line="531"/> <source>Downloaded %1 blocks of transaction history.</source> <translation>%1 Blöcke des Transaktionsverlaufs heruntergeladen.</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation> <numerusform>vor %n Sekunde</numerusform> @@ -511,15 +471,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> - <source>%n minute(s) ago</source> - <translation> - <numerusform>vor %n Minute</numerusform> - <numerusform>vor %n Minuten</numerusform> - </translation> - </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation> <numerusform>vor %n Stunde</numerusform> @@ -527,7 +479,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>vor %n Tag</numerusform> @@ -535,37 +487,37 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation>Auf aktuellem Stand</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>Hole auf...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation>Der letzte empfangene Block wurde %1 generiert.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>Passphrase &ändern...</translation> + <location filename="../bitcoingui.cpp" line="215"/> + <source>Sign &message</source> + <translation>&Nachricht signieren...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> + <location filename="../bitcoingui.cpp" line="663"/> <source>Sent transaction</source> <translation>Gesendete Transaktion</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> + <location filename="../bitcoingui.cpp" line="664"/> <source>Incoming transaction</source> <translation>Eingehende Transaktion</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -577,79 +529,134 @@ Typ: %3 Adresse: %4</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> - <source>&Help</source> - <translation>&Hilfe</translation> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>&Über %1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> - <source>Actions toolbar</source> - <translation>Aktionen-Werkzeugleiste</translation> + <location filename="../bitcoingui.cpp" line="790"/> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation>Brieftasche ist <b>verschlüsselt</b> und aktuell <b>entsperrt</b></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="798"/> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation>Brieftasche ist <b>verschlüsselt</b> und aktuell <b>gesperrt</b></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>Erweiterte Bitcoin-Einstellungen ändern</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="252"/> + <source>&Encrypt Wallet</source> + <translation>Brieftasche &verschlüsseln...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="256"/> + <source>Backup wallet to another location</source> + <translation>Eine Sicherungskopie der Brieftasche erstellen und abspeichern</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation>Passphrase &ändern...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="258"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>Ändert die Passphrase, die für die Verschlüsselung der Brieftasche benutzt wird</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="290"/> + <source>&Settings</source> + <translation>&Einstellungen</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="327"/> + <source>[testnet]</source> + <translation>[Testnetz]</translation> + </message> + <message> + <location filename="../bitcoin.cpp" line="127"/> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>Ein schwerer Fehler ist aufgetreten. Bitcoin kann nicht stabil weiter ausgeführt werden und wird beendet.</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> + <location filename="../bitcoingui.cpp" line="482"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n aktive Verbindung zum Bitcoin-Netzwerk</numerusform> <numerusform>%n aktive Verbindungen zum Bitcoin-Netzwerk</numerusform> </translation> </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation> + <numerusform>~%n Block verbleibend</numerusform> + <numerusform>~%n Blöcke verbleibend</numerusform> + </translation> + </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> + <location filename="../bitcoingui.cpp" line="506"/> <source>Synchronizing with network...</source> <translation>Synchronisiere mit Netzwerk...</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> - <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> - <translation>Ein schwerer Fehler ist aufgetreten. Bitcoin kann nicht stabil weiter ausgeführt werden und wird beendet.</translation> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>%1 von %2 Blöcken des Transaktionsverlaufs heruntergeladen (%3% fertig).</translation> </message> - <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Bitcoin-Fenster anzeigen</translation> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="550"/> + <source>%n minute(s) ago</source> + <translation> + <numerusform>vor %n Minute</numerusform> + <numerusform>vor %n Minuten</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation>Brieftasche &verschlüsseln...</translation> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Backup Wallet</source> + <translation>Brieftasche sichern</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> - <source>bitcoin-qt</source> - <translation>bitcoin-qt</translation> + <location filename="../bitcoingui.cpp" line="314"/> + <source>Actions toolbar</source> + <translation>Aktionen-Werkzeugleiste</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> - <source>Sending...</source> - <translation>Transaktionsgebühr bestätigen</translation> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Wallet Data (*.dat)</source> + <translation>Brieftaschendaten (*.dat)</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>%1 von %2 Blöcken des Transaktionsverlaufs heruntergeladen.</translation> + <location filename="../bitcoingui.cpp" line="198"/> + <source>Edit the list of stored addresses and labels</source> + <translation>Liste der gespeicherten Zahlungsadressen und Bezeichnungen bearbeiten</translation> </message> </context> <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&Einheit der Beträge:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>Wählen Sie die Standard-Untereinheit, die in der Benutzeroberfläche und beim Überweisen von Bitcoins angezeigt werden soll</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&Adressen in der Transaktionsliste anzeigen</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished">Legt fest, ob Bitcoin-Adressen in der Transaktionsliste angezeigt werden</translation> </message> @@ -725,85 +732,95 @@ Adresse: %4</translation> <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>Bitcoin beim &Systemstart ausführen</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Bitcoin automatisch ausführen, wenn der Computer eingeschaltet wird</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>In den Infobereich anstatt in die Taskleiste &minimieren</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> + <location filename="../optionsdialog.cpp" line="185"/> <source>Map port using &UPnP</source> <translation>Portweiterleitung via &UPnP</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="177"/> + <source>Show only a tray icon after minimizing the window</source> + <translation>Nur ein Symbol im Infobereich anzeigen, nachdem das Fenster minimiert wurde</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="180"/> <source>M&inimize on close</source> <translation>Beim Schließen &minimieren</translation> </message> <message> <location filename="../optionsdialog.cpp" line="181"/> - <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> - <translation>Automatisch den Bitcoin Client-Port auf dem Router öffnen. Dies funktioniert nur, wenn Ihr Router UPnP unterstützt und dies aktiviert ist.</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="176"/> - <source>Show only a tray icon after minimizing the window</source> - <translation>Nur ein Symbol im Infobereich anzeigen, nachdem das Fenster minimiert wurde</translation> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> + <translation>Minimiert die Anwendung anstatt sie zu Beenden, wenn das Fenster geschlossen wird. Wenn dies aktiviert ist, müssen Sie das Programm über "Beenden" im Menü schließen.</translation> </message> <message> <location filename="../optionsdialog.cpp" line="186"/> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimiert die Anwendung anstatt sie zu Beenden, wenn das Fenster geschlossen wird. Wenn dies aktiviert ist, müssen Sie das Programm über "Beenden" im Menü schließen.</translation> + <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> + <translation>Automatisch den Bitcoin Client-Port auf dem Router öffnen. Dies funktioniert nur, wenn Ihr Router UPnP unterstützt und dies aktiviert ist.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>Über einen SOCKS4-Proxy &verbinden:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Über einen SOCKS4-Proxy mit dem Bitcoin-Netzwerk verbinden (z.B. beim Verbinden über Tor)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>Proxy-&IP:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>IP-Adresse des Proxy-Servers (z.B. 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>&Port:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Port des Proxy-Servers (z.B. 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>Optionale Transaktionsgebühr pro kB, die sicherstellt, dass Ihre Transaktionen schnell bearbeitet werden. Die meisten Transaktionen sind 1 kB groß. Eine Gebühr von 0.01 wird empfohlen.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>Transaktions&gebühr bezahlen</translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation>Datenbanken beim Beenden trennen</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation>Block- und Adressdatenbank beim Beenden trennen. Diese können so in ein anderes Datenverzeichnis verschoben werden, die zum Beenden benötigte Zeit wird aber verlängert. Die Datenbank der Brieftasche wird immer getrennt.</translation> + </message> </context> <context> <name>MessagePage</name> @@ -828,6 +845,18 @@ Adresse: %4</translation> <translation>Nachricht &signieren</translation> </message> <message> + <location filename="../forms/messagepage.ui" line="134"/> + <source>&Copy to Clipboard</source> + <translation>Signatur in die Zwischenablage &kopieren</translation> + </message> + <message> + <location filename="../messagepage.cpp" line="74"/> + <location filename="../messagepage.cpp" line="89"/> + <location filename="../messagepage.cpp" line="101"/> + <source>Error signing</source> + <translation>Fehler beim Signieren</translation> + </message> + <message> <location filename="../forms/messagepage.ui" line="38"/> <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Die Adresse mit der die Nachricht signiert wird (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -868,18 +897,6 @@ Adresse: %4</translation> <translation>Aktuelle Signatur in die Zwischenablage kopieren</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="134"/> - <source>&Copy to Clipboard</source> - <translation>Signatur in die Zwischenablage &kopieren</translation> - </message> - <message> - <location filename="../messagepage.cpp" line="74"/> - <location filename="../messagepage.cpp" line="89"/> - <location filename="../messagepage.cpp" line="101"/> - <source>Error signing</source> - <translation>Fehler beim Signieren</translation> - </message> - <message> <location filename="../messagepage.cpp" line="74"/> <source>%1 is not a valid address.</source> <translation>%1 ist keine gültige Adresse.</translation> @@ -898,17 +915,17 @@ Adresse: %4</translation> <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>Allgemein</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>Anzeige</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>Erweiterte Einstellungen</translation> </message> @@ -916,31 +933,6 @@ Adresse: %4</translation> <context> <name>OverviewPage</name> <message> - <location filename="../forms/overviewpage.ui" line="14"/> - <source>Form</source> - <translation>Formular</translation> - </message> - <message> - <location filename="../forms/overviewpage.ui" line="88"/> - <source>Wallet</source> - <translation>Brieftasche</translation> - </message> - <message> - <location filename="../forms/overviewpage.ui" line="124"/> - <source><b>Recent transactions</b></source> - <translation><b>Letzte Transaktionen</b></translation> - </message> - <message> - <location filename="../forms/overviewpage.ui" line="68"/> - <source>Unconfirmed:</source> - <translation>Unbestätigt:</translation> - </message> - <message> - <location filename="../forms/overviewpage.ui" line="40"/> - <source>Balance:</source> - <translation>Kontostand:</translation> - </message> - <message> <location filename="../overviewpage.cpp" line="108"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> <translation>Betrag aus unbestätigten Transaktionen, der noch nicht im aktuellen Kontostand enthalten ist</translation> @@ -961,14 +953,54 @@ Adresse: %4</translation> <translation>Ihr aktueller Kontostand</translation> </message> <message> + <location filename="../forms/overviewpage.ui" line="88"/> + <source>Wallet</source> + <translation>Brieftasche</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="14"/> + <source>Form</source> + <translation>Formular</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="40"/> + <source>Balance:</source> + <translation>Kontostand:</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="68"/> + <source>Unconfirmed:</source> + <translation>Unbestätigt:</translation> + </message> + <message> <location filename="../forms/overviewpage.ui" line="61"/> <source>0</source> <translation>0</translation> </message> + <message> + <location filename="../forms/overviewpage.ui" line="124"/> + <source><b>Recent transactions</b></source> + <translation><b>Letzte Transaktionen</b></translation> + </message> </context> <context> <name>QRCodeDialog</name> <message> + <location filename="../forms/qrcodedialog.ui" line="70"/> + <source>Amount:</source> + <translation>Betrag:</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="186"/> + <source>&Save As...</source> + <translation>&Speichern unter...</translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>Resultierende URI zu lang, bitte den Text für Bezeichnung / Nachricht kürzen.</translation> + </message> + <message> <location filename="../forms/qrcodedialog.ui" line="55"/> <source>Request Payment</source> <translation>Zahlung anfordern</translation> @@ -979,19 +1011,19 @@ Adresse: %4</translation> <translation>Bezeichnung:</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> - <source>Error encoding URI into QR Code.</source> - <translation>Fehler beim Kodieren der URI in den QR-Code.</translation> + <location filename="../forms/qrcodedialog.ui" line="105"/> + <source>BTC</source> + <translation>BTC</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="32"/> - <source>QR Code</source> - <translation>QR-Code</translation> + <location filename="../forms/qrcodedialog.ui" line="144"/> + <source>Message:</source> + <translation>Nachricht:</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> - <source>Save Image...</source> - <translation>QR-Code abspeichern</translation> + <location filename="../qrcodedialog.cpp" line="121"/> + <source>PNG Images (*.png)</source> + <translation>PNG Bild (*.png)</translation> </message> <message> <location filename="../forms/qrcodedialog.ui" line="14"/> @@ -999,66 +1031,39 @@ Adresse: %4</translation> <translation>Dialog</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="70"/> - <source>Amount:</source> - <translation>Betrag:</translation> - </message> - <message> - <location filename="../forms/qrcodedialog.ui" line="144"/> - <source>Message:</source> - <translation>Nachricht:</translation> - </message> - <message> - <location filename="../forms/qrcodedialog.ui" line="105"/> - <source>BTC</source> - <translation>BTC</translation> + <location filename="../forms/qrcodedialog.ui" line="32"/> + <source>QR Code</source> + <translation>QR-Code</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="186"/> - <source>&Save As...</source> - <translation>&Speichern unter...</translation> + <location filename="../qrcodedialog.cpp" line="46"/> + <source>Error encoding URI into QR Code.</source> + <translation>Fehler beim Kodieren der URI in den QR-Code.</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> - <source>PNG Images (*.png)</source> - <translation>PNG Bild (*.png)</translation> + <location filename="../qrcodedialog.cpp" line="121"/> + <source>Save Image...</source> + <translation>QR-Code abspeichern</translation> </message> </context> <context> <name>SendCoinsDialog</name> <message> - <location filename="../forms/sendcoinsdialog.ui" line="14"/> - <location filename="../sendcoinsdialog.cpp" line="123"/> - <location filename="../sendcoinsdialog.cpp" line="128"/> - <location filename="../sendcoinsdialog.cpp" line="133"/> - <location filename="../sendcoinsdialog.cpp" line="138"/> - <location filename="../sendcoinsdialog.cpp" line="144"/> - <location filename="../sendcoinsdialog.cpp" line="149"/> - <location filename="../sendcoinsdialog.cpp" line="154"/> - <source>Send Coins</source> - <translation>Bitcoins überweisen</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="64"/> - <source>Send to multiple recipients at once</source> - <translation>In einer Transaktion an mehrere Empfänger auf einmal überweisen</translation> + <location filename="../forms/sendcoinsdialog.ui" line="113"/> + <source>123.456 BTC</source> + <translation>123.456 BTC</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="84"/> - <source>Remove all transaction fields</source> - <translation>Alle Überweisungsfelder zurücksetzen</translation> + <location filename="../sendcoinsdialog.cpp" line="95"/> + <source><b>%1</b> to %2 (%3)</source> + <translation><b>%1</b> an %2 (%3)</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="144"/> - <source>Confirm the send action</source> + <location filename="../sendcoinsdialog.cpp" line="100"/> + <source>Confirm send coins</source> <translation>Überweisung bestätigen</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="147"/> - <source>S&end</source> - <translation>&Überweisen</translation> - </message> - <message> <location filename="../sendcoinsdialog.cpp" line="101"/> <source>Are you sure you want to send %1?</source> <translation>Sind Sie sich sicher, dass Sie die folgende Überweisung ausführen möchten?<br>%1</translation> @@ -1069,29 +1074,51 @@ Adresse: %4</translation> <translation> und </translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="124"/> - <source>The recipient address is not valid, please recheck.</source> - <translation>Die Zahlungsadresse ist ungültig, bitte nochmals überprüfen.</translation> - </message> - <message> <location filename="../sendcoinsdialog.cpp" line="129"/> <source>The amount to pay must be larger than 0.</source> - <translation>Der zu zahlende Betrag muss größer als 0 sein.</translation> + <translation>Der zu zahlende Betrag muss größer 0 sein.</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="134"/> - <source>The amount exceeds your balance.</source> - <translation>Der angegebene Betrag übersteigt Ihren Kontostand.</translation> + <location filename="../sendcoinsdialog.cpp" line="150"/> + <source>Error: Transaction creation failed.</source> + <translation>Fehler: Transaktionserstellung fehlgeschlagen.</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="139"/> - <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation>Der angegebene Betrag übersteigt aufgrund der Transaktionsgebühr in Höhe von %1 Ihren Kontostand.</translation> + <location filename="../sendcoinsdialog.cpp" line="155"/> + <source>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.</source> + <translation>Fehler: Die Transaktion wurde abgelehnt. Dies kann passieren, wenn einige Bitcoins aus Ihrer Brieftasche bereits ausgegeben wurden. Beispielsweise weil Sie eine Kopie Ihrer wallet.dat genutzt, die Bitcoins dort ausgegeben haben und dies daher in der derzeit aktiven Brieftasche nicht vermerkt ist.</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="145"/> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Doppelte Adresse gefunden, pro Überweisung kann an jede Adresse nur einmalig etwas überwiesen werden.</translation> + <location filename="../forms/sendcoinsdialog.ui" line="64"/> + <source>Send to multiple recipients at once</source> + <translation>In einer Transaktion an mehrere Empfänger auf einmal überweisen</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="84"/> + <source>Remove all transaction fields</source> + <translation>Alle Überweisungsfelder zurücksetzen</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="144"/> + <source>Confirm the send action</source> + <translation>Überweisung bestätigen</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="14"/> + <location filename="../sendcoinsdialog.cpp" line="123"/> + <location filename="../sendcoinsdialog.cpp" line="128"/> + <location filename="../sendcoinsdialog.cpp" line="133"/> + <location filename="../sendcoinsdialog.cpp" line="138"/> + <location filename="../sendcoinsdialog.cpp" line="144"/> + <location filename="../sendcoinsdialog.cpp" line="149"/> + <location filename="../sendcoinsdialog.cpp" line="154"/> + <source>Send Coins</source> + <translation>Bitcoins überweisen</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="67"/> + <source>&Add recipient...</source> + <translation>&Empfänger hinzufügen</translation> </message> <message> <location filename="../forms/sendcoinsdialog.ui" line="87"/> @@ -1104,34 +1131,29 @@ Adresse: %4</translation> <translation>Kontostand:</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="113"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="67"/> - <source>&Add recipient...</source> - <translation>&Empfänger hinzufügen</translation> + <location filename="../forms/sendcoinsdialog.ui" line="147"/> + <source>S&end</source> + <translation>&Überweisen</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="95"/> - <source><b>%1</b> to %2 (%3)</source> - <translation><b>%1</b> an %2 (%3)</translation> + <location filename="../sendcoinsdialog.cpp" line="124"/> + <source>The recipient address is not valid, please recheck.</source> + <translation>Die Zahlungsadresse ist ungültig, bitte nochmals überprüfen.</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="100"/> - <source>Confirm send coins</source> - <translation>Überweisung bestätigen</translation> + <location filename="../sendcoinsdialog.cpp" line="134"/> + <source>The amount exceeds your balance.</source> + <translation>Der angegebene Betrag übersteigt Ihren Kontostand.</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="150"/> - <source>Error: Transaction creation failed.</source> - <translation>Fehler: Transaktionserstellung fehlgeschlagen.</translation> + <location filename="../sendcoinsdialog.cpp" line="145"/> + <source>Duplicate address found, can only send to each address once per send operation.</source> + <translation>Doppelte Adresse gefunden, pro Überweisung kann an jede Adresse nur einmalig etwas überwiesen werden.</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="155"/> - <source>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.</source> - <translation>Fehler: Die Transaktion wurde abgelehnt. Dies kann passieren, wenn einige Bitcoins aus Ihrer Brieftasche bereits ausgegeben wurden. Beispielsweise weil Sie eine Kopie Ihrer wallet.dat genutzt, die Bitcoins dort ausgegeben haben und dies daher in der derzeit aktiven Brieftasche nicht vermerkt ist.</translation> + <location filename="../sendcoinsdialog.cpp" line="139"/> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>Der angegebene Betrag übersteigt aufgrund der Transaktionsgebühr in Höhe von %1 Ihren Kontostand.</translation> </message> </context> <context> @@ -1142,14 +1164,9 @@ Adresse: %4</translation> <translation>Formular</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="42"/> - <source>Pay &To:</source> - <translation>&Empfänger:</translation> - </message> - <message> - <location filename="../forms/sendcoinsentry.ui" line="29"/> - <source>A&mount:</source> - <translation>&Betrag:</translation> + <location filename="../forms/sendcoinsentry.ui" line="75"/> + <source>&Label:</source> + <translation>&Bezeichnung:</translation> </message> <message> <location filename="../forms/sendcoinsentry.ui" line="66"/> @@ -1158,11 +1175,6 @@ Adresse: %4</translation> <translation>Adressbezeichnung eingeben (diese wird zusammen mit der Adresse dem Adressbuch hinzugefügt)</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="75"/> - <source>&Label:</source> - <translation>&Bezeichnung:</translation> - </message> - <message> <location filename="../forms/sendcoinsentry.ui" line="93"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished"></translation> @@ -1173,6 +1185,16 @@ Adresse: %4</translation> <translation>Adresse aus Adressbuch wählen</translation> </message> <message> + <location filename="../forms/sendcoinsentry.ui" line="42"/> + <source>Pay &To:</source> + <translation>&Empfänger:</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="29"/> + <source>A&mount:</source> + <translation>&Betrag:</translation> + </message> + <message> <location filename="../forms/sendcoinsentry.ui" line="113"/> <source>Alt+A</source> <translation>Alt+A</translation> @@ -1201,143 +1223,143 @@ Adresse: %4</translation> <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="18"/> - <source>Open for %1 blocks</source> - <translation>Offen für %1 Blöcke</translation> + <location filename="../transactiondesc.cpp" line="22"/> + <source>Open until %1</source> + <translation>Offen bis %1</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation>%1/offline?</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> - <source><b>Status:</b> </source> - <translation><b>Status:</b> </translation> + <location filename="../transactiondesc.cpp" line="32"/> + <source>%1 confirmations</source> + <translation>%1 Bestätigungen</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="20"/> + <source>Open for %1 blocks</source> + <translation>Offen für %1 Blöcke</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation>, wurde noch nicht erfolgreich übertragen</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="92"/> + <source>unknown</source> + <translation>unbekannt</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="50"/> + <source><b>Status:</b> </source> + <translation><b>Status:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>, über %1 Knoten übertragen</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>, über %1 Knoten übertragen</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation><b>Datum:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>Quelle:</b> Generiert<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>Von:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation><b>An:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> - <source>unknown</source> - <translation>unbekannt</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation> (Eigene Adresse, Bezeichnung: </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation> (Eigene Adresse)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation><b>Gutschrift:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation>%1 (reift noch %2 weitere Blöcke)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation>(nicht angenommen)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> - <source>Transaction ID:</source> - <translation>Transaktions-ID:</translation> + <location filename="../transactiondesc.cpp" line="197"/> + <source><b>Transaction fee:</b> </source> + <translation><b>Transaktionsgebühr:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> - <source>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.</source> - <translation>Generierte Bitcoins müssen 120 Blöcke lang warten, bevor sie ausgegeben werden können. Als Sie diesen Block generierten, wurde er an das Netzwerk übertragen, um ihn der Blockkette hinzuzufügen. Falls dies fehlschlägt wird der Status in "nicht angenommen" geändert und der Betrag wird nicht verfügbar werden. Das kann gelegentlich passieren, wenn ein anderer Knoten einen Block zur selben Zeit wie Sie generierte.</translation> + <location filename="../transactiondesc.cpp" line="219"/> + <source>Message:</source> + <translation>Nachricht:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> - <source>Open until %1</source> - <translation>Offen bis %1</translation> + <location filename="../transactiondesc.cpp" line="221"/> + <source>Comment:</source> + <translation>Kommentar:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> - <source><b>Debit:</b> </source> - <translation><b>Belastung:</b> </translation> + <location filename="../transactiondesc.cpp" line="223"/> + <source>Transaction ID:</source> + <translation>Transaktions-ID:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="28"/> - <source>%1/unconfirmed</source> - <translation>%1/unbestätigt</translation> + <location filename="../transactiondesc.cpp" line="226"/> + <source>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.</source> + <translation>Generierte Bitcoins müssen 120 Blöcke lang warten, bevor sie ausgegeben werden können. Als Sie diesen Block generierten, wurde er an das Netzwerk übertragen, um ihn der Blockkette hinzuzufügen. Falls dies fehlschlägt wird der Status in "nicht angenommen" geändert und der Betrag wird nicht verfügbar werden. Das kann gelegentlich passieren, wenn ein anderer Knoten einen Block zur selben Zeit wie Sie generierte.</translation> </message> <message> <location filename="../transactiondesc.cpp" line="30"/> - <source>%1 confirmations</source> - <translation>%1 Bestätigungen</translation> + <source>%1/unconfirmed</source> + <translation>%1/unbestätigt</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> - <source><b>Transaction fee:</b> </source> - <translation><b>Transaktionsgebühr:</b> </translation> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> + <source><b>Debit:</b> </source> + <translation><b>Belastung:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>Nettobetrag:</b> </translation> </message> - <message> - <location filename="../transactiondesc.cpp" line="216"/> - <source>Message:</source> - <translation>Nachricht:</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="218"/> - <source>Comment:</source> - <translation>Kommentar:</translation> - </message> </context> <context> <name>TransactionDescDialog</name> @@ -1356,21 +1378,11 @@ Adresse: %4</translation> <name>TransactionTableModel</name> <message> <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Date</source> - <translation>Datum</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> <source>Type</source> <translation>Typ</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Address</source> - <translation>Adresse</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> <source>Amount</source> <translation>Betrag</translation> </message> @@ -1393,11 +1405,6 @@ Adresse: %4</translation> <translation>Offline (%1 Bestätigungen)</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="286"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Unbestätigt (%1 von %2 Bestätigungen)</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="289"/> <source>Confirmed (%1 confirmations)</source> <translation>Bestätigt (%1 Bestätigungen)</translation> @@ -1418,11 +1425,6 @@ Adresse: %4</translation> <translation>Empfangen über</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="351"/> - <source>Received from</source> - <translation>Empfangen von</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="354"/> <source>Sent to</source> <translation>Überwiesen an</translation> @@ -1467,6 +1469,21 @@ Adresse: %4</translation> <source>Amount removed from or added to balance.</source> <translation>Der Betrag, der dem Kontostand abgezogen oder hinzugefügt wurde.</translation> </message> + <message> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Address</source> + <translation>Adresse</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="286"/> + <source>Unconfirmed (%1 of %2 confirmations)</source> + <translation>Unbestätigt (%1 von %2 Bestätigungen)</translation> + </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="297"/> <source>Mined balance will be available in %n more blocks</source> @@ -1475,48 +1492,28 @@ Adresse: %4</translation> <numerusform>Der erarbeitete Betrag wird in %n Blöcken verfügbar sein</numerusform> </translation> </message> + <message> + <location filename="../transactiontablemodel.cpp" line="351"/> + <source>Received from</source> + <translation>Empfangen von</translation> + </message> </context> <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="392"/> - <source>to</source> - <translation>bis</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="56"/> - <source>Today</source> - <translation>Heute</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="61"/> - <source>Range...</source> - <translation>Zeitraum...</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="72"/> - <source>Received with</source> - <translation>Empfangen über</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="74"/> - <source>Sent to</source> - <translation>Überwiesen an</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="78"/> - <source>Other</source> - <translation>Andere</translation> + <location filename="../transactionview.cpp" line="284"/> + <source>Amount</source> + <translation>Betrag</translation> </message> <message> - <location filename="../transactionview.cpp" line="84"/> - <source>Enter address or label to search</source> - <translation>Zu suchende Adresse oder Bezeichnung eingeben</translation> + <location filename="../transactionview.cpp" line="289"/> + <source>Could not write to file %1.</source> + <translation>Konnte nicht in Datei %1 schreiben.</translation> </message> <message> - <location filename="../transactionview.cpp" line="282"/> - <source>Label</source> - <translation>Bezeichnung</translation> + <location filename="../transactionview.cpp" line="384"/> + <source>Range:</source> + <translation>Zeitraum:</translation> </message> <message> <location filename="../transactionview.cpp" line="59"/> @@ -1524,31 +1521,11 @@ Adresse: %4</translation> <translation>Letzten Monat</translation> </message> <message> - <location filename="../transactionview.cpp" line="128"/> - <source>Show details...</source> - <translation>Transaktionsdetails anzeigen</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="384"/> - <source>Range:</source> - <translation>Zeitraum:</translation> - </message> - <message> <location filename="../transactionview.cpp" line="58"/> <source>This month</source> <translation>Diesen Monat</translation> </message> <message> - <location filename="../transactionview.cpp" line="57"/> - <source>This week</source> - <translation>Diese Woche</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="60"/> - <source>This year</source> - <translation>Dieses Jahr</translation> - </message> - <message> <location filename="../transactionview.cpp" line="90"/> <source>Min amount</source> <translation>Minimaler Betrag</translation> @@ -1559,9 +1536,9 @@ Adresse: %4</translation> <translation>Adresse kopieren</translation> </message> <message> - <location filename="../transactionview.cpp" line="76"/> - <source>To yourself</source> - <translation>Eigenüberweisung</translation> + <location filename="../transactionview.cpp" line="60"/> + <source>This year</source> + <translation>Dieses Jahr</translation> </message> <message> <location filename="../transactionview.cpp" line="126"/> @@ -1569,6 +1546,11 @@ Adresse: %4</translation> <translation>Betrag kopieren</translation> </message> <message> + <location filename="../transactionview.cpp" line="72"/> + <source>Received with</source> + <translation>Empfangen über</translation> + </message> + <message> <location filename="../transactionview.cpp" line="127"/> <source>Edit label</source> <translation>Bezeichnung bearbeiten</translation> @@ -1579,11 +1561,21 @@ Adresse: %4</translation> <translation>Transaktionen exportieren</translation> </message> <message> + <location filename="../transactionview.cpp" line="77"/> + <source>Mined</source> + <translation>Erarbeitet</translation> + </message> + <message> <location filename="../transactionview.cpp" line="271"/> <source>Comma separated file (*.csv)</source> <translation>Kommagetrennte Datei (*.csv)</translation> </message> <message> + <location filename="../transactionview.cpp" line="84"/> + <source>Enter address or label to search</source> + <translation>Zu suchende Adresse oder Bezeichnung eingeben</translation> + </message> + <message> <location filename="../transactionview.cpp" line="279"/> <source>Confirmed</source> <translation>Bestätigt</translation> @@ -1599,14 +1591,9 @@ Adresse: %4</translation> <translation>Typ</translation> </message> <message> - <location filename="../transactionview.cpp" line="283"/> - <source>Address</source> - <translation>Adresse</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="284"/> - <source>Amount</source> - <translation>Betrag</translation> + <location filename="../transactionview.cpp" line="285"/> + <source>ID</source> + <translation>ID</translation> </message> <message> <location filename="../transactionview.cpp" line="289"/> @@ -1614,20 +1601,9 @@ Adresse: %4</translation> <translation>Fehler beim Exportieren</translation> </message> <message> - <location filename="../transactionview.cpp" line="289"/> - <source>Could not write to file %1.</source> - <translation>Konnte nicht in Datei %1 schreiben.</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="77"/> - <source>Mined</source> - <translation>Erarbeitet</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="55"/> - <location filename="../transactionview.cpp" line="71"/> - <source>All</source> - <translation>Alle</translation> + <location filename="../transactionview.cpp" line="282"/> + <source>Label</source> + <translation>Bezeichnung</translation> </message> <message> <location filename="../transactionview.cpp" line="125"/> @@ -1635,417 +1611,556 @@ Adresse: %4</translation> <translation>Bezeichnung kopieren</translation> </message> <message> - <location filename="../transactionview.cpp" line="285"/> - <source>ID</source> - <translation>ID</translation> - </message> -</context> -<context> - <name>WalletModel</name> - <message> - <location filename="../walletmodel.cpp" line="145"/> - <source>Sending...</source> - <translation>Überweise...</translation> + <location filename="../transactionview.cpp" line="56"/> + <source>Today</source> + <translation>Heute</translation> </message> -</context> -<context> - <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Bitcoin version</source> - <translation>Bitcoin Version</translation> + <location filename="../transactionview.cpp" line="55"/> + <location filename="../transactionview.cpp" line="71"/> + <source>All</source> + <translation>Alle</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> - <source>Run in the background as a daemon and accept commands</source> - <translation>Als Hintergrunddienst starten und Befehle annehmen</translation> + <location filename="../transactionview.cpp" line="57"/> + <source>This week</source> + <translation>Diese Woche</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> - <source>Loading block index...</source> - <translation>Lade Blockindex...</translation> + <location filename="../transactionview.cpp" line="61"/> + <source>Range...</source> + <translation>Zeitraum...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify configuration file (default: bitcoin.conf)</source> - <translation>Konfigurationsdatei angeben (Standard: bitcoin.conf)</translation> + <location filename="../transactionview.cpp" line="74"/> + <source>Sent to</source> + <translation>Überwiesen an</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Verbindungstimeout angeben (in Millisekunden)</translation> + <location filename="../transactionview.cpp" line="76"/> + <source>To yourself</source> + <translation>Eigenüberweisung</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Threshold for disconnecting misbehaving peers (default: 100)</source> - <translation>Schwellenwert, um Verbindungen zu sich nicht konform verhaltenden Gegenstellen zu beenden (Standard: 100)</translation> + <location filename="../transactionview.cpp" line="78"/> + <source>Other</source> + <translation>Andere</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Usage:</source> - <translation>Benutzung:</translation> + <location filename="../transactionview.cpp" line="128"/> + <source>Show details...</source> + <translation>Transaktionsdetails anzeigen</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> - <source>Loading addresses...</source> - <translation>Lade Adressen...</translation> + <location filename="../transactionview.cpp" line="283"/> + <source>Address</source> + <translation>Adresse</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> - <source>Done loading</source> - <translation>Laden abgeschlossen</translation> + <location filename="../transactionview.cpp" line="392"/> + <source>to</source> + <translation>bis</translation> </message> +</context> +<context> + <name>WalletModel</name> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> - <source>Cannot initialize keypool</source> - <translation>Schlüsselpool kann nicht initialisiert werden</translation> + <location filename="../walletmodel.cpp" line="142"/> + <source>Sending...</source> + <translation>Überweise...</translation> </message> +</context> +<context> + <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> - <source>Rescanning...</source> - <translation>Durchsuche erneut...</translation> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>Datenverzeichnis %s kann nicht gesperrt werden. Evtl. wurde Bitcoin bereits gestartet.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> - <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> - <translation>Warnung: -paytxfee ist auf einen sehr hohen Wert gesetzt. Dies ist die Gebühr die beim Senden einer Transaktion fällig wird.</translation> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Error loading blkindex.dat</source> + <translation>Fehler beim Laden von blkindex.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> - <translation>Warnung: Festplattenplatz wird knapp</translation> + <location filename="../bitcoinstrings.cpp" line="122"/> + <source>Cannot downgrade wallet</source> + <translation>Brieftasche kann nicht auf eine ältere Version herabgestuft werden</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> + <location filename="../bitcoinstrings.cpp" line="43"/> <source>Send command to -server or bitcoind</source> <translation>Befehl an -server oder bitcoind senden</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> + <location filename="../bitcoinstrings.cpp" line="46"/> <source>Options:</source> <translation>Optionen:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Get help for a command</source> - <translation>Hilfe zu einem Befehl erhalten</translation> + <location filename="../bitcoinstrings.cpp" line="67"/> + <source>Threshold for disconnecting misbehaving peers (default: 100)</source> + <translation>Schwellenwert, um Verbindungen zu sich nicht konform verhaltenden Gegenstellen zu beenden (Standard: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Generate coins</source> - <translation>Bitcoins generieren</translation> + <location filename="../bitcoinstrings.cpp" line="63"/> + <source>Find peers using internet relay chat (default: 0)</source> + <translation>Gegenstellen via Internet Relay Chat finden (Standard: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>PID-Datei angeben (Standard: bitcoind.pid)</translation> + <location filename="../bitcoinstrings.cpp" line="79"/> + <source>Run in the background as a daemon and accept commands</source> + <translation>Als Hintergrunddienst starten und Befehle annehmen</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Specify data directory</source> - <translation>Datenverzeichnis angeben</translation> + <location filename="../bitcoinstrings.cpp" line="54"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation>Größe des Datenbankcaches in MB festlegen (Standard: 25)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation><port> nach Verbindungen abhören (Standard: 8333 oder Testnetz: 18333)</translation> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Find peers using internet relay chat (default: 0)</source> - <translation>Gegenstellen via Internet Relay Chat finden (Standard: 0)</translation> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> - <translation>Warnung: Bitte korrigieren Sie die Datums- und Uhrzeiteinstellungen Ihres Computers, da Bitcoin ansonsten nicht ordnungsgemäß funktionieren wird.</translation> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">Fehler: Transaktionserstellung fehlgeschlagen.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation>Anzahl Sekunden, während denen sich nicht konform verhaltenden Gegenstellen die Wiederverbindung verweigert wird (Standard: 86400)</translation> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">Fehler: Die Transaktion wurde abgelehnt. Dies kann passieren, wenn einige Bitcoins aus Ihrer Brieftasche bereits ausgegeben wurden. Beispielsweise weil Sie eine Kopie Ihrer wallet.dat genutzt, die Bitcoins dort ausgegeben haben und dies daher in der derzeit aktiven Brieftasche nicht vermerkt ist.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Gebühr pro KB, die gesendeten Transaktionen hinzugefügt wird</translation> + <location filename="../bitcoinstrings.cpp" line="68"/> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> + <translation>Anzahl Sekunden, während denen sich nicht konform verhaltenden Gegenstellen die Wiederverbindung verweigert wird (Standard: 86400)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> + <location filename="../bitcoinstrings.cpp" line="82"/> <source>Prepend debug output with timestamp</source> <translation>Der Debugausgabe einen Zeitstempel voranstellen</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> + <location filename="../bitcoinstrings.cpp" line="83"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Rückverfolgungs- und Debuginformationen an die Konsole senden anstatt sie in die debug.log Datei zu schreiben</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> + <location filename="../bitcoinstrings.cpp" line="84"/> + <source>Send trace/debug info to debugger</source> + <translation>Rückverfolgungs- und Debuginformationen an den Debugger senden</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="85"/> <source>Username for JSON-RPC connections</source> <translation>Benutzername für JSON-RPC Verbindungen</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> + <location filename="../bitcoinstrings.cpp" line="86"/> <source>Password for JSON-RPC connections</source> <translation>Passwort für JSON-RPC Verbindungen</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Send trace/debug info to debugger</source> - <translation>Rückverfolgungs- und Debuginformationen an den Debugger senden</translation> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source>Rescanning...</source> + <translation>Durchsuche erneut...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> + <location filename="../bitcoinstrings.cpp" line="127"/> + <source>Invalid -proxy address</source> + <translation>Fehlerhafte Proxy-Adresse</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="88"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>JSON-RPC Verbindungen von der angegebenen IP-Adresse erlauben</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> + <location filename="../bitcoinstrings.cpp" line="133"/> + <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> + <translation>Fehler beim registrieren des Ports %d auf diesem Computer. Evtl. wurde Bitcoin bereits gestartet.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="89"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Sende Befehle an Knoten <ip> (Standard: 127.0.0.1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> - <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation>Brieftasche muss neu geschrieben werden: Starten Sie Bitcoin zur Fertigstellung neu</translation> + <location filename="../bitcoinstrings.cpp" line="113"/> + <source>Loading addresses...</source> + <translation>Lade Adressen...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> + <location filename="../bitcoinstrings.cpp" line="90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Kommando ausführen wenn der beste Block wechselt (%s im Kommando wird durch den Hash des Blocks ersetzt)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> + <location filename="../bitcoinstrings.cpp" line="128"/> + <source>Invalid amount for -paytxfee=<amount></source> + <translation>Ungültige Angabe für -paytxfee=<Betrag></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="94"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Größe des Schlüsselpools festlegen auf <n> (Standard: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> + <location filename="../bitcoinstrings.cpp" line="78"/> + <source>Accept command line and JSON-RPC commands</source> + <translation>Kommandozeilenbefehle und JSON-RPC Befehle annehmen</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="95"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>Blockkette erneut nach fehlenden Transaktionen der Brieftasche durchsuchen</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source>How many blocks to check at startup (default: 2500, 0 = all)</source> + <translation>Wieviele Blöcke sollen beim Starten geprüft werden (Standard: 2500, 0 = alle)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="101"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>OpenSSL (https) für JSON-RPC Verbindungen verwenden</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> + <location filename="../bitcoinstrings.cpp" line="102"/> <source>Server certificate file (default: server.cert)</source> <translation>Serverzertifikat (Standard: server.cert)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> - <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation>Wieviele Blöcke sollen beim Starten geprüft werden (Standard: 2500, 0 = alle)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="61"/> - <source>How thorough the block verification is (0-6, default: 1)</source> - <translation>Wie gründlich soll die Blockprüfung sein (0-6, Standard: 1)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="68"/> + <location filename="../bitcoinstrings.cpp" line="104"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Akzeptierte Chiffren (Standard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> + <location filename="../bitcoinstrings.cpp" line="107"/> <source>This help message</source> <translation>Dieser Hilfetext</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Don't generate coins</source> - <translation>Keine Bitcoins generieren</translation> + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation><port> nach JSON-RPC Verbindungen abhören (Standard: 8332)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Start minimized</source> - <translation>Minimiert starten</translation> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Upgrade wallet to latest format</source> + <translation>Brieftasche auf das neueste Format aktualisieren</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Show splash screen on startup (default: 1)</source> - <translation>Startbildschirm beim Starten anzeigen (Standard: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="103"/> + <source>Server private key (default: server.pem)</source> + <translation>Privater Serverschlüssel (Standard: server.pem)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="57"/> + <source>Connect through socks4 proxy</source> + <translation>Über einen SOCKS4-Proxy verbinden:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="58"/> + <source>Allow DNS lookups for addnode and connect</source> + <translation>Erlaube DNS Namensauflösung für addnode und connect</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation>Maximale Größe des Empfangspuffers pro Verbindung, <n>*1000 Bytes (Standard: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation>Maximale Größe des Sendepuffers pro Verbindung, <n>*1000 Bytes (Standard: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished">UPnP verwenden, um die Portweiterleitung einzurichten (Standard: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished">UPnP verwenden, um die Portweiterleitung einzurichten (Standard: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="64"/> + <source>Accept connections from outside (default: 1)</source> + <translation>Eingehende Verbindungen annehmen (Standard: 1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="65"/> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Sprache festlegen, z.B. "de_DE" (Standard: System Locale)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="81"/> + <source>Output extra debugging information</source> + <translation>Ausgabe zusätzlicher Debugging-Informationen</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation> SSL Einstellungen: (siehe Bitcoin-Wiki für SSL Installationsanweisungen)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Senden...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>Ungültige Angabe</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>Unzureichender Kontostand</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation>%s, Sie müssen den Wert rpcpasswort in der Konfigurationsdatei angeben +%s +Es wird empfohlen das folgende Zufallspasswort zu verwenden: +rpcuser=bitcoinrpc +rpcpassword=%s +(Sie müssen sich dieses Passwort nicht merken!) +Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Leserechten nur für den Dateibesitzer. +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation>Zur Nutzung der %s Option</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation>Fehler</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation>Sie müssen den Wert rpcpassword=<passwort> in der Konfigurationsdatei angeben: +%s +Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Leserechten nur für den Dateibesitzer.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="41"/> + <source>Bitcoin version</source> + <translation>Bitcoin Version</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="42"/> + <source>Usage:</source> + <translation>Benutzung:</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation>Größe des Datenbankprotokolls auf der Festplatte in MB festlegen (Standard: 100)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="117"/> <source>Loading wallet...</source> <translation>Lade Brieftasche...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> - <source>Invalid -proxy address</source> - <translation>Fehlerhafte Proxy-Adresse</translation> + <location filename="../bitcoinstrings.cpp" line="124"/> + <source>Cannot write default address</source> + <translation>Standardadresse kann nicht geschrieben werden</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> - <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> - <translation>Fehler beim registrieren des Ports %d auf diesem Computer. Evtl. wurde Bitcoin bereits gestartet.</translation> + <location filename="../bitcoinstrings.cpp" line="115"/> + <source>Loading block index...</source> + <translation>Lade Blockindex...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> - <source>Invalid amount for -paytxfee=<amount></source> - <translation>Ungültige Angabe für -paytxfee=<Betrag></translation> + <location filename="../bitcoinstrings.cpp" line="129"/> + <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> + <translation>Warnung: -paytxfee ist auf einen sehr hohen Wert gesetzt. Dies ist die Gebühr die beim Senden einer Transaktion fällig wird.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>Beta</translation> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Warning: Disk space is low</source> + <translation>Warnung: Festplattenplatz wird knapp</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>Done loading</source> + <translation>Laden abgeschlossen</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation>Fehler: CreateThread(StartNode) fehlgeschlagen</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> - <source>Error loading addr.dat</source> - <translation>Fehler beim Laden von addr.dat</translation> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <translation>Warnung: Bitte korrigieren Sie die Datums- und Uhrzeiteinstellungen Ihres Computers, da Bitcoin ansonsten nicht ordnungsgemäß funktionieren wird.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> - <source>Error loading blkindex.dat</source> - <translation>Fehler beim Laden von blkindex.dat</translation> + <location filename="../bitcoinstrings.cpp" line="114"/> + <source>Error loading addr.dat</source> + <translation>Fehler beim Laden von addr.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> + <location filename="../bitcoinstrings.cpp" line="118"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Fehler beim Laden von wallet.dat: Brieftasche beschädigt</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> + <location filename="../bitcoinstrings.cpp" line="119"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> <translation>Fehler beim Laden von wallet.dat: Brieftasche benötigt neuere Version von Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> + <location filename="../bitcoinstrings.cpp" line="120"/> + <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> + <translation>Brieftasche muss neu geschrieben werden: Starten Sie Bitcoin zur Fertigstellung neu</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="121"/> <source>Error loading wallet.dat</source> <translation>Fehler beim Laden von wallet.dat (Brieftasche)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> - <source>Cannot downgrade wallet</source> - <translation>Brieftasche kann nicht auf eine ältere Version herabgestuft werden</translation> + <location filename="../bitcoinstrings.cpp" line="123"/> + <source>Cannot initialize keypool</source> + <translation>Schlüsselpool kann nicht initialisiert werden</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> - <source>Cannot write default address</source> - <translation>Standardadresse kann nicht geschrieben werden</translation> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation>Beim Einrichten des abzuhörenden RPC-Ports %u ist ein Fehler aufgetreten: %s</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> + <location filename="../bitcoinstrings.cpp" line="44"/> <source>List commands</source> <translation>Befehle auflisten</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Größe des Datenbankcaches in MB festlegen (Standard: 25)</translation> + <location filename="../bitcoinstrings.cpp" line="45"/> + <source>Get help for a command</source> + <translation>Hilfe zu einem Befehl erhalten</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Connect through socks4 proxy</source> - <translation>Über einen SOCKS4-Proxy verbinden:</translation> + <location filename="../bitcoinstrings.cpp" line="47"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation>Konfigurationsdatei angeben (Standard: bitcoin.conf)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Allow DNS lookups for addnode and connect</source> - <translation>Erlaube DNS Namensauflösung für addnode und connect</translation> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>PID-Datei angeben (Standard: bitcoind.pid)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="49"/> + <source>Generate coins</source> + <translation>Bitcoins generieren</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="50"/> + <source>Don't generate coins</source> + <translation>Keine Bitcoins generieren</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> + <location filename="../bitcoinstrings.cpp" line="51"/> + <source>Start minimized</source> + <translation>Minimiert starten</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="52"/> + <source>Show splash screen on startup (default: 1)</source> + <translation>Startbildschirm beim Starten anzeigen (Standard: 1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Specify data directory</source> + <translation>Datenverzeichnis angeben</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Specify connection timeout (in milliseconds)</source> + <translation>Verbindungstimeout angeben (in Millisekunden)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="59"/> + <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> + <translation><port> nach Verbindungen abhören (Standard: 8333 oder Testnetz: 18333)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="60"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>Maximal <n> Verbindungen zu Gegenstellen aufrechterhalten (Standard: 125)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> + <location filename="../bitcoinstrings.cpp" line="61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Mit dem Knoten verbinden und versuchen die Verbindung aufrecht zu halten</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> + <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation>Nur mit dem angegebenem Knoten verbinden</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Accept connections from outside (default: 1)</source> - <translation>Eingehende Verbindungen annehmen (Standard: 1)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Sprache festlegen, z.B. "de_DE" (Standard: System Locale)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="32"/> + <location filename="../bitcoinstrings.cpp" line="66"/> <source>Find peers using DNS lookup (default: 1)</source> <translation>Gegenstellen via DNS-Namensauflösung finden (Standard: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> - <source>Accept command line and JSON-RPC commands</source> - <translation>Kommandozeilenbefehle und JSON-RPC Befehle annehmen</translation> + <location filename="../bitcoinstrings.cpp" line="77"/> + <source>Fee per KB to add to transactions you send</source> + <translation>Gebühr pro KB, die gesendeten Transaktionen hinzugefügt wird</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> + <location filename="../bitcoinstrings.cpp" line="80"/> <source>Use the test network</source> <translation>Das Testnetz verwenden</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> - <source>Output extra debugging information</source> - <translation>Ausgabe zusätzlicher Debugging-Informationen</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="51"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation><port> nach JSON-RPC Verbindungen abhören (Standard: 8332)</translation> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>How thorough the block verification is (0-6, default: 1)</source> + <translation>Wie gründlich soll die Blockprüfung sein (0-6, Standard: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> - <source>Upgrade wallet to latest format</source> - <translation>Brieftasche auf das neueste Format aktualisieren</translation> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation>Block- und Adressdatenbank beim Beenden trennen. Verlängert, die zum Beenden benötigte Zeit (Standard: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> - <source>Server private key (default: server.pem)</source> - <translation>Privater Serverschlüssel (Standard: server.pem)</translation> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation>Benutzung</translation> </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 881447f385..b84ead04d8 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -15,7 +15,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -89,42 +89,42 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation type="unfinished"></translation> </message> @@ -292,208 +292,202 @@ Are you sure you wish to encrypt your wallet?</source> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="73"/> + <location filename="../bitcoingui.cpp" line="71"/> <source>Bitcoin Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> - <source>Synchronizing with network...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="187"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>&Overview</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="186"/> <source>Show general overview of wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> + <location filename="../bitcoingui.cpp" line="191"/> <source>&Transactions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="192"/> <source>Browse transaction history</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> + <location filename="../bitcoingui.cpp" line="197"/> <source>&Address Book</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> + <location filename="../bitcoingui.cpp" line="198"/> <source>Edit the list of stored addresses and labels</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> + <location filename="../bitcoingui.cpp" line="209"/> <source>&Send coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> + <location filename="../bitcoingui.cpp" line="210"/> <source>Send coins to a bitcoin address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> + <location filename="../bitcoingui.cpp" line="215"/> <source>Sign &message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> + <location filename="../bitcoingui.cpp" line="216"/> <source>Prove you control an address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> + <location filename="../bitcoingui.cpp" line="235"/> <source>E&xit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> + <location filename="../bitcoingui.cpp" line="236"/> <source>Quit application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> + <location filename="../bitcoingui.cpp" line="239"/> <source>&About %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> + <location filename="../bitcoingui.cpp" line="240"/> <source>Show information about Bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> + <location filename="../bitcoingui.cpp" line="242"/> <source>About &Qt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> + <location filename="../bitcoingui.cpp" line="243"/> <source>Show information about Qt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> + <location filename="../bitcoingui.cpp" line="245"/> <source>&Options...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> + <location filename="../bitcoingui.cpp" line="246"/> <source>Modify configuration options for bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> + <location filename="../bitcoingui.cpp" line="250"/> <source>&Export...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> + <location filename="../bitcoingui.cpp" line="251"/> <source>Export the data in the current tab to a file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> + <location filename="../bitcoingui.cpp" line="252"/> <source>&Encrypt Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="255"/> + <location filename="../bitcoingui.cpp" line="253"/> <source>Encrypt or decrypt wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> + <location filename="../bitcoingui.cpp" line="255"/> <source>&Backup Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> + <location filename="../bitcoingui.cpp" line="256"/> <source>Backup wallet to another location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> + <location filename="../bitcoingui.cpp" line="257"/> <source>&Change Passphrase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> + <location filename="../bitcoingui.cpp" line="258"/> <source>Change the passphrase used for wallet encryption</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> + <location filename="../bitcoingui.cpp" line="281"/> <source>&File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> + <location filename="../bitcoingui.cpp" line="290"/> <source>&Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> + <location filename="../bitcoingui.cpp" line="296"/> <source>&Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> + <location filename="../bitcoingui.cpp" line="303"/> <source>Tabs toolbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> + <location filename="../bitcoingui.cpp" line="314"/> <source>Actions toolbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="418"/> <source>bitcoin-qt</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> + <location filename="../bitcoingui.cpp" line="482"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n active connection to Bitcoin network</numerusform> @@ -501,17 +495,22 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> + <location filename="../bitcoingui.cpp" line="506"/> + <source>Synchronizing with network...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> + <location filename="../bitcoingui.cpp" line="531"/> <source>Downloaded %1 blocks of transaction history.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation> <numerusform>%n second ago</numerusform> @@ -519,7 +518,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation> <numerusform>%n minute ago</numerusform> @@ -527,7 +526,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation> <numerusform>%n hour ago</numerusform> @@ -535,7 +534,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>%n day ago</numerusform> @@ -543,42 +542,42 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> + <location filename="../bitcoingui.cpp" line="632"/> <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> + <location filename="../bitcoingui.cpp" line="636"/> <source>Sending...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> + <location filename="../bitcoingui.cpp" line="663"/> <source>Sent transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> + <location filename="../bitcoingui.cpp" line="664"/> <source>Incoming transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -587,37 +586,45 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Backup Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation type="unfinished"></translation> </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation> + <numerusform>~%n block remaining</numerusform> + <numerusform>~%n blocks remaining</numerusform> + </translation> + </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -625,22 +632,22 @@ Address: %4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished"></translation> </message> @@ -716,85 +723,95 @@ Address: %4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="180"/> - <source>Map port using &UPnP</source> + <source>M&inimize on close</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="181"/> - <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="185"/> - <source>M&inimize on close</source> + <source>Map port using &UPnP</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="186"/> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> + <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessagePage</name> @@ -889,17 +906,17 @@ Address: %4 <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation type="unfinished"></translation> </message> @@ -1000,17 +1017,22 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation type="unfinished"></translation> </message> @@ -1192,140 +1214,140 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="18"/> + <location filename="../transactiondesc.cpp" line="20"/> <source>Open for %1 blocks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> + <location filename="../transactiondesc.cpp" line="22"/> <source>Open until %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="28"/> + <location filename="../transactiondesc.cpp" line="30"/> <source>%1/unconfirmed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="92"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation type="unfinished"></translation> </message> @@ -1634,7 +1656,7 @@ Address: %4 <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation type="unfinished"></translation> </message> @@ -1642,400 +1664,484 @@ Address: %4 <context> <name>bitcoin-core</name> <message> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Bitcoin version</source> + <source>Error: Wallet locked, unable to create transaction.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Warning: Disk space is low</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="41"/> + <source>Bitcoin version</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="42"/> <source>Usage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> + <location filename="../bitcoinstrings.cpp" line="43"/> <source>Send command to -server or bitcoind</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> + <location filename="../bitcoinstrings.cpp" line="44"/> <source>List commands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> + <location filename="../bitcoinstrings.cpp" line="45"/> <source>Get help for a command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> + <location filename="../bitcoinstrings.cpp" line="46"/> <source>Options:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> + <location filename="../bitcoinstrings.cpp" line="47"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> + <location filename="../bitcoinstrings.cpp" line="48"/> <source>Specify pid file (default: bitcoind.pid)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> + <location filename="../bitcoinstrings.cpp" line="49"/> <source>Generate coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> + <location filename="../bitcoinstrings.cpp" line="50"/> <source>Don't generate coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> + <location filename="../bitcoinstrings.cpp" line="51"/> <source>Start minimized</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> + <location filename="../bitcoinstrings.cpp" line="52"/> <source>Show splash screen on startup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> + <location filename="../bitcoinstrings.cpp" line="53"/> <source>Specify data directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> + <location filename="../bitcoinstrings.cpp" line="54"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="56"/> <source>Specify connection timeout (in milliseconds)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> + <location filename="../bitcoinstrings.cpp" line="57"/> <source>Connect through socks4 proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> + <location filename="../bitcoinstrings.cpp" line="58"/> <source>Allow DNS lookups for addnode and connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> + <location filename="../bitcoinstrings.cpp" line="59"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> + <location filename="../bitcoinstrings.cpp" line="60"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> + <location filename="../bitcoinstrings.cpp" line="61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> + <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> + <location filename="../bitcoinstrings.cpp" line="63"/> <source>Find peers using internet relay chat (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> + <location filename="../bitcoinstrings.cpp" line="65"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> + <location filename="../bitcoinstrings.cpp" line="66"/> <source>Find peers using DNS lookup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> + <location filename="../bitcoinstrings.cpp" line="67"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> + <location filename="../bitcoinstrings.cpp" line="68"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> + <location filename="../bitcoinstrings.cpp" line="78"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> + <location filename="../bitcoinstrings.cpp" line="79"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> + <location filename="../bitcoinstrings.cpp" line="80"/> <source>Use the test network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> + <location filename="../bitcoinstrings.cpp" line="81"/> <source>Output extra debugging information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> + <location filename="../bitcoinstrings.cpp" line="82"/> <source>Prepend debug output with timestamp</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> + <location filename="../bitcoinstrings.cpp" line="83"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> + <location filename="../bitcoinstrings.cpp" line="84"/> <source>Send trace/debug info to debugger</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> + <location filename="../bitcoinstrings.cpp" line="85"/> <source>Username for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> + <location filename="../bitcoinstrings.cpp" line="86"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> + <location filename="../bitcoinstrings.cpp" line="87"/> <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> + <location filename="../bitcoinstrings.cpp" line="88"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> + <location filename="../bitcoinstrings.cpp" line="89"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> + <location filename="../bitcoinstrings.cpp" line="90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> + <location filename="../bitcoinstrings.cpp" line="93"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> + <location filename="../bitcoinstrings.cpp" line="94"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> + <location filename="../bitcoinstrings.cpp" line="95"/> <source>Rescan the block chain for missing wallet transactions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> + <location filename="../bitcoinstrings.cpp" line="96"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> + <location filename="../bitcoinstrings.cpp" line="97"/> <source>How thorough the block verification is (0-6, default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> + <location filename="../bitcoinstrings.cpp" line="101"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> + <location filename="../bitcoinstrings.cpp" line="102"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> + <location filename="../bitcoinstrings.cpp" line="103"/> <source>Server private key (default: server.pem)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> + <location filename="../bitcoinstrings.cpp" line="104"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> + <location filename="../bitcoinstrings.cpp" line="107"/> <source>This help message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="113"/> <source>Loading addresses...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> + <location filename="../bitcoinstrings.cpp" line="114"/> <source>Error loading addr.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> + <location filename="../bitcoinstrings.cpp" line="115"/> <source>Loading block index...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> + <location filename="../bitcoinstrings.cpp" line="116"/> <source>Error loading blkindex.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> + <location filename="../bitcoinstrings.cpp" line="117"/> <source>Loading wallet...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> + <location filename="../bitcoinstrings.cpp" line="118"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> + <location filename="../bitcoinstrings.cpp" line="119"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> + <location filename="../bitcoinstrings.cpp" line="120"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> + <location filename="../bitcoinstrings.cpp" line="121"/> <source>Error loading wallet.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> + <location filename="../bitcoinstrings.cpp" line="123"/> <source>Cannot initialize keypool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> + <location filename="../bitcoinstrings.cpp" line="124"/> <source>Cannot write default address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> + <location filename="../bitcoinstrings.cpp" line="125"/> <source>Rescanning...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> + <location filename="../bitcoinstrings.cpp" line="126"/> <source>Done loading</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> + <location filename="../bitcoinstrings.cpp" line="128"/> <source>Invalid amount for -paytxfee=<amount></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> + <location filename="../bitcoinstrings.cpp" line="129"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="96"/> + <location filename="../bitcoinstrings.cpp" line="133"/> <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../bitcoinstrings.cpp" line="99"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation type="unfinished"></translation> - </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts index 876eeedf5e..4dc05498b8 100644 --- a/src/qt/locale/bitcoin_es.ts +++ b/src/qt/locale/bitcoin_es.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> versión</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -68,6 +68,16 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>Copiar la dirección seleccionada al portapapeles</translation> </message> <message> + <location filename="../forms/addressbookpage.ui" line="85"/> + <source>Show &QR Code</source> + <translation>Mostrar código &QR </translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="96"/> + <source>Sign a message to prove you own this address</source> + <translation>Firme un mensaje para demostrar que posee una dirección Bitcoin</translation> + </message> + <message> <location filename="../forms/addressbookpage.ui" line="99"/> <source>Sign &Message</source> <translation>Firmar &mensaje...</translation> @@ -88,52 +98,42 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>&Copiar al portapapeles</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="85"/> - <source>Show &QR Code</source> - <translation>Mostrar código &QR </translation> - </message> - <message> - <location filename="../forms/addressbookpage.ui" line="96"/> - <source>Sign a message to prove you own this address</source> - <translation>Firme un mensaje para demostrar que posee una dirección Bitcoin</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>Error al exportar</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="286"/> + <source>Comma separated file (*.csv)</source> + <translation>Archivos de columnas separadas por coma (*.csv)</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>Copia dirección</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation>Copiar etiqueta</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="67"/> + <source>Edit</source> + <translation type="unfinished">Editar</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>Borrar</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> - <translation>Exportar datos de la libreta de direcciones</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="63"/> - <source>Edit</source> - <translation type="unfinished">Editar</translation> + <translation>Exporta datos de la Guia de direcciones</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> - <source>Comma separated file (*.csv)</source> - <translation>Archivos de columnas separadas por coma (*.csv)</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation>No se pudo escribir en el archivo %1.</translation> </message> @@ -141,6 +141,11 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <context> <name>AddressTableModel</name> <message> + <location filename="../addresstablemodel.cpp" line="114"/> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> + <message> <location filename="../addresstablemodel.cpp" line="78"/> <source>Label</source> <translation>Etiqueta</translation> @@ -150,18 +155,18 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <source>Address</source> <translation>Dirección</translation> </message> - <message> - <location filename="../addresstablemodel.cpp" line="114"/> - <source>(no label)</source> - <translation>(sin etiqueta)</translation> - </message> </context> <context> <name>AskPassphraseDialog</name> <message> - <location filename="../forms/askpassphrasedialog.ui" line="61"/> - <source>New passphrase</source> - <translation>Nueva contraseña</translation> + <location filename="../forms/askpassphrasedialog.ui" line="26"/> + <source>Dialog</source> + <translation>Cambiar contraseña</translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="47"/> + <source>Enter passphrase</source> + <translation>Contraseña actual </translation> </message> <message> <location filename="../forms/askpassphrasedialog.ui" line="75"/> @@ -169,25 +174,41 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>Repita la nueva contraseña</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="94"/> - <source>TextLabel</source> - <translation>Cambiar contraseña:</translation> + <location filename="../askpassphrasedialog.cpp" line="46"/> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Para descifrar el monedero esta operación necesita de su contraseña.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="134"/> - <location filename="../askpassphrasedialog.cpp" line="182"/> - <source>The supplied passphrases do not match.</source> - <translation>Las contraseñas no coinciden.</translation> + <location filename="../forms/askpassphrasedialog.ui" line="61"/> + <source>New passphrase</source> + <translation>Nueva contraseña</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="34"/> - <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>Introduzca la nueva contraseña del monedero.<br/>Por favor elija una con <b>10 o más caracteres aleatorios</b> u <b>ocho o más palabras</b>.</translation> + <location filename="../askpassphrasedialog.cpp" line="51"/> + <source>Decrypt wallet</source> + <translation>Descifrar monedero</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="46"/> - <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>Para descifrar el monedero esta operación necesita de su contraseña.</translation> + <location filename="../askpassphrasedialog.cpp" line="54"/> + <source>Change passphrase</source> + <translation>Cambiar contraseña</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="55"/> + <source>Enter the old and new passphrase to the wallet.</source> + <translation>Introduzca la contraseña anterior del monedero y la nueva. </translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="117"/> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>IMPORTANTE: Cualquier copia de seguridad que haya realizado previamente de su fichero de billetera debe reemplazarse con el fichero de billetera encriptado recientemente creado. Por razones de seguridad, las copias de seguridad previas del fichero de billetera que no estaban encriptadas pasarán a estar inservibles en cuanto comience a usar la nueva billetera encriptada.</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="146"/> + <location filename="../askpassphrasedialog.cpp" line="157"/> + <location filename="../askpassphrasedialog.cpp" line="176"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>La contraseña introducida para descifrar el monedero es incorrecta.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="156"/> @@ -195,30 +216,25 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>Ha fallado el descifrado del monedero</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="47"/> - <source>Enter passphrase</source> - <translation>Contraseña actual </translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="55"/> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Introduzca la contraseña anterior del monedero y la nueva. </translation> + <location filename="../askpassphrasedialog.cpp" line="170"/> + <source>Wallet passphrase was successfully changed.</source> + <translation>La contraseña de cartera ha sido cambiada con exit.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="111"/> - <location filename="../askpassphrasedialog.cpp" line="169"/> - <source>Wallet encrypted</source> - <translation>Monedero cifrado</translation> + <location filename="../askpassphrasedialog.cpp" line="217"/> + <location filename="../askpassphrasedialog.cpp" line="241"/> + <source>Warning: The Caps Lock key is on.</source> + <translation>Aviso: ¡La tecla de bloqueo de mayúsculas está activada!</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="26"/> - <source>Dialog</source> - <translation>Cambiar contraseña</translation> + <location filename="../askpassphrasedialog.cpp" line="38"/> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Para desbloquear el monedero esta operación necesita de su contraseña.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="54"/> - <source>Change passphrase</source> - <translation>Cambiar contraseña</translation> + <location filename="../askpassphrasedialog.cpp" line="34"/> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>Introduzca la nueva contraseña del monedero.<br/>Por favor elija una con <b>10 o más caracteres aleatorios</b> u <b>ocho o más palabras</b>.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="35"/> @@ -226,19 +242,21 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>Cifrar el monedero</translation> </message> <message> + <location filename="../forms/askpassphrasedialog.ui" line="94"/> + <source>TextLabel</source> + <translation>Cambiar contraseña:</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="43"/> + <source>Unlock wallet</source> + <translation>Desbloquear monedero</translation> + </message> + <message> <location filename="../askpassphrasedialog.cpp" line="101"/> <source>Confirm wallet encryption</source> <translation>Confirmar cifrado del monedero</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="126"/> - <location filename="../askpassphrasedialog.cpp" line="133"/> - <location filename="../askpassphrasedialog.cpp" line="175"/> - <location filename="../askpassphrasedialog.cpp" line="181"/> - <source>Wallet encryption failed</source> - <translation>Ha fallado el cifrado del monedero</translation> - </message> - <message> <location filename="../askpassphrasedialog.cpp" line="113"/> <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> <translation>Bitcoin cerrará al finalizar el proceso de cifrado. Recuerde que el cifrado de su monedero no puede proteger totalmente sus bitcoin de ser robados por el malware que infecte su sistema.</translation> @@ -249,21 +267,6 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>Ha fallado el desbloqueo del monedero</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="38"/> - <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>Para desbloquear el monedero esta operación necesita de su contraseña.</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="43"/> - <source>Unlock wallet</source> - <translation>Desbloquear monedero</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="51"/> - <source>Decrypt wallet</source> - <translation>Descifrar monedero</translation> - </message> - <message> <location filename="../askpassphrasedialog.cpp" line="102"/> <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! Are you sure you wish to encrypt your wallet?</source> @@ -271,237 +274,218 @@ Are you sure you wish to encrypt your wallet?</source> ¿Seguro que quieres seguir encriptando la cartera?</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="117"/> - <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation>IMPORTANTE: Cualquier copia de seguridad que haya realizado previamente de su fichero de billetera debe reemplazarse con el fichero de billetera encriptado recientemente creado. Por razones de seguridad, las copias de seguridad previas del fichero de billetera que no estaban encriptadas pasarán a estar inservibles en cuanto comience a usar la nueva billetera encriptada.</translation> - </message> - <message> <location filename="../askpassphrasedialog.cpp" line="127"/> <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> <translation>Ha fallado el cifrado del monedero debido a un error interno. El monedero no ha sido cifrado.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="146"/> - <location filename="../askpassphrasedialog.cpp" line="157"/> - <location filename="../askpassphrasedialog.cpp" line="176"/> - <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation>La contraseña introducida para descifrar el monedero es incorrecta.</translation> + <location filename="../askpassphrasedialog.cpp" line="134"/> + <location filename="../askpassphrasedialog.cpp" line="182"/> + <source>The supplied passphrases do not match.</source> + <translation>Las contraseñas no coinciden.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="170"/> - <source>Wallet passphrase was successfully changed.</source> - <translation>La contraseña de cartera ha sido cambiada con exit.</translation> + <location filename="../askpassphrasedialog.cpp" line="126"/> + <location filename="../askpassphrasedialog.cpp" line="133"/> + <location filename="../askpassphrasedialog.cpp" line="175"/> + <location filename="../askpassphrasedialog.cpp" line="181"/> + <source>Wallet encryption failed</source> + <translation>Ha fallado el cifrado del monedero</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="217"/> - <location filename="../askpassphrasedialog.cpp" line="241"/> - <source>Warning: The Caps Lock key is on.</source> - <translation>Aviso: ¡La tecla de bloqueo de mayúsculas está activada!</translation> + <location filename="../askpassphrasedialog.cpp" line="111"/> + <location filename="../askpassphrasedialog.cpp" line="169"/> + <source>Wallet encrypted</source> + <translation>Monedero cifrado</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="188"/> - <source>Show general overview of wallet</source> - <translation>Mostrar vista general del monedero</translation> + <location filename="../bitcoingui.cpp" line="198"/> + <source>Edit the list of stored addresses and labels</source> + <translation>Editar la lista de las direcciones y etiquetas almacenadas</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> - <source>&Transactions</source> - <translation>&Transacciones</translation> + <location filename="../bitcoingui.cpp" line="245"/> + <source>&Options...</source> + <translation>&Opciones...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> - <source>&Receive coins</source> - <translation>&Recibir monedas</translation> + <location filename="../bitcoingui.cpp" line="250"/> + <source>&Export...</source> + <translation>&Exportar…</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> - <source>Synchronizing with network...</source> - <translation>Sincronizando con la red…</translation> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Send coins to a bitcoin address</source> + <translation>Envia monedas a una dirección bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> - <source>Browse transaction history</source> - <translation>Examinar el historial de transacciones</translation> + <location filename="../bitcoingui.cpp" line="296"/> + <source>&Help</source> + <translation>A&yuda</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>S&obre %1</translation> + <location filename="../bitcoingui.cpp" line="327"/> + <source>[testnet]</source> + <translation>[testnet]</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="73"/> - <source>Bitcoin Wallet</source> - <translation>Cartera Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="192"/> + <source>Browse transaction history</source> + <translation>Examinar el historial de transacciones</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Sincronización cadena de bloques en progreso</translation> + <location filename="../bitcoingui.cpp" line="191"/> + <source>&Transactions</source> + <translation>&Transacciones</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> - <source>&Address Book</source> - <translation>&Libreta de direcciones</translation> + <location filename="../bitcoingui.cpp" line="209"/> + <source>&Send coins</source> + <translation>&Enviar monedas</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> - <source>Edit the list of stored addresses and labels</source> - <translation>Editar la lista de las direcciones y etiquetas almacenadas</translation> + <location filename="../bitcoingui.cpp" line="235"/> + <source>E&xit</source> + <translation>&Salir</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="236"/> + <source>Quit application</source> + <translation>Salir de la aplicación</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation>Mostrar la lista de direcciones utilizadas para recibir pagos</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> - <source>Send coins to a bitcoin address</source> - <translation>Envia monedas a una dirección bitcoin</translation> + <location filename="../bitcoingui.cpp" line="71"/> + <source>Bitcoin Wallet</source> + <translation>Cartera Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> - <source>Show information about Bitcoin</source> - <translation>Mostrar información acerca de Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation>&Cambiar la contraseña</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> - <source>&Send coins</source> - <translation>&Enviar monedas</translation> + <location filename="../bitcoingui.cpp" line="186"/> + <source>Show general overview of wallet</source> + <translation>Mostrar vista general del monedero</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="187"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>&Overview</source> <translation>&Vista general</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> - <source>Prove you control an address</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="237"/> - <source>E&xit</source> - <translation>&Salir</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="238"/> - <source>Quit application</source> - <translation>Salir de la aplicación</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>Modifica opciones de configuración</translation> + <location filename="../bitcoingui.cpp" line="240"/> + <source>Show information about Bitcoin</source> + <translation>Mostrar información acerca de Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>Abre &Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="243"/> + <source>Show information about Qt</source> + <translation>Mostrar información acerca de Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Muestra la ventana de Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="197"/> + <source>&Address Book</source> + <translation>&Libreta de direcciones</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> - <translation>&Exporta...</translation> + <location filename="../bitcoingui.cpp" line="203"/> + <source>&Receive coins</source> + <translation>&Recibir monedas</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation>&Encriptar cartera</translation> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation>Mostrar/ocultar &Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> - <source>&Backup Wallet</source> - <translation>Copia de &respaldo del monedero...</translation> + <location filename="../bitcoingui.cpp" line="290"/> + <source>&Settings</source> + <translation>&Configuración</translation> </message> - <message> - <location filename="../bitcoingui.cpp" line="258"/> - <source>Backup wallet to another location</source> - <translation>Copia de seguridad del monedero en otra ubicación</translation> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="482"/> + <source>%n active connection(s) to Bitcoin network</source> + <translation> + <numerusform>%n conexión activa hacia la red Bitcoin</numerusform> + <numerusform>%n conexiones activas hacia la red Bitcoin</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> - <source>&File</source> - <translation>&Archivo</translation> + <location filename="../bitcoingui.cpp" line="632"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> - <source>&Settings</source> - <translation>&Configuración</translation> + <location filename="../bitcoingui.cpp" line="824"/> + <source>There was an error trying to save the wallet data to the new location.</source> + <translation>Ha habido un error al intentar guardar los datos del monedero a la nueva ubicación.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> + <location filename="../bitcoingui.cpp" line="303"/> <source>Tabs toolbar</source> <translation>Barra de pestañas</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> - <source>Actions toolbar</source> - <translation>Barra de acciones</translation> + <location filename="../bitcoingui.cpp" line="531"/> + <source>Downloaded %1 blocks of transaction history.</source> + <translation>Se han bajado %1 bloques de historial.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> - <source>Show information about Qt</source> - <translation>Mostrar información acerca de Qt</translation> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation>cliente Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> - <source>Downloaded %1 blocks of transaction history.</source> - <translation>Se han bajado %1 bloques de historial.</translation> + <location filename="../bitcoingui.cpp" line="256"/> + <source>Backup wallet to another location</source> + <translation>Copia de seguridad del monedero en otra ubicación</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="255"/> - <source>Encrypt or decrypt wallet</source> - <translation>Cifrar o descifrar el monedero</translation> + <location filename="../bitcoingui.cpp" line="258"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>Cambiar la contraseña utilizada para el cifrado del monedero</translation> </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> - <source>%n active connection(s) to Bitcoin network</source> - <translation> - <numerusform>%n conexión activa hacia la red Bitcoin</numerusform> - <numerusform>%n conexiones activas hacia la red Bitcoin</numerusform> - </translation> + <message> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>Descargado %1 de %2 bloques del historial de transacciones (%3% hecho).</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> - <source>Export the data in the current tab to a file</source> - <translation>Exportar a un archivo los datos de esta pestaña</translation> + <location filename="../bitcoingui.cpp" line="281"/> + <source>&File</source> + <translation>&Archivo</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> + <location filename="../bitcoingui.cpp" line="215"/> <source>Sign &message</source> <translation>Firmar &mensaje...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> - <source>There was an error trying to save the wallet data to the new location.</source> - <translation>Ha habido un error al intentar guardar los datos del monedero a la nueva ubicación.</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="244"/> - <source>About &Qt</source> - <translation>Acerca de &Qt</translation> + <location filename="../bitcoingui.cpp" line="216"/> + <source>Prove you control an address</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> - <source>&Options...</source> - <translation>&Opciones...</translation> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>S&obre %1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>Se han bajado %1 de %2 bloques de historial.</translation> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>Modifica opciones de configuración</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation> <numerusform>hace %n segundo</numerusform> @@ -509,7 +493,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation> <numerusform>hace %n minuto</numerusform> @@ -517,7 +501,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation> <numerusform>hace %n hora</numerusform> @@ -525,7 +509,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>hace %n día</numerusform> @@ -533,32 +517,32 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation>Actualizado</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>Recuperando...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation>El último bloque recibido fue generado %1.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> + <location filename="../bitcoingui.cpp" line="663"/> <source>Sent transaction</source> <translation>Transacción enviada</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> + <location filename="../bitcoingui.cpp" line="664"/> <source>Incoming transaction</source> <translation>Transacción entrante</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -570,67 +554,90 @@ Tipo: %3 Dirección: %4</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>&Cambiar la contraseña</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="260"/> - <source>Change the passphrase used for wallet encryption</source> - <translation>Cambiar la contraseña utilizada para el cifrado del monedero</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="615"/> - <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="251"/> + <source>Export the data in the current tab to a file</source> + <translation>Exportar a un archivo los datos de esta pestaña</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>El monedero está <b>cifrado</b> y actualmente <b>desbloqueado</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>El monedero está <b>cifrado</b> y actualmente <b>bloqueado</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> - <source>&Help</source> - <translation>A&yuda</translation> + <location filename="../bitcoingui.cpp" line="253"/> + <source>Encrypt or decrypt wallet</source> + <translation>Cifrar o descifrar el monedero</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation>Mostrar u ocultar la ventana Bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="255"/> + <source>&Backup Wallet</source> + <translation>Copia de &respaldo del monedero...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="821"/> <source>Backup Wallet</source> <translation>Copia de seguridad del monedero</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation>Datos del monedero (*.dat)</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> - <source>[testnet]</source> - <translation>[testnet]</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="807"/> - <source>Backup Failed</source> - <translation>La copia de seguridad ha fallado</translation> + <location filename="../bitcoingui.cpp" line="314"/> + <source>Actions toolbar</source> + <translation>Barra de acciones</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> + <location filename="../bitcoingui.cpp" line="418"/> <source>bitcoin-qt</source> <translation>bitcoin-qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> + <location filename="../bitcoingui.cpp" line="506"/> + <source>Synchronizing with network...</source> + <translation>Sincronizando con la red…</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation> + <numerusform>~%n bloque restante</numerusform> + <numerusform>~%n bloques restantes</numerusform> + </translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="824"/> + <source>Backup Failed</source> + <translation>La copia de seguridad ha fallado</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="636"/> <source>Sending...</source> <translation>Enviando...</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoingui.cpp" line="252"/> + <source>&Encrypt Wallet</source> + <translation>&Encriptar cartera</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="242"/> + <source>About &Qt</source> + <translation>Acerca de &Qt</translation> + </message> + <message> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Ha ocurrido un error crítico. Bitcoin ya no puede continuar con seguridad y se cerrará.</translation> </message> @@ -638,22 +645,22 @@ Dirección: %4</translation> <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> - <source>&Unit to show amounts in: </source> - <translation>&Unidad en la que mostrar cantitades: </translation> + <location filename="../optionsdialog.cpp" line="277"/> + <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> + <translation>Elige la subdivisión por defecto para mostrar cantidaded en la interfaz cuando se envien monedas</translation> </message> <message> <location filename="../optionsdialog.cpp" line="273"/> - <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> - <translation>Elige la subdivisión por defecto para mostrar cantidaded en la interfaz cuando se envien monedas</translation> + <source>&Unit to show amounts in: </source> + <translation>&Unidad en la que mostrar cantitades: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&Muestra direcciones en el listado de movimientos</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished">Mostrar las direcciones Bitcoin en la lista de transacciones</translation> </message> @@ -701,16 +708,6 @@ Dirección: %4</translation> <translation>Editar dirección de recepción</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="31"/> - <source>Edit sending address</source> - <translation>Editar dirección de envio</translation> - </message> - <message> - <location filename="../editaddressdialog.cpp" line="91"/> - <source>The entered address "%1" is already in the address book.</source> - <translation>La dirección introducida "%1" ya está presente en la libreta de direcciones.</translation> - </message> - <message> <location filename="../editaddressdialog.cpp" line="101"/> <source>Could not unlock wallet.</source> <translation>No se pudo desbloquear el monedero.</translation> @@ -721,6 +718,16 @@ Dirección: %4</translation> <translation>Ha fallado la generación de la nueva clave.</translation> </message> <message> + <location filename="../editaddressdialog.cpp" line="31"/> + <source>Edit sending address</source> + <translation>Editar dirección de envio</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="91"/> + <source>The entered address "%1" is already in the address book.</source> + <translation>La dirección introducida "%1" ya está presente en la libreta de direcciones.</translation> + </message> + <message> <location filename="../editaddressdialog.cpp" line="96"/> <source>The entered address "%1" is not a valid bitcoin address.</source> <translation>La dirección introducida "%1" no es una dirección Bitcoin valida.</translation> @@ -729,119 +736,117 @@ Dirección: %4</translation> <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>&Puerto:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>&Arranca Bitcoin al iniciar el sistema</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Arranca Bitcoin cuando se encienda el ordenador</translation> </message> <message> <location filename="../optionsdialog.cpp" line="176"/> + <source>&Minimize to the tray instead of the taskbar</source> + <translation>&Minimiza a la bandeja en vez de la barra de tareas</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>Muestra solo el icono de sistema cuando se minimize la ventana</translation> </message> <message> <location filename="../optionsdialog.cpp" line="180"/> - <source>Map port using &UPnP</source> - <translation>Mapea el puerto usando &UPnP</translation> + <source>M&inimize on close</source> + <translation>M&inimiza a la bandeja al cerrar</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="186"/> + <location filename="../optionsdialog.cpp" line="181"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>Minimiza la ventana en lugar de salir de la aplicación.Cuando esta opcion esta activa la aplicación solo se puede cerrar seleccionando Salir desde el menu.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="181"/> - <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> - <translation>Intenta abrir el puerto adecuado en el router automaticamente. Esta opcion solo funciona si el router soporta UPnP y esta activado.</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="175"/> - <source>&Minimize to the tray instead of the taskbar</source> - <translation>&Minimiza a la bandeja en vez de la barra de tareas</translation> - </message> - <message> <location filename="../optionsdialog.cpp" line="185"/> - <source>M&inimize on close</source> - <translation>M&inimiza a la bandeja al cerrar</translation> + <source>Map port using &UPnP</source> + <translation>Mapea el puerto usando &UPnP</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>&Conecta atraves de un proxy SOCKS4:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> - <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> - <translation>Conecta a la red Bitcoin atraves de un proxy SOCKS4 (ej. para conectar con la red Tor)</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>&IP Proxy:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>Dirección IP del proxy (ej. 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Puerto del servidor proxy (ej. 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>Tarifa de transacción por kB opcional que ayuda a asegurarse de que sus transacciones se procesan rápidamente. La mayoría de las transacciones son de 1 KB. Tarifa de 0,01 recomendado.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>Comision de &transacciónes</translation> </message> -</context> -<context> - <name>MessagePage</name> <message> - <location filename="../forms/messagepage.ui" line="120"/> - <source>&Sign Message</source> - <translation>&Firme mensaje</translation> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation>Desconectar las bases de datos al cerrar la aplicación</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="131"/> - <source>Copy the current signature to the system clipboard</source> - <translation>Copiar la firma actual al portapapeles del sistema</translation> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation>Desconectar las bases de datos de bloques y direcciones al cerrar la aplicación. Implica que pueden moverse a otros directorios de datos pero ralentiza el cierre. El monedero siempre queda desconectado.</translation> </message> <message> - <location filename="../messagepage.cpp" line="74"/> - <source>%1 is not a valid address.</source> - <translation type="unfinished">La dirección introducida "%1" no es una dirección Bitcoin válida.</translation> + <location filename="../optionsdialog.cpp" line="186"/> + <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> + <translation>Intenta abrir el puerto adecuado en el router automaticamente. Esta opcion solo funciona si el router soporta UPnP y esta activado.</translation> </message> <message> - <location filename="../messagepage.cpp" line="74"/> - <location filename="../messagepage.cpp" line="89"/> - <location filename="../messagepage.cpp" line="101"/> - <source>Error signing</source> - <translation type="unfinished">Error</translation> + <location filename="../optionsdialog.cpp" line="190"/> + <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> + <translation>Conecta a la red Bitcoin atraves de un proxy SOCKS4 (ej. para conectar con la red Tor)</translation> </message> +</context> +<context> + <name>MessagePage</name> <message> - <location filename="../messagepage.cpp" line="89"/> - <source>Private key for %1 is not available.</source> - <translation type="unfinished"></translation> + <location filename="../forms/messagepage.ui" line="71"/> + <source>Paste address from clipboard</source> + <translation>Pega dirección desde portapapeles</translation> </message> <message> - <location filename="../messagepage.cpp" line="101"/> - <source>Sign failed</source> - <translation type="unfinished"></translation> + <location filename="../forms/messagepage.ui" line="81"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="93"/> + <source>Enter the message you want to sign here</source> + <translation>Introduzca el mensaje que desea firmar aquí</translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="134"/> + <source>&Copy to Clipboard</source> + <translation>&Copiar al portapapeles</translation> </message> <message> <location filename="../forms/messagepage.ui" line="14"/> @@ -869,21 +874,6 @@ Dirección: %4</translation> <translation>Alt+A</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="71"/> - <source>Paste address from clipboard</source> - <translation>Pega dirección desde portapapeles</translation> - </message> - <message> - <location filename="../forms/messagepage.ui" line="81"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../forms/messagepage.ui" line="93"/> - <source>Enter the message you want to sign here</source> - <translation>Introduzca el mensaje que desea firmar aquí</translation> - </message> - <message> <location filename="../forms/messagepage.ui" line="105"/> <source>Click "Sign Message" to get signature</source> <translation>Haga clic en "Firmar mensaje" para generar la firma</translation> @@ -894,42 +884,59 @@ Dirección: %4</translation> <translation>Firme un mensaje para demostrar que posee una dirección Bitcoin</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="134"/> - <source>&Copy to Clipboard</source> - <translation>&Copiar al portapapeles</translation> + <location filename="../forms/messagepage.ui" line="120"/> + <source>&Sign Message</source> + <translation>&Firme mensaje</translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="131"/> + <source>Copy the current signature to the system clipboard</source> + <translation>Copiar la firma actual al portapapeles del sistema</translation> + </message> + <message> + <location filename="../messagepage.cpp" line="74"/> + <source>%1 is not a valid address.</source> + <translation type="unfinished">La dirección introducida "%1" no es una dirección Bitcoin válida.</translation> + </message> + <message> + <location filename="../messagepage.cpp" line="74"/> + <location filename="../messagepage.cpp" line="89"/> + <location filename="../messagepage.cpp" line="101"/> + <source>Error signing</source> + <translation type="unfinished">Error</translation> + </message> + <message> + <location filename="../messagepage.cpp" line="89"/> + <source>Private key for %1 is not available.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../messagepage.cpp" line="101"/> + <source>Sign failed</source> + <translation type="unfinished"></translation> </message> </context> <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="105"/> + <source>Options</source> + <translation>Opciones</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>Principal</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>Mostrado</translation> </message> - <message> - <location filename="../optionsdialog.cpp" line="104"/> - <source>Options</source> - <translation>Opciones</translation> - </message> </context> <context> <name>OverviewPage</name> <message> - <location filename="../forms/overviewpage.ui" line="14"/> - <source>Form</source> - <translation>Desde</translation> - </message> - <message> - <location filename="../forms/overviewpage.ui" line="88"/> - <source>Wallet</source> - <translation>Monedero</translation> - </message> - <message> <location filename="../forms/overviewpage.ui" line="40"/> <source>Balance:</source> <translation>Saldo:</translation> @@ -940,9 +947,9 @@ Dirección: %4</translation> <translation>Número de movimientos:</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="61"/> - <source>0</source> - <translation>0</translation> + <location filename="../overviewpage.cpp" line="111"/> + <source>Total number of transactions in wallet</source> + <translation>Número total de movimientos en el monedero</translation> </message> <message> <location filename="../forms/overviewpage.ui" line="68"/> @@ -950,6 +957,21 @@ Dirección: %4</translation> <translation>No confirmado(s):</translation> </message> <message> + <location filename="../forms/overviewpage.ui" line="14"/> + <source>Form</source> + <translation>Desde</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="61"/> + <source>0</source> + <translation>0</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="88"/> + <source>Wallet</source> + <translation>Monedero</translation> + </message> + <message> <location filename="../forms/overviewpage.ui" line="124"/> <source><b>Recent transactions</b></source> <translation><b>Movimientos recientes</b></translation> @@ -964,21 +986,16 @@ Dirección: %4</translation> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> <translation>Total de las transacciones que faltan por confirmar y que no se cuentan para el total general</translation> </message> - <message> - <location filename="../overviewpage.cpp" line="111"/> - <source>Total number of transactions in wallet</source> - <translation>Número total de movimientos en el monedero</translation> - </message> </context> <context> <name>QRCodeDialog</name> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation>Error al codificar la URI en el código QR.</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation type="unfinished"></translation> </message> @@ -988,19 +1005,14 @@ Dirección: %4</translation> <translation>Solicitud de pago</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="121"/> - <source>Label:</source> - <translation>Label:</translation> - </message> - <message> <location filename="../forms/qrcodedialog.ui" line="186"/> <source>&Save As...</source> <translation>&Guardar Como ...</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="14"/> - <source>Dialog</source> - <translation>Cambiar contraseña</translation> + <location filename="../forms/qrcodedialog.ui" line="144"/> + <source>Message:</source> + <translation>Mensaje:</translation> </message> <message> <location filename="../forms/qrcodedialog.ui" line="32"/> @@ -1008,42 +1020,47 @@ Dirección: %4</translation> <translation type="unfinished">Código QR</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="70"/> - <source>Amount:</source> - <translation>Cuantía:</translation> - </message> - <message> <location filename="../forms/qrcodedialog.ui" line="105"/> <source>BTC</source> <translation></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>URI demasiado larga, trata de reducir el texto de la etiqueta / mensaje.</translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation>Imágenes PNG (*.png)</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="144"/> - <source>Message:</source> - <translation>Mensaje:</translation> + <location filename="../forms/qrcodedialog.ui" line="14"/> + <source>Dialog</source> + <translation>Cambiar contraseña</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="70"/> + <source>Amount:</source> + <translation>Cuantía:</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="121"/> + <source>Label:</source> + <translation>Label:</translation> </message> </context> <context> <name>SendCoinsDialog</name> <message> - <location filename="../forms/sendcoinsdialog.ui" line="113"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="144"/> - <source>Confirm the send action</source> - <translation>Confirma el envío</translation> + <location filename="../sendcoinsdialog.cpp" line="95"/> + <source><b>%1</b> to %2 (%3)</source> + <translation><b>%1</b> to %2 (%3)</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="106"/> - <source>Balance:</source> - <translation>Saldo:</translation> + <location filename="../forms/sendcoinsdialog.ui" line="87"/> + <source>Clear all</source> + <translation>&Borra todos</translation> </message> <message> <location filename="../forms/sendcoinsdialog.ui" line="14"/> @@ -1058,24 +1075,24 @@ Dirección: %4</translation> <translation>Envía monedas</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="95"/> - <source><b>%1</b> to %2 (%3)</source> - <translation><b>%1</b> to %2 (%3)</translation> + <location filename="../forms/sendcoinsdialog.ui" line="64"/> + <source>Send to multiple recipients at once</source> + <translation>Envía a multiples destinatarios de una vez</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="100"/> - <source>Confirm send coins</source> - <translation>Confirmar el envío de monedas</translation> + <location filename="../forms/sendcoinsdialog.ui" line="67"/> + <source>&Add recipient...</source> + <translation>&Agrega destinatario...</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="139"/> - <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation>El total sobrepasa su saldo cuando se incluye la tasa de envío de %1</translation> + <location filename="../forms/sendcoinsdialog.ui" line="106"/> + <source>Balance:</source> + <translation>Saldo:</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="64"/> - <source>Send to multiple recipients at once</source> - <translation>Envía a multiples destinatarios de una vez</translation> + <location filename="../forms/sendcoinsdialog.ui" line="147"/> + <source>S&end</source> + <translation>&Envía</translation> </message> <message> <location filename="../forms/sendcoinsdialog.ui" line="84"/> @@ -1083,14 +1100,19 @@ Dirección: %4</translation> <translation>Eliminar todos los campos de las transacciones</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="87"/> - <source>Clear all</source> - <translation>&Borra todos</translation> + <location filename="../forms/sendcoinsdialog.ui" line="113"/> + <source>123.456 BTC</source> + <translation>123.456 BTC</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="147"/> - <source>S&end</source> - <translation>&Envía</translation> + <location filename="../forms/sendcoinsdialog.ui" line="144"/> + <source>Confirm the send action</source> + <translation>Confirma el envío</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="100"/> + <source>Confirm send coins</source> + <translation>Confirmar el envío de monedas</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="101"/> @@ -1118,6 +1140,11 @@ Dirección: %4</translation> <translation>La cantidad sobrepasa su saldo.</translation> </message> <message> + <location filename="../sendcoinsdialog.cpp" line="139"/> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>El total sobrepasa su saldo cuando se incluye la tasa de envío de %1</translation> + </message> + <message> <location filename="../sendcoinsdialog.cpp" line="150"/> <source>Error: Transaction creation failed.</source> <translation>Error: ha fallado la creación de transacción.</translation> @@ -1128,11 +1155,6 @@ Dirección: %4</translation> <translation>Error: transacción rechazada. 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 así aquí.</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="67"/> - <source>&Add recipient...</source> - <translation>&Agrega destinatario...</translation> - </message> - <message> <location filename="../sendcoinsdialog.cpp" line="145"/> <source>Duplicate address found, can only send to each address once per send operation.</source> <translation>Tienes una dirección duplicada, solo puedes enviar a direcciónes individuales de una sola vez.</translation> @@ -1205,166 +1227,161 @@ Dirección: %4</translation> <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="30"/> - <source>%1 confirmations</source> - <translation>%1 confirmaciones</translation> + <location filename="../transactiondesc.cpp" line="55"/> + <source>, has not been successfully broadcast yet</source> + <translation>, no ha sido emitido satisfactoriamente todavía</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> + <location filename="../transactiondesc.cpp" line="92"/> + <source>unknown</source> + <translation>desconocido</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="22"/> <source>Open until %1</source> <translation>Abierto hasta %1</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="18"/> + <location filename="../transactiondesc.cpp" line="20"/> <source>Open for %1 blocks</source> <translation>Abierto hasta %1 bloques</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation>%1/fuera de linea?</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="30"/> + <source>%1/unconfirmed</source> + <translation>%1/no confirmado</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation><b>Estado:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>, emitido mediante %1 nodo</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>, emitido mediante %1 nodos</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation><b>Fecha:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>Fuente:</b> Generado<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>De:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation><b>Para:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation>(tuya, etiqueta: </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation> (tuya)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation><b>Crédito:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation>(%1 madura en %2 bloques mas)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> - <source><b>Debit:</b> </source> - <translation><b>Débito:</b> </translation> + <location filename="../transactiondesc.cpp" line="139"/> + <source>(not accepted)</source> + <translation>(no aceptada)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation><b>Comisión transacción:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>Cantidad total:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>Mensaje:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>Comentario:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation>Identificador de transacción:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation>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 las monedas no se podrán gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque casi al mismo tiempo que el tuyo.</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="28"/> - <source>%1/unconfirmed</source> - <translation>%1/no confirmado</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="52"/> - <source>, has not been successfully broadcast yet</source> - <translation>, no ha sido emitido satisfactoriamente todavía</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="89"/> - <source>unknown</source> - <translation>desconocido</translation> + <location filename="../transactiondesc.cpp" line="32"/> + <source>%1 confirmations</source> + <translation>%1 confirmaciones</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> - <source>(not accepted)</source> - <translation>(no aceptada)</translation> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> + <source><b>Debit:</b> </source> + <translation><b>Débito:</b> </translation> </message> </context> <context> <name>TransactionDescDialog</name> <message> - <location filename="../forms/transactiondescdialog.ui" line="20"/> - <source>This pane shows a detailed description of the transaction</source> - <translation>Esta ventana muestra información detallada sobre la transacción</translation> - </message> - <message> <location filename="../forms/transactiondescdialog.ui" line="14"/> <source>Transaction details</source> <translation>Detalles de transacción</translation> </message> + <message> + <location filename="../forms/transactiondescdialog.ui" line="20"/> + <source>This pane shows a detailed description of the transaction</source> + <translation>Esta ventana muestra información detallada sobre la transacción</translation> + </message> </context> <context> <name>TransactionTableModel</name> <message> <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Date</source> - <translation>Fecha</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> <source>Type</source> <translation>Tipo</translation> </message> @@ -1378,6 +1395,11 @@ Dirección: %4</translation> <source>Amount</source> <translation>Cantidad</translation> </message> + <message> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Date</source> + <translation>Fecha</translation> + </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="277"/> <source>Open for %n block(s)</source> @@ -1483,10 +1505,14 @@ Dirección: %4</translation> <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="55"/> - <location filename="../transactionview.cpp" line="71"/> - <source>All</source> - <translation>Todo</translation> + <location filename="../transactionview.cpp" line="59"/> + <source>Last month</source> + <translation>Mes pasado</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="271"/> + <source>Comma separated file (*.csv)</source> + <translation>Archivos de columnas separadas por coma (*.csv)</translation> </message> <message> <location filename="../transactionview.cpp" line="281"/> @@ -1504,29 +1530,19 @@ Dirección: %4</translation> <translation>Rango:</translation> </message> <message> - <location filename="../transactionview.cpp" line="126"/> - <source>Copy amount</source> - <translation>Copiar cuantía</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="56"/> - <source>Today</source> - <translation>Hoy</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="57"/> - <source>This week</source> - <translation>Esta semana</translation> + <location filename="../transactionview.cpp" line="279"/> + <source>Confirmed</source> + <translation>Confirmado</translation> </message> <message> - <location filename="../transactionview.cpp" line="58"/> - <source>This month</source> - <translation>Este mes</translation> + <location filename="../transactionview.cpp" line="280"/> + <source>Date</source> + <translation>Fecha</translation> </message> <message> - <location filename="../transactionview.cpp" line="59"/> - <source>Last month</source> - <translation>Mes pasado</translation> + <location filename="../transactionview.cpp" line="282"/> + <source>Label</source> + <translation>Etiqueta</translation> </message> <message> <location filename="../transactionview.cpp" line="60"/> @@ -1544,6 +1560,11 @@ Dirección: %4</translation> <translation>Recibido con</translation> </message> <message> + <location filename="../transactionview.cpp" line="74"/> + <source>Sent to</source> + <translation>Enviado a</translation> + </message> + <message> <location filename="../transactionview.cpp" line="124"/> <source>Copy address</source> <translation>Copiar dirección</translation> @@ -1559,21 +1580,16 @@ Dirección: %4</translation> <translation>Editar etiqueta</translation> </message> <message> - <location filename="../transactionview.cpp" line="76"/> - <source>To yourself</source> - <translation>A ti mismo</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="279"/> - <source>Confirmed</source> - <translation>Confirmado</translation> - </message> - <message> <location filename="../transactionview.cpp" line="78"/> <source>Other</source> <translation>Otra</translation> </message> <message> + <location filename="../transactionview.cpp" line="84"/> + <source>Enter address or label to search</source> + <translation>Introduzca una dirección o etiqueta que buscar</translation> + </message> + <message> <location filename="../transactionview.cpp" line="285"/> <source>ID</source> <translation>ID</translation> @@ -1589,24 +1605,35 @@ Dirección: %4</translation> <translation>No se pudo escribir en el archivo %1.</translation> </message> <message> - <location filename="../transactionview.cpp" line="90"/> - <source>Min amount</source> - <translation>Cantidad mínima</translation> + <location filename="../transactionview.cpp" line="270"/> + <source>Export Transaction Data</source> + <translation>Exportar datos de la transacción</translation> </message> <message> - <location filename="../transactionview.cpp" line="280"/> - <source>Date</source> - <translation>Fecha</translation> + <location filename="../transactionview.cpp" line="284"/> + <source>Amount</source> + <translation>Cantidad</translation> </message> <message> - <location filename="../transactionview.cpp" line="282"/> - <source>Label</source> - <translation>Etiqueta</translation> + <location filename="../transactionview.cpp" line="55"/> + <location filename="../transactionview.cpp" line="71"/> + <source>All</source> + <translation>Todo</translation> </message> <message> - <location filename="../transactionview.cpp" line="284"/> - <source>Amount</source> - <translation>Cantidad</translation> + <location filename="../transactionview.cpp" line="56"/> + <source>Today</source> + <translation>Hoy</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="57"/> + <source>This week</source> + <translation>Esta semana</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="58"/> + <source>This month</source> + <translation>Este mes</translation> </message> <message> <location filename="../transactionview.cpp" line="392"/> @@ -1614,9 +1641,9 @@ Dirección: %4</translation> <translation>para</translation> </message> <message> - <location filename="../transactionview.cpp" line="74"/> - <source>Sent to</source> - <translation>Enviado a</translation> + <location filename="../transactionview.cpp" line="76"/> + <source>To yourself</source> + <translation>A ti mismo</translation> </message> <message> <location filename="../transactionview.cpp" line="77"/> @@ -1624,30 +1651,25 @@ Dirección: %4</translation> <translation>Minado</translation> </message> <message> - <location filename="../transactionview.cpp" line="84"/> - <source>Enter address or label to search</source> - <translation>Introduzca una dirección o etiqueta que buscar</translation> + <location filename="../transactionview.cpp" line="90"/> + <source>Min amount</source> + <translation>Cantidad mínima</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="126"/> + <source>Copy amount</source> + <translation>Copiar cuantía</translation> </message> <message> <location filename="../transactionview.cpp" line="128"/> <source>Show details...</source> <translation>Muestra detalles...</translation> </message> - <message> - <location filename="../transactionview.cpp" line="270"/> - <source>Export Transaction Data</source> - <translation>Exportar datos de la transacción</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="271"/> - <source>Comma separated file (*.csv)</source> - <translation>Archivos de columnas separadas por coma (*.csv)</translation> - </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>Enviando...</translation> </message> @@ -1655,425 +1677,518 @@ Dirección: %4</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Usage:</source> - <translation>Uso:</translation> + <location filename="../bitcoinstrings.cpp" line="41"/> + <source>Bitcoin version</source> + <translation>Versión de Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> - <source>Loading addresses...</source> - <translation>Cargando direcciones...</translation> + <location filename="../bitcoinstrings.cpp" line="115"/> + <source>Loading block index...</source> + <translation>Cargando el índice de bloques...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Loading wallet...</source> + <translation>Cargando monedero...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>Done loading</source> + <translation>Generado pero no aceptado</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="43"/> + <source>Send command to -server or bitcoind</source> + <translation>Envíar comando a -server o bitcoind</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="47"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation>Especifica archivo de configuración (predeterminado: bitcoin.conf) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>Especifica archivo pid (predeterminado: bitcoin.pid) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="54"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation>Establecer el tamaño del caché de la base de datos en megabytes (por defecto: 25)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="60"/> + <source>Maintain at most <n> connections to peers (default: 125)</source> + <translation>Mantener en la mayoría de las conexiones <n> a sus compañeros (por defecto: 125)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="119"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> + <translation>Error al cargar wallet.dat: El monedero requiere una versión más reciente de Bitcoin</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Specify data directory</source> + <translation>Especificar directorio para los datos</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="101"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>Usa OpenSSL (https) para las conexiones JSON-RPC +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> + <source>Fee per KB to add to transactions you send</source> + <translation>Tarifa por KB que añadir a las transacciones que envíe</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Bitcoin version</source> - <translation>Versión de Bitcoin</translation> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">Error: ha fallado la creación de transacción.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">Error: transacción rechazada. 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 así aquí.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="66"/> <source>Find peers using DNS lookup (default: 1)</source> <translation>Encontrar pares mediante búsqueda de DNS (predeterminado: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation>Búfer de recepción máximo por conexión, <n>*1000 bytes (predeterminado: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation>Búfer de recepción máximo por conexión, , <n>*1000 bytes (predeterminado: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> + <location filename="../bitcoinstrings.cpp" line="81"/> <source>Output extra debugging information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="77"/> - <source>Loading block index...</source> - <translation>Cargando el índice de bloques...</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="78"/> - <source>Error loading blkindex.dat</source> - <translation>Error al cargar blkindex.dat</translation> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Prepend debug output with timestamp</source> + <translation>Anteponer la salida de depuración, con indicación de la hora</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> - <source>Error loading wallet.dat: Wallet corrupted</source> - <translation>Error al cargar wallet.dat: el monedero está dañado</translation> + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>Username for JSON-RPC connections</source> + <translation>Usuario para las conexiones JSON-RPC +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation>Error al cargar wallet.dat: El monedero requiere una versión más reciente de Bitcoin</translation> + <location filename="../bitcoinstrings.cpp" line="86"/> + <source>Password for JSON-RPC connections</source> + <translation>Contraseña para las conexiones JSON-RPC +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> - <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation>El monedero ha necesitado ser reescrito. Reinicie Bitcoin para completar el proceso</translation> + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>Escucha conexiones JSON-RPC en el puerto <port> (predeterminado: 8332) +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> - <source>Cannot downgrade wallet</source> - <translation>No se puede rebajar el monedero</translation> + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>Envía comando al nodo situado en <ip> (predeterminado: 127.0.0.1) +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> - <source>Cannot initialize keypool</source> - <translation>No se puede inicializar grupo de teclas</translation> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Upgrade wallet to latest format</source> + <translation>Actualizar el monedero al último formato</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> - <source>Cannot write default address</source> - <translation>No se puede escribir la dirección por defecto</translation> + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation>Volver a examinar la cadena de bloques en busca de transacciones del monedero perdidas</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> - <source>Invalid amount for -paytxfee=<amount></source> - <translation>Cantidad inválida para -paytxfee=<amount></translation> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>How thorough the block verification is (0-6, default: 1)</source> + <translation>Cómo completa la verificación del bloque es (0-6, por defecto: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> + <location filename="../bitcoinstrings.cpp" line="129"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation>Precaución: -paytxfee es muy alta. Esta es la comisión que pagarás si envias una transacción.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation>Error: CreateThread(StartNode) fallido</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> - <translation>Atención: Poco espacio en el disco duro</translation> + <location filename="../bitcoinstrings.cpp" line="102"/> + <source>Server certificate file (default: server.cert)</source> + <translation>Certificado del servidor (Predeterminado: server.cert) +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> - <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> - <translation>No es posible escuchar en el puerto %d en este ordenador. Probablemente Bitcoin ya se está ejecutando.</translation> + <location filename="../bitcoinstrings.cpp" line="103"/> + <source>Server private key (default: server.pem)</source> + <translation>Clave privada del servidor (Predeterminado: server.pem) +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> + <location filename="../bitcoinstrings.cpp" line="38"/> <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> <translation>Precaución: Por favor revisa que la fecha y hora de tu ordenador son correctas. Si tu reloj está mal Bitcoin no funcionará correctamente.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> - <source>Invalid -proxy address</source> - <translation>Dirección -proxy invalida</translation> + <location filename="../bitcoinstrings.cpp" line="107"/> + <source>This help message</source> + <translation>Este mensaje de ayuda +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Get help for a command</source> - <translation>Recibir ayuda para un comando + <location filename="../bitcoinstrings.cpp" line="46"/> + <source>Options:</source> + <translation>Opciones: </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Establecer el tamaño del caché de la base de datos en megabytes (por defecto: 25)</translation> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Maintain at most <n> connections to peers (default: 125)</source> - <translation>Mantener en la mayoría de las conexiones <n> a sus compañeros (por defecto: 125)</translation> + <location filename="../bitcoinstrings.cpp" line="52"/> + <source>Show splash screen on startup (default: 1)</source> + <translation>Mostrar pantalla de bienvenida en el inicio (por defecto: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Send command to -server or bitcoind</source> - <translation>Envíar comando a -server o bitcoind</translation> + <location filename="../bitcoinstrings.cpp" line="114"/> + <source>Error loading addr.dat</source> + <translation>Error cargando addr.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify configuration file (default: bitcoin.conf)</source> - <translation>Especifica archivo de configuración (predeterminado: bitcoin.conf) + <location filename="../bitcoinstrings.cpp" line="58"/> + <source>Allow DNS lookups for addnode and connect</source> + <translation>Permite búsqueda DNS para addnode y connect </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Options:</source> - <translation>Opciones: + <location filename="../bitcoinstrings.cpp" line="62"/> + <source>Connect only to the specified node</source> + <translation>Conecta solo al nodo especificado </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>Especifica archivo pid (predeterminado: bitcoin.pid) -</translation> + <location filename="../bitcoinstrings.cpp" line="64"/> + <source>Accept connections from outside (default: 1)</source> + <translation>Aceptar conexiones desde el exterior (predeterminado: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Generate coins</source> - <translation>Generar monedas</translation> + <location filename="../bitcoinstrings.cpp" line="73"/> + <source>Use Universal Plug and Play to map the listening port (default: 1)</source> + <translation>Usar UPnP para asignar el puerto de escucha (predeterminado: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> - <source>Run in the background as a daemon and accept commands</source> - <translation>Correr como demonio y acepta comandos + <location filename="../bitcoinstrings.cpp" line="98"/> + <source> +SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation>Opciones SSL: (ver la Bitcoin Wiki para instrucciones de configuración SSL) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> - <source>Error loading addr.dat</source> - <translation>Error cargando addr.dat</translation> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Enviando...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Threshold for disconnecting misbehaving peers (default: 100)</source> - <translation>Umbral para la desconexión de los compañeros se portan mal (por defecto: 100)</translation> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>Cuantía no válida</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation>Ajusta el número de claves en reserva <n> (predeterminado: 100) -</translation> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>Fondos insuficientes</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> - <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>Usa OpenSSL (https) para las conexiones JSON-RPC -</translation> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation>Para utilizar la opción %s</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>Cifrados aceptados (Predeterminado: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) -</translation> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation>%s, tiene que establecer rpcpassword en el archivo de configuración: ⏎ +%s ⏎ +Se recomienda utilizar la siguiente contraseña aleatoria: ⏎ +rpcuser = bitcoinrpc ⏎ +rpcpassword =%s ⏎ +(no es necesario para recordar esta contraseña) ⏎ +Si el archivo no existe se crea con los permisos de lectura y escritura solamente del propietario. ⏎</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> - <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation>Cuántos bloques para comprobar en el arranque (por defecto: 2500, 0 = todos)</translation> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation>Error</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Enviar rastrear/debug info a la consola en lugar de debug.log archivo</translation> + <location filename="../bitcoinstrings.cpp" line="42"/> + <source>Usage:</source> + <translation>Uso:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Ejecutar un comando cuando cambia el mejor bloque (%s en cmd se sustituye por el hash de bloque)</translation> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation>Tiene que establecer rpcpassword=<contraseña> en el fichero de configuración: ⏎ +%s ⏎ +Si el archivo no existe, se crea con permisos de propietario de lectura de sólo archivos.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation>Base de datos de conjunto de discos de registro de tamaño en megabytes (por defecto: 100)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation>Desconectar las bases de datos de bloques y direcciones al cerrar la aplicación. El tiempo de parada de la aplicación aumentará. (Predeterminado: 0)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>No se puede obtener permiso de trabajo en la carpeta de datos %s. Probablemente Bitcoin ya se está ejecutando. +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="125"/> <source>Rescanning...</source> <translation>Rescaneando...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> - <source>Loading wallet...</source> - <translation>Cargando monedero...</translation> + <location filename="../bitcoinstrings.cpp" line="113"/> + <source>Loading addresses...</source> + <translation>Cargando direcciones...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>beta</translation> + <location filename="../bitcoinstrings.cpp" line="128"/> + <source>Invalid amount for -paytxfee=<amount></source> + <translation>Cantidad inválida para -paytxfee=<amount></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> - <source>Error loading wallet.dat</source> - <translation>Error al cargar wallet.dat</translation> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Warning: Disk space is low</source> + <translation>Atención: Poco espacio en el disco duro</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> - <source>Done loading</source> - <translation>Generado pero no aceptado</translation> + <location filename="../bitcoinstrings.cpp" line="133"/> + <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> + <translation>No es posible escuchar en el puerto %d en este ordenador. Probablemente Bitcoin ya se está ejecutando.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> + <location filename="../bitcoinstrings.cpp" line="127"/> + <source>Invalid -proxy address</source> + <translation>Dirección -proxy invalida</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Añadir un nodo para conectarse y tratar de mantener la conexión abierta</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> + <location filename="../bitcoinstrings.cpp" line="122"/> + <source>Cannot downgrade wallet</source> + <translation>No se puede rebajar el monedero</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="44"/> <source>List commands</source> <translation>Muestra comandos </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Don't generate coins</source> - <translation>No generar monedas</translation> + <location filename="../bitcoinstrings.cpp" line="90"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation>Ejecutar un comando cuando cambia el mejor bloque (%s en cmd se sustituye por el hash de bloque)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Start minimized</source> - <translation>Arranca minimizado + <location filename="../bitcoinstrings.cpp" line="123"/> + <source>Cannot initialize keypool</source> + <translation>No se puede inicializar grupo de teclas</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="45"/> + <source>Get help for a command</source> + <translation>Recibir ayuda para un comando </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Show splash screen on startup (default: 1)</source> - <translation>Mostrar pantalla de bienvenida en el inicio (por defecto: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="124"/> + <source>Cannot write default address</source> + <translation>No se puede escribir la dirección por defecto</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Specify data directory</source> - <translation>Especificar directorio para los datos</translation> + <location filename="../bitcoinstrings.cpp" line="49"/> + <source>Generate coins</source> + <translation>Generar monedas</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation>Ha ocurrido un error al configurar el puerto RPC %u para escucha: %s</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="50"/> + <source>Don't generate coins</source> + <translation>No generar monedas</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="51"/> + <source>Start minimized</source> + <translation>Arranca minimizado +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="56"/> <source>Specify connection timeout (in milliseconds)</source> <translation>Especifica tiempo de espera para conexion (en milisegundos) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> + <location filename="../bitcoinstrings.cpp" line="57"/> <source>Connect through socks4 proxy</source> <translation>Conecta mediante proxy socks4 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Allow DNS lookups for addnode and connect</source> - <translation>Permite búsqueda DNS para addnode y connect -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="25"/> + <location filename="../bitcoinstrings.cpp" line="59"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Preste atención a las conexiones en <puerto> (por defecto: 8333 o testnet: 18333)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Connect only to the specified node</source> - <translation>Conecta solo al nodo especificado -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="29"/> + <location filename="../bitcoinstrings.cpp" line="63"/> <source>Find peers using internet relay chat (default: 0)</source> <translation>Encontrar los pares utilizando Internet Relay Chat (por defecto: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Accept connections from outside (default: 1)</source> - <translation>Aceptar conexiones desde el exterior (predeterminado: 1)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="41"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Tarifa por KB que añadir a las transacciones que envíe</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="31"/> + <location filename="../bitcoinstrings.cpp" line="65"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation>Establecer el idioma, por ejemplo, "es_ES" (por defecto: configuración regional del sistema)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation>Número de segundos que se mantienen los compañeros se portan mal en volver a conectarse (por defecto: 86400)</translation> + <location filename="../bitcoinstrings.cpp" line="67"/> + <source>Threshold for disconnecting misbehaving peers (default: 100)</source> + <translation>Umbral para la desconexión de los compañeros se portan mal (por defecto: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Use Universal Plug and Play to map the listening port (default: 1)</source> - <translation>Usar UPnP para asignar el puerto de escucha (predeterminado: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="68"/> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> + <translation>Número de segundos que se mantienen los compañeros se portan mal en volver a conectarse (por defecto: 86400)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation>Usar UPnP para asignar el puerto de escucha (predeterminado: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> + <location filename="../bitcoinstrings.cpp" line="88"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Permite conexiones JSON-RPC desde la dirección IP especificada </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> + <location filename="../bitcoinstrings.cpp" line="78"/> <source>Accept command line and JSON-RPC commands</source> <translation>Aceptar comandos consola y JSON-RPC </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> + <location filename="../bitcoinstrings.cpp" line="79"/> + <source>Run in the background as a daemon and accept commands</source> + <translation>Correr como demonio y acepta comandos +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="80"/> <source>Use the test network</source> <translation>Usa la red de pruebas </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> - <source>Prepend debug output with timestamp</source> - <translation>Anteponer la salida de depuración, con indicación de la hora</translation> + <location filename="../bitcoinstrings.cpp" line="83"/> + <source>Send trace/debug info to console instead of debug.log file</source> + <translation>Enviar rastrear/debug info a la consola en lugar de debug.log archivo</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> + <location filename="../bitcoinstrings.cpp" line="84"/> <source>Send trace/debug info to debugger</source> <translation>Enviar rastrear / debug info al depurador</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> - <source>Username for JSON-RPC connections</source> - <translation>Usuario para las conexiones JSON-RPC -</translation> + <location filename="../bitcoinstrings.cpp" line="120"/> + <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> + <translation>El monedero ha necesitado ser reescrito. Reinicie Bitcoin para completar el proceso</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Password for JSON-RPC connections</source> - <translation>Contraseña para las conexiones JSON-RPC + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>Ajusta el número de claves en reserva <n> (predeterminado: 100) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation>Escucha conexiones JSON-RPC en el puerto <port> (predeterminado: 8332) -</translation> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source>How many blocks to check at startup (default: 2500, 0 = all)</source> + <translation>Cuántos bloques para comprobar en el arranque (por defecto: 2500, 0 = todos)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>Envía comando al nodo situado en <ip> (predeterminado: 127.0.0.1) + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>Cifrados aceptados (Predeterminado: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> - <source>Upgrade wallet to latest format</source> - <translation>Actualizar el monedero al último formato</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="59"/> - <source>Rescan the block chain for missing wallet transactions</source> - <translation>Volver a examinar la cadena de bloques en busca de transacciones del monedero perdidas</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="61"/> - <source>How thorough the block verification is (0-6, default: 1)</source> - <translation>Cómo completa la verificación del bloque es (0-6, por defecto: 1)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="62"/> - <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation>Opciones SSL: (ver la Bitcoin Wiki para instrucciones de configuración SSL) -</translation> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Error loading blkindex.dat</source> + <translation>Error al cargar blkindex.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> - <source>Server certificate file (default: server.cert)</source> - <translation>Certificado del servidor (Predeterminado: server.cert) -</translation> + <location filename="../bitcoinstrings.cpp" line="118"/> + <source>Error loading wallet.dat: Wallet corrupted</source> + <translation>Error al cargar wallet.dat: el monedero está dañado</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> - <source>Server private key (default: server.pem)</source> - <translation>Clave privada del servidor (Predeterminado: server.pem) -</translation> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>Error loading wallet.dat</source> + <translation>Error al cargar wallet.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> - <source>This help message</source> - <translation>Este mensaje de ayuda -</translation> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation>Uso</translation> </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts index 5ce93ef05c..5ba8ce4438 100644 --- a/src/qt/locale/bitcoin_es_CL.ts +++ b/src/qt/locale/bitcoin_es_CL.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> - versión </translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -58,14 +58,14 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>Crea una nueva dirección</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> - <source>Error exporting</source> - <translation>Exportar errores</translation> + <location filename="../addressbookpage.cpp" line="285"/> + <source>Export Address Book Data</source> + <translation>Exporta datos de la guia de direcciones</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> - <source>Could not write to file %1.</source> - <translation>No se pudo escribir al archivo %1.</translation> + <location filename="../addressbookpage.cpp" line="286"/> + <source>Comma separated file (*.csv)</source> + <translation>Archivos separados por coma (*.csv)</translation> </message> <message> <location filename="../forms/addressbookpage.ui" line="60"/> @@ -88,6 +88,11 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>Mostrar Código &QR </translation> </message> <message> + <location filename="../forms/addressbookpage.ui" line="96"/> + <source>Sign a message to prove you own this address</source> + <translation>Firmar un mensaje para provar que usted es dueño de esta dirección</translation> + </message> + <message> <location filename="../forms/addressbookpage.ui" line="99"/> <source>Sign &Message</source> <translation>Firmar Mensaje</translation> @@ -103,47 +108,42 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>&Borrar</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="96"/> - <source>Sign a message to prove you own this address</source> - <translation>Firmar un mensaje para provar que usted es dueño de esta dirección</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="279"/> - <source>Comma separated file (*.csv)</source> - <translation>Archivos separados por coma (*.csv)</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>Copia dirección</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation>Copia etiqueta</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation>Editar</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>Borrar</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> - <source>Export Address Book Data</source> - <translation>Exporta datos de la guia de direcciones</translation> + <location filename="../addressbookpage.cpp" line="299"/> + <source>Could not write to file %1.</source> + <translation>No se pudo escribir al archivo %1.</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="299"/> + <source>Error exporting</source> + <translation>Exportar errores</translation> </message> </context> <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="114"/> - <source>(no label)</source> - <translation>(sin etiqueta)</translation> + <location filename="../addresstablemodel.cpp" line="78"/> + <source>Address</source> + <translation>Dirección</translation> </message> <message> <location filename="../addresstablemodel.cpp" line="78"/> @@ -151,9 +151,9 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>Etiqueta</translation> </message> <message> - <location filename="../addresstablemodel.cpp" line="78"/> - <source>Address</source> - <translation>Dirección</translation> + <location filename="../addresstablemodel.cpp" line="114"/> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> </message> </context> <context> @@ -184,24 +184,9 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>Repite nueva contraseña:</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="94"/> - <source>TextLabel</source> - <translation>Cambiar contraseña:</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="101"/> - <source>Confirm wallet encryption</source> - <translation>Confirma la codificación de cartera</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="46"/> - <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>Esta operación necesita la contraseña para decodificar la billetara.</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="113"/> - <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> - <translation>Bitcoin se cerrará para finalizar el proceso de encriptación. Recuerde que encriptar su billetera no protegera completatamente sus bitcoins de ser robados por malware que infecte su computador</translation> + <location filename="../askpassphrasedialog.cpp" line="54"/> + <source>Change passphrase</source> + <translation>Cambia contraseña</translation> </message> <message> <location filename="../forms/askpassphrasedialog.ui" line="26"/> @@ -214,25 +199,28 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>Ha fallado la decodificación de la billetera</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="54"/> - <source>Change passphrase</source> - <translation>Cambia contraseña</translation> + <location filename="../askpassphrasedialog.cpp" line="101"/> + <source>Confirm wallet encryption</source> + <translation>Confirma la codificación de cartera</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="55"/> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Introduce la contraseña anterior y la nueva de cartera</translation> + <location filename="../askpassphrasedialog.cpp" line="146"/> + <location filename="../askpassphrasedialog.cpp" line="157"/> + <location filename="../askpassphrasedialog.cpp" line="176"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>La contraseña introducida para decodificar la billetera es incorrecta.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="117"/> - <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation type="unfinished"></translation> + <location filename="../askpassphrasedialog.cpp" line="102"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! +Are you sure you wish to encrypt your wallet?</source> + <translation>ATENCIÓN: ¡Si codificas tu billetera y pierdes la contraseña perderás <b>TODOS TUS BITCOINS</b>!" +¿Seguro que quieres seguir codificando la billetera?</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="134"/> - <location filename="../askpassphrasedialog.cpp" line="182"/> - <source>The supplied passphrases do not match.</source> - <translation>Las contraseñas no coinciden.</translation> + <location filename="../forms/askpassphrasedialog.ui" line="94"/> + <source>TextLabel</source> + <translation>Cambiar contraseña:</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="35"/> @@ -240,11 +228,6 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>Codificar billetera</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="43"/> - <source>Unlock wallet</source> - <translation>Desbloquea billetera</translation> - </message> - <message> <location filename="../askpassphrasedialog.cpp" line="126"/> <location filename="../askpassphrasedialog.cpp" line="133"/> <location filename="../askpassphrasedialog.cpp" line="175"/> @@ -253,27 +236,41 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>Falló la codificación de la billetera</translation> </message> <message> + <location filename="../askpassphrasedialog.cpp" line="134"/> + <location filename="../askpassphrasedialog.cpp" line="182"/> + <source>The supplied passphrases do not match.</source> + <translation>Las contraseñas no coinciden.</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="46"/> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Esta operación necesita la contraseña para decodificar la billetara.</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="113"/> + <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>Bitcoin se cerrará para finalizar el proceso de encriptación. Recuerde que encriptar su billetera no protegera completatamente sus bitcoins de ser robados por malware que infecte su computador</translation> + </message> + <message> <location filename="../askpassphrasedialog.cpp" line="111"/> <location filename="../askpassphrasedialog.cpp" line="169"/> <source>Wallet encrypted</source> <translation>Billetera codificada</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="145"/> - <source>Wallet unlock failed</source> - <translation>Ha fallado el desbloqueo de la billetera</translation> + <location filename="../askpassphrasedialog.cpp" line="34"/> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>Introduce la nueva contraseña para la billetera.<br/>Por favor utiliza un contraseña <b>de 10 o mas caracteres aleatorios</b>, u <b>ocho o mas palabras</b>.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="146"/> - <location filename="../askpassphrasedialog.cpp" line="157"/> - <location filename="../askpassphrasedialog.cpp" line="176"/> - <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation>La contraseña introducida para decodificar la billetera es incorrecta.</translation> + <location filename="../askpassphrasedialog.cpp" line="43"/> + <source>Unlock wallet</source> + <translation>Desbloquea billetera</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="34"/> - <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>Introduce la nueva contraseña para la billetera.<br/>Por favor utiliza un contraseña <b>de 10 o mas caracteres aleatorios</b>, u <b>ocho o mas palabras</b>.</translation> + <location filename="../askpassphrasedialog.cpp" line="117"/> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="127"/> @@ -281,169 +278,119 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>La codificación de la billetera falló debido a un error interno. Tu billetera no ha sido codificada.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="217"/> - <location filename="../askpassphrasedialog.cpp" line="241"/> - <source>Warning: The Caps Lock key is on.</source> - <translation>Precaucion: Mayúsculas Activadas</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="102"/> - <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! -Are you sure you wish to encrypt your wallet?</source> - <translation>ATENCIÓN: ¡Si codificas tu billetera y pierdes la contraseña perderás <b>TODOS TUS BITCOINS</b>!" -¿Seguro que quieres seguir codificando la billetera?</translation> + <location filename="../askpassphrasedialog.cpp" line="145"/> + <source>Wallet unlock failed</source> + <translation>Ha fallado el desbloqueo de la billetera</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="170"/> <source>Wallet passphrase was successfully changed.</source> <translation>La contraseña de billetera ha sido cambiada con éxito.</translation> </message> -</context> -<context> - <name>BitcoinGUI</name> - <message> - <location filename="../bitcoingui.cpp" line="187"/> - <source>&Overview</source> - <translation>&Vista general</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="237"/> - <source>E&xit</source> - <translation>&Salir</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="238"/> - <source>Quit application</source> - <translation>Salir del programa</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="283"/> - <source>&File</source> - <translation>&Archivo</translation> - </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>&Cambiar la contraseña</translation> + <location filename="../askpassphrasedialog.cpp" line="217"/> + <location filename="../askpassphrasedialog.cpp" line="241"/> + <source>Warning: The Caps Lock key is on.</source> + <translation>Precaucion: Mayúsculas Activadas</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> - <source>Show the list of addresses for receiving payments</source> - <translation>Muestra la lista de direcciónes utilizadas para recibir pagos</translation> + <location filename="../askpassphrasedialog.cpp" line="55"/> + <source>Enter the old and new passphrase to the wallet.</source> + <translation>Introduce la contraseña anterior y la nueva de cartera</translation> </message> +</context> +<context> + <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="211"/> - <source>&Send coins</source> - <translation>&Envíar monedas</translation> + <location filename="../bitcoingui.cpp" line="197"/> + <source>&Address Book</source> + <translation>&Guia de direcciónes</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Sincronización de la cadena de bloques en progreso</translation> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>Modifica las opciones de configuración de bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="73"/> + <location filename="../bitcoingui.cpp" line="71"/> <source>Bitcoin Wallet</source> <translation>Billetera Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> + <location filename="../bitcoingui.cpp" line="506"/> <source>Synchronizing with network...</source> <translation>Sincronizando con la red...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> - <source>&Transactions</source> - <translation>&Transacciónes</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="199"/> - <source>&Address Book</source> - <translation>&Guia de direcciónes</translation> + <location filename="../bitcoingui.cpp" line="185"/> + <source>&Overview</source> + <translation>&Vista general</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> + <location filename="../bitcoingui.cpp" line="198"/> <source>Edit the list of stored addresses and labels</source> <translation>Edita la lista de direcciones y etiquetas almacenadas</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation>&Recibir monedas</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> - <source>Prove you control an address</source> - <translation>Suministre dirección de control</translation> + <location filename="../bitcoingui.cpp" line="235"/> + <source>E&xit</source> + <translation>&Salir</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>S&obre %1</translation> + <location filename="../bitcoingui.cpp" line="236"/> + <source>Quit application</source> + <translation>Salir del programa</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> + <location filename="../bitcoingui.cpp" line="240"/> <source>Show information about Bitcoin</source> <translation>Muestra información acerca de Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> - <source>&Options...</source> - <translation>&Opciones</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>Modifica las opciones de configuración de bitcoin</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>Abre &Bitcoin</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Muestra la ventana de Bitcoin</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="255"/> + <location filename="../bitcoingui.cpp" line="253"/> <source>Encrypt or decrypt wallet</source> <translation>Codificar o decodificar la billetera</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> - <source>Change the passphrase used for wallet encryption</source> - <translation>Cambiar la contraseña utilizada para la codificación de la billetera</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="615"/> - <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="807"/> - <source>There was an error trying to save the wallet data to the new location.</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation>&Cambiar la contraseña</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> + <location filename="../bitcoingui.cpp" line="242"/> <source>About &Qt</source> <translation>Acerca de</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> + <location filename="../bitcoingui.cpp" line="243"/> <source>Show information about Qt</source> <translation>Mostrar Información sobre QT</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="281"/> + <source>&File</source> + <translation>&Archivo</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="192"/> <source>Browse transaction history</source> <translation>Explora el historial de transacciónes</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="482"/> + <source>%n active connection(s) to Bitcoin network</source> + <translation> + <numerusform>%n conexión activa hacia la red Bitcoin</numerusform> + <numerusform>%n conexiones activas hacia la red Bitcoin</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation> <numerusform>Hace %n segundo</numerusform> @@ -451,7 +398,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation> <numerusform>Hace %n minuto</numerusform> @@ -459,22 +406,42 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> - <source>Send coins to a bitcoin address</source> - <translation>Enviar monedas a una dirección bitcoin</translation> + <location filename="../bitcoingui.cpp" line="204"/> + <source>Show the list of addresses for receiving payments</source> + <translation>Muestra la lista de direcciónes utilizadas para recibir pagos</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation>[red-de-pruebas]</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation>Mostrar u ocultar la ventana de Bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="251"/> <source>Export the data in the current tab to a file</source> <translation>Exportar los datos de la pestaña actual a un archivo</translation> </message> + <message> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation>Cliente Bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="250"/> + <source>&Export...</source> + <translation>&Exportar...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="252"/> + <source>&Encrypt Wallet</source> + <translation>&Codificar la billetera</translation> + </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation> <numerusform>Hace %n hora</numerusform> @@ -482,128 +449,168 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> - <source>Up to date</source> - <translation>Actualizado</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="298"/> + <location filename="../bitcoingui.cpp" line="296"/> <source>&Help</source> <translation>&Ayuda</translation> </message> + <message> + <location filename="../bitcoingui.cpp" line="531"/> + <source>Downloaded %1 blocks of transaction history.</source> + <translation>Descargado %1 bloques del historial de transacciones.</translation> + </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> - <source>%n active connection(s) to Bitcoin network</source> + <location filename="../bitcoingui.cpp" line="558"/> + <source>%n day(s) ago</source> <translation> - <numerusform>%n conexión activa hacia la red Bitcoin</numerusform> - <numerusform>%n conexiones activas hacia la red Bitcoin</numerusform> + <numerusform>Hace %n día</numerusform> + <numerusform>Hace %n días</numerusform> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> - <source>Show general overview of wallet</source> - <translation>Muestra una vista general de la billetera</translation> + <location filename="../bitcoingui.cpp" line="564"/> + <source>Up to date</source> + <translation>Actualizado</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> - <source>Downloaded %1 blocks of transaction history.</source> - <translation>Descargado %1 bloques del historial de transacciones.</translation> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>Descargados %1 de %2 bloques del historial de transacciones (%3% hecho).</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> - <source>Sign &message</source> - <translation>Firmar Mensaje</translation> + <location filename="../bitcoingui.cpp" line="258"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>Cambiar la contraseña utilizada para la codificación de la billetera</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> - <source>Actions toolbar</source> - <translation>Barra de acciónes</translation> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Send coins to a bitcoin address</source> + <translation>Enviar monedas a una dirección bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="215"/> + <source>Sign &message</source> + <translation>Firmar Mensaje</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Backup Wallet</source> <translation>Respaldar billetera</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation>Datos de billetera (*.dat)</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation>Ha fallado el respaldo</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> - <translation>&Exportar...</translation> + <location filename="../bitcoingui.cpp" line="245"/> + <source>&Options...</source> + <translation>&Opciones</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation>&Codificar la billetera</translation> + <location filename="../bitcoingui.cpp" line="186"/> + <source>Show general overview of wallet</source> + <translation>Muestra una vista general de la billetera</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> + <location filename="../bitcoingui.cpp" line="191"/> + <source>&Transactions</source> + <translation>&Transacciónes</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="209"/> + <source>&Send coins</source> + <translation>&Envíar monedas</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="216"/> + <source>Prove you control an address</source> + <translation>Suministre dirección de control</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>S&obre %1</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation>Mostrar/Ocultar &Bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="255"/> <source>&Backup Wallet</source> <translation>&Respaldar billetera</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> + <location filename="../bitcoingui.cpp" line="256"/> <source>Backup wallet to another location</source> <translation>Respaldar billetera en otra ubicación</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> + <location filename="../bitcoingui.cpp" line="290"/> <source>&Settings</source> <translation>&Configuración</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> + <location filename="../bitcoingui.cpp" line="303"/> <source>Tabs toolbar</source> <translation>Barra de pestañas</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>Descargados %1 de %2 bloques del historial de transacciones.</translation> - </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> - <source>%n day(s) ago</source> - <translation> - <numerusform>Hace %n día</numerusform> - <numerusform>Hace %n días</numerusform> - </translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="421"/> - <source>bitcoin-qt</source> - <translation>bitcoin-qt</translation> + <location filename="../bitcoingui.cpp" line="314"/> + <source>Actions toolbar</source> + <translation>Barra de acciónes</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>Recuperando...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation>El ultimo bloque recibido fue generado %1.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> + <location filename="../bitcoingui.cpp" line="632"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="824"/> + <source>There was an error trying to save the wallet data to the new location.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="418"/> + <source>bitcoin-qt</source> + <translation>bitcoin-qt</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation> + <numerusform>%n bloque restante</numerusform> + <numerusform>%n bloques restantes</numerusform> + </translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="663"/> <source>Sent transaction</source> <translation>Transacción enviada</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> + <location filename="../bitcoingui.cpp" line="664"/> <source>Incoming transaction</source> <translation>Transacción entrante</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -615,22 +622,22 @@ Tipo: %3 Dirección: %4</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>La billetera esta <b>codificada</b> y actualmente <b>desbloqueda</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>La billetera esta <b>codificada</b> y actualmente <b>bloqueda</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> + <location filename="../bitcoingui.cpp" line="636"/> <source>Sending...</source> <translation>Enviando...</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -638,22 +645,22 @@ Dirección: %4</translation> <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> - <source>&Unit to show amounts in: </source> - <translation>&Unidad en la que mostrar cantitades: </translation> + <location filename="../optionsdialog.cpp" line="277"/> + <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> + <translation>Elige la subdivisión por defecto para mostrar cantidaded en la interfaz cuando se envien monedas</translation> </message> <message> <location filename="../optionsdialog.cpp" line="273"/> - <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> - <translation>Elige la subdivisión por defecto para mostrar cantidaded en la interfaz cuando se envien monedas</translation> + <source>&Unit to show amounts in: </source> + <translation>&Unidad en la que mostrar cantitades: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&Muestra direcciones en el listado de transaccioines</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished"></translation> </message> @@ -671,9 +678,9 @@ Dirección: %4</translation> <translation>&Etiqueta</translation> </message> <message> - <location filename="../forms/editaddressdialog.ui" line="42"/> - <source>&Address</source> - <translation>&Dirección</translation> + <location filename="../forms/editaddressdialog.ui" line="35"/> + <source>The label associated with this address book entry</source> + <translation>La etiqueta asociada con esta entrada de la libreta de direcciones</translation> </message> <message> <location filename="../forms/editaddressdialog.ui" line="52"/> @@ -681,11 +688,6 @@ Dirección: %4</translation> <translation>La dirección asociada con esta entrada en la libreta de direcciones. Solo puede ser modificada para direcciónes de envío.</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="20"/> - <source>New receiving address</source> - <translation>Nueva dirección para recibir</translation> - </message> - <message> <location filename="../editaddressdialog.cpp" line="24"/> <source>New sending address</source> <translation>Nueva dirección para enviar</translation> @@ -696,11 +698,6 @@ Dirección: %4</translation> <translation>Editar dirección de recepción</translation> </message> <message> - <location filename="../forms/editaddressdialog.ui" line="35"/> - <source>The label associated with this address book entry</source> - <translation>La etiqueta asociada con esta entrada de la libreta de direcciones</translation> - </message> - <message> <location filename="../editaddressdialog.cpp" line="31"/> <source>Edit sending address</source> <translation>Editar dirección de envio</translation> @@ -716,11 +713,21 @@ Dirección: %4</translation> <translation>No se pudo desbloquear la billetera.</translation> </message> <message> + <location filename="../forms/editaddressdialog.ui" line="42"/> + <source>&Address</source> + <translation>&Dirección</translation> + </message> + <message> <location filename="../editaddressdialog.cpp" line="106"/> <source>New key generation failed.</source> <translation>La generación de nueva clave falló.</translation> </message> <message> + <location filename="../editaddressdialog.cpp" line="20"/> + <source>New receiving address</source> + <translation>Nueva dirección para recibir</translation> + </message> + <message> <location filename="../editaddressdialog.cpp" line="96"/> <source>The entered address "%1" is not a valid bitcoin address.</source> <translation>La dirección introducida "%1" no es una dirección Bitcoin valida.</translation> @@ -729,85 +736,95 @@ Dirección: %4</translation> <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>&Inicia Bitcoin al iniciar el sistema</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Inicia Bitcoin automáticamente despues de encender el computador</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>&Minimiza a la bandeja en vez de la barra de tareas</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>Muestra solo un ícono en la bandeja después de minimizar la ventana</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> + <location filename="../optionsdialog.cpp" line="185"/> <source>Map port using &UPnP</source> <translation>Direcciona el puerto usando &UPnP</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="181"/> + <location filename="../optionsdialog.cpp" line="180"/> + <source>M&inimize on close</source> + <translation>M&inimiza a la bandeja al cerrar</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="186"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Abre automáticamente el puerto del cliente Bitcoin en el router. Esto funciona solo cuando tu router es compatible con UPnP y está habilitado.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="186"/> + <location filename="../optionsdialog.cpp" line="181"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>Minimiza la ventana en lugar de salir del programa cuando la ventana se cierra. Cuando esta opción esta activa el programa solo se puede cerrar seleccionando Salir desde el menu.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> - <source>M&inimize on close</source> - <translation>M&inimiza a la bandeja al cerrar</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>&Conecta a traves de un proxy SOCKS4:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Conecta a la red Bitcoin a través de un proxy SOCKS4 (ej. cuando te conectas por la red Tor)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>&IP Proxy:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>Dirección IP del servidor proxy (ej. 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>&Puerto: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Puerto del servidor proxy (ej. 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>Comisión opcional por kB que ayuda a asegurar que sus transacciones son procesadas rápidamente. La mayoria de transacciones son de 1 KB. Se recomienda comisión de 0.01.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>Comisión de &transacciónes</translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessagePage</name> @@ -822,33 +839,6 @@ Dirección: %4</translation> <translation type="unfinished">Introduce una dirección Bitcoin (ej. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="71"/> - <source>Paste address from clipboard</source> - <translation>Pega dirección desde portapapeles</translation> - </message> - <message> - <location filename="../forms/messagepage.ui" line="81"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location filename="../messagepage.cpp" line="74"/> - <location filename="../messagepage.cpp" line="89"/> - <location filename="../messagepage.cpp" line="101"/> - <source>Error signing</source> - <translation>Error al firmar</translation> - </message> - <message> - <location filename="../messagepage.cpp" line="74"/> - <source>%1 is not a valid address.</source> - <translation>%1 no es una dirección válida.</translation> - </message> - <message> - <location filename="../messagepage.cpp" line="89"/> - <source>Private key for %1 is not available.</source> - <translation>Llave privada para %q no esta disponible.</translation> - </message> - <message> <location filename="../forms/messagepage.ui" line="14"/> <source>Message</source> <translation>Mensaje</translation> @@ -869,16 +859,6 @@ Dirección: %4</translation> <translation>Alt+A</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="93"/> - <source>Enter the message you want to sign here</source> - <translation>Escriba el mensaje que desea firmar</translation> - </message> - <message> - <location filename="../forms/messagepage.ui" line="105"/> - <source>Click "Sign Message" to get signature</source> - <translation>Click en "Firmar Mensage" para conseguir firma</translation> - </message> - <message> <location filename="../forms/messagepage.ui" line="117"/> <source>Sign a message to prove you own this address</source> <translation>Firmar un mensjage para probar que usted es dueño de esta dirección</translation> @@ -898,21 +878,58 @@ Dirección: %4</translation> <source>&Copy to Clipboard</source> <translation>&Copiar al portapapeles</translation> </message> + <message> + <location filename="../messagepage.cpp" line="74"/> + <location filename="../messagepage.cpp" line="89"/> + <location filename="../messagepage.cpp" line="101"/> + <source>Error signing</source> + <translation>Error al firmar</translation> + </message> + <message> + <location filename="../messagepage.cpp" line="74"/> + <source>%1 is not a valid address.</source> + <translation>%1 no es una dirección válida.</translation> + </message> + <message> + <location filename="../messagepage.cpp" line="89"/> + <source>Private key for %1 is not available.</source> + <translation>Llave privada para %q no esta disponible.</translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="71"/> + <source>Paste address from clipboard</source> + <translation>Pega dirección desde portapapeles</translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="81"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="93"/> + <source>Enter the message you want to sign here</source> + <translation>Escriba el mensaje que desea firmar</translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="105"/> + <source>Click "Sign Message" to get signature</source> + <translation>Click en "Firmar Mensage" para conseguir firma</translation> + </message> </context> <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>Principal</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>Mostrado</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>Opciones</translation> </message> @@ -925,9 +942,14 @@ Dirección: %4</translation> <translation>No confirmados:</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="88"/> - <source>Wallet</source> - <translation>Cartera</translation> + <location filename="../forms/overviewpage.ui" line="14"/> + <source>Form</source> + <translation>Formulario</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="61"/> + <source>0</source> + <translation>0</translation> </message> <message> <location filename="../forms/overviewpage.ui" line="40"/> @@ -935,19 +957,14 @@ Dirección: %4</translation> <translation>Saldo:</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> <location filename="../forms/overviewpage.ui" line="54"/> <source>Number of transactions:</source> <translation>Numero de transacciones:</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="61"/> - <source>0</source> - <translation>0</translation> + <location filename="../forms/overviewpage.ui" line="88"/> + <source>Wallet</source> + <translation>Cartera</translation> </message> <message> <location filename="../forms/overviewpage.ui" line="124"/> @@ -978,31 +995,11 @@ Dirección: %4</translation> <translation>Etiqueta</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="55"/> - <source>Request Payment</source> - <translation>Solicitar Pago</translation> - </message> - <message> <location filename="../forms/qrcodedialog.ui" line="70"/> <source>Amount:</source> <translation>Cantidad:</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="32"/> - <source>QR Code</source> - <translation>Código QR </translation> - </message> - <message> - <location filename="../forms/qrcodedialog.ui" line="105"/> - <source>BTC</source> - <translation>BTC</translation> - </message> - <message> - <location filename="../forms/qrcodedialog.ui" line="14"/> - <source>Dialog</source> - <translation>Cambiar contraseña</translation> - </message> - <message> <location filename="../forms/qrcodedialog.ui" line="144"/> <source>Message:</source> <translation>Mensaje:</translation> @@ -1013,24 +1010,61 @@ Dirección: %4</translation> <translation>&Guardar Como...</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation>Imágenes PNG (*.png)</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="105"/> + <source>BTC</source> + <translation>BTC</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="14"/> + <source>Dialog</source> + <translation>Cambiar contraseña</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="32"/> + <source>QR Code</source> + <translation>Código QR </translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="55"/> + <source>Request Payment</source> + <translation>Solicitar Pago</translation> + </message> </context> <context> <name>SendCoinsDialog</name> <message> + <location filename="../forms/sendcoinsdialog.ui" line="14"/> + <location filename="../sendcoinsdialog.cpp" line="123"/> + <location filename="../sendcoinsdialog.cpp" line="128"/> + <location filename="../sendcoinsdialog.cpp" line="133"/> + <location filename="../sendcoinsdialog.cpp" line="138"/> + <location filename="../sendcoinsdialog.cpp" line="144"/> + <location filename="../sendcoinsdialog.cpp" line="149"/> + <location filename="../sendcoinsdialog.cpp" line="154"/> + <source>Send Coins</source> + <translation>Enviar monedas</translation> + </message> + <message> <location filename="../forms/sendcoinsdialog.ui" line="64"/> <source>Send to multiple recipients at once</source> <translation>Enviar a múltiples destinatarios</translation> @@ -1041,6 +1075,11 @@ Dirección: %4</translation> <translation>&Agrega destinatario...</translation> </message> <message> + <location filename="../forms/sendcoinsdialog.ui" line="84"/> + <source>Remove all transaction fields</source> + <translation>Remover todos los campos de la transacción</translation> + </message> + <message> <location filename="../forms/sendcoinsdialog.ui" line="106"/> <source>Balance:</source> <translation>Balance:</translation> @@ -1071,21 +1110,14 @@ Dirección: %4</translation> <translation>Confirmar el envio de monedas</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="14"/> - <location filename="../sendcoinsdialog.cpp" line="123"/> - <location filename="../sendcoinsdialog.cpp" line="128"/> - <location filename="../sendcoinsdialog.cpp" line="133"/> - <location filename="../sendcoinsdialog.cpp" line="138"/> - <location filename="../sendcoinsdialog.cpp" line="144"/> - <location filename="../sendcoinsdialog.cpp" line="149"/> - <location filename="../sendcoinsdialog.cpp" line="154"/> - <source>Send Coins</source> - <translation>Enviar monedas</translation> + <location filename="../sendcoinsdialog.cpp" line="101"/> + <source>Are you sure you want to send %1?</source> + <translation>Estas seguro que quieres enviar %1?</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="84"/> - <source>Remove all transaction fields</source> - <translation>Remover todos los campos de la transacción</translation> + <location filename="../sendcoinsdialog.cpp" line="101"/> + <source> and </source> + <translation>y</translation> </message> <message> <location filename="../forms/sendcoinsdialog.ui" line="87"/> @@ -1093,14 +1125,9 @@ Dirección: %4</translation> <translation>&Borra todos</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="101"/> - <source>Are you sure you want to send %1?</source> - <translation>Estas seguro que quieres enviar %1?</translation> - </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="101"/> - <source> and </source> - <translation>y</translation> + <location filename="../sendcoinsdialog.cpp" line="124"/> + <source>The recipient address is not valid, please recheck.</source> + <translation>La dirección de destinatarion no es valida, comprueba otra vez.</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="129"/> @@ -1108,6 +1135,11 @@ Dirección: %4</translation> <translation>La cantidad por pagar tiene que ser mayor 0.</translation> </message> <message> + <location filename="../sendcoinsdialog.cpp" line="134"/> + <source>The amount exceeds your balance.</source> + <translation>La cantidad sobrepasa tu saldo.</translation> + </message> + <message> <location filename="../sendcoinsdialog.cpp" line="139"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation>El total sobrepasa tu saldo cuando se incluyen %1 como tasa de envio.</translation> @@ -1127,23 +1159,23 @@ Dirección: %4</translation> <source>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.</source> <translation>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.</translation> </message> +</context> +<context> + <name>SendCoinsEntry</name> <message> - <location filename="../sendcoinsdialog.cpp" line="124"/> - <source>The recipient address is not valid, please recheck.</source> - <translation>La dirección de destinatarion no es valida, comprueba otra vez.</translation> + <location filename="../sendcoinsentry.cpp" line="25"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Introduce una dirección Bitcoin (ej. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="134"/> - <source>The amount exceeds your balance.</source> - <translation>La cantidad sobrepasa tu saldo.</translation> + <location filename="../forms/sendcoinsentry.ui" line="14"/> + <source>Form</source> + <translation>Envio</translation> </message> -</context> -<context> - <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="75"/> - <source>&Label:</source> - <translation>&Etiqueta:</translation> + <location filename="../forms/sendcoinsentry.ui" line="120"/> + <source>Paste address from clipboard</source> + <translation>Pega dirección desde portapapeles</translation> </message> <message> <location filename="../forms/sendcoinsentry.ui" line="42"/> @@ -1151,9 +1183,9 @@ Dirección: %4</translation> <translation>&Pagar a:</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="14"/> - <source>Form</source> - <translation>Envio</translation> + <location filename="../forms/sendcoinsentry.ui" line="75"/> + <source>&Label:</source> + <translation>&Etiqueta:</translation> </message> <message> <location filename="../forms/sendcoinsentry.ui" line="29"/> @@ -1182,11 +1214,6 @@ Dirección: %4</translation> <translation>Alt+A</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="120"/> - <source>Paste address from clipboard</source> - <translation>Pega dirección desde portapapeles</translation> - </message> - <message> <location filename="../forms/sendcoinsentry.ui" line="130"/> <source>Alt+P</source> <translation>Alt+P</translation> @@ -1196,151 +1223,146 @@ Dirección: %4</translation> <source>Remove this recipient</source> <translation>Elimina destinatario</translation> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="25"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Introduce una dirección Bitcoin (ej. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="20"/> + <location filename="../transactiondesc.cpp" line="139"/> + <source>(not accepted)</source> + <translation>(no aceptada)</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="219"/> + <source>Message:</source> + <translation>Mensaje:</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="22"/> <source>Open until %1</source> <translation>Abierto hasta %1</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="92"/> <source>unknown</source> <translation>desconocido</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> - <source><b>Status:</b> </source> - <translation><b>Estado:</b> </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="18"/> + <location filename="../transactiondesc.cpp" line="20"/> <source>Open for %1 blocks</source> <translation>Abierto hasta %1 bloques</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="28"/> - <source>%1/unconfirmed</source> - <translation>%1/no confirmado</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation>%1 confirmaciónes</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation>%1/fuera de linea?</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="50"/> + <source><b>Status:</b> </source> + <translation><b>Estado:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="55"/> + <source>, has not been successfully broadcast yet</source> + <translation>, no ha sido emitido satisfactoriamente todavía</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>, emitido mediante %1 nodo</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>, emitido mediante %1 nodos</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation><b>Fecha:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>Fuente:</b> Generado<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>De:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation><b>Para:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation> (tuya, etiqueta: </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> - <source> (yours)</source> - <translation> (tuya)</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation><b>Crédito:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="135"/> + <source>(%1 matures in %2 more blocks)</source> + <translation>(%1 madura en %2 bloques mas)</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation><b>Débito:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation><b>Comisión transacción:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>Cantidad total:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> - <source>Message:</source> - <translation>Mensaje:</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>Comentario:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation>ID de Transacción:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation>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 las monedas no se podrán gastar. Esto puede ocurrir ocasionalmente si otro nodo genera un bloque casi al mismo tiempo que el tuyo.</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> - <source>(%1 matures in %2 more blocks)</source> - <translation>(%1 madura en %2 bloques mas)</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="52"/> - <source>, has not been successfully broadcast yet</source> - <translation>, no ha sido emitido satisfactoriamente todavía</translation> + <location filename="../transactiondesc.cpp" line="98"/> + <source> (yours)</source> + <translation> (tuya)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> - <source>(not accepted)</source> - <translation>(no aceptada)</translation> + <location filename="../transactiondesc.cpp" line="30"/> + <source>%1/unconfirmed</source> + <translation>%1/no confirmado</translation> </message> </context> <context> @@ -1483,16 +1505,6 @@ Dirección: %4</translation> <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="284"/> - <source>Amount</source> - <translation>Cantidad</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="72"/> - <source>Received with</source> - <translation>Recibido con</translation> - </message> - <message> <location filename="../transactionview.cpp" line="281"/> <source>Type</source> <translation>Tipo</translation> @@ -1513,11 +1525,6 @@ Dirección: %4</translation> <translation>Enviado a</translation> </message> <message> - <location filename="../transactionview.cpp" line="76"/> - <source>To yourself</source> - <translation>A ti mismo</translation> - </message> - <message> <location filename="../transactionview.cpp" line="125"/> <source>Copy label</source> <translation>Copia etiqueta</translation> @@ -1533,39 +1540,9 @@ Dirección: %4</translation> <translation>para</translation> </message> <message> - <location filename="../transactionview.cpp" line="77"/> - <source>Mined</source> - <translation>Minado</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="78"/> - <source>Other</source> - <translation>Otra</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="126"/> - <source>Copy amount</source> - <translation>Copiar Cantidad</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="90"/> - <source>Min amount</source> - <translation>Cantidad minima</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="271"/> - <source>Comma separated file (*.csv)</source> - <translation>Archivos separados por coma (*.csv)</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="124"/> - <source>Copy address</source> - <translation>Copia dirección</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="280"/> - <source>Date</source> - <translation>Fecha</translation> + <location filename="../transactionview.cpp" line="128"/> + <source>Show details...</source> + <translation>Muestra detalles...</translation> </message> <message> <location filename="../transactionview.cpp" line="282"/> @@ -1573,6 +1550,11 @@ Dirección: %4</translation> <translation>Etiqueta</translation> </message> <message> + <location filename="../transactionview.cpp" line="284"/> + <source>Amount</source> + <translation>Cantidad</translation> + </message> + <message> <location filename="../transactionview.cpp" line="285"/> <source>ID</source> <translation>ID</translation> @@ -1589,14 +1571,14 @@ Dirección: %4</translation> <translation>Hoy</translation> </message> <message> - <location filename="../transactionview.cpp" line="57"/> - <source>This week</source> - <translation>Esta semana</translation> + <location filename="../transactionview.cpp" line="271"/> + <source>Comma separated file (*.csv)</source> + <translation>Archivos separados por coma (*.csv)</translation> </message> <message> - <location filename="../transactionview.cpp" line="58"/> - <source>This month</source> - <translation>Esta mes</translation> + <location filename="../transactionview.cpp" line="126"/> + <source>Copy amount</source> + <translation>Copiar Cantidad</translation> </message> <message> <location filename="../transactionview.cpp" line="59"/> @@ -1614,14 +1596,34 @@ Dirección: %4</translation> <translation>Rango...</translation> </message> <message> + <location filename="../transactionview.cpp" line="77"/> + <source>Mined</source> + <translation>Minado</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="78"/> + <source>Other</source> + <translation>Otra</translation> + </message> + <message> <location filename="../transactionview.cpp" line="84"/> <source>Enter address or label to search</source> <translation>Introduce una dirección o etiqueta para buscar</translation> </message> <message> - <location filename="../transactionview.cpp" line="127"/> - <source>Edit label</source> - <translation>Edita etiqueta</translation> + <location filename="../transactionview.cpp" line="90"/> + <source>Min amount</source> + <translation>Cantidad minima</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="124"/> + <source>Copy address</source> + <translation>Copia dirección</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="384"/> + <source>Range:</source> + <translation>Rango:</translation> </message> <message> <location filename="../transactionview.cpp" line="270"/> @@ -1629,25 +1631,45 @@ Dirección: %4</translation> <translation>Exportar datos de transacción</translation> </message> <message> + <location filename="../transactionview.cpp" line="127"/> + <source>Edit label</source> + <translation>Edita etiqueta</translation> + </message> + <message> <location filename="../transactionview.cpp" line="289"/> <source>Error exporting</source> <translation>Error exportando</translation> </message> <message> - <location filename="../transactionview.cpp" line="384"/> - <source>Range:</source> - <translation>Rango:</translation> + <location filename="../transactionview.cpp" line="280"/> + <source>Date</source> + <translation>Fecha</translation> </message> <message> - <location filename="../transactionview.cpp" line="128"/> - <source>Show details...</source> - <translation>Muestra detalles...</translation> + <location filename="../transactionview.cpp" line="57"/> + <source>This week</source> + <translation>Esta semana</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="58"/> + <source>This month</source> + <translation>Esta mes</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="72"/> + <source>Received with</source> + <translation>Recibido con</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="76"/> + <source>To yourself</source> + <translation>A ti mismo</translation> </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>Enviando...</translation> </message> @@ -1655,430 +1677,515 @@ Dirección: %4</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> + <location filename="../bitcoinstrings.cpp" line="41"/> <source>Bitcoin version</source> <translation>Versión Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> - <source>Loading block index...</source> - <translation>Cargando el index de bloques...</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="87"/> - <source>Rescanning...</source> - <translation>Rescaneando...</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Usage:</source> - <translation>Uso:</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="84"/> - <source>Cannot downgrade wallet</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="85"/> - <source>Cannot initialize keypool</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> - <source>Cannot write default address</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Loading wallet...</source> + <translation>Cargando cartera...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> - <source>Done loading</source> - <translation>Carga completa</translation> + <location filename="../bitcoinstrings.cpp" line="115"/> + <source>Loading block index...</source> + <translation>Cargando el index de bloques...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> - <source>Invalid amount for -paytxfee=<amount></source> - <translation>Cantidad inválida para -paytxfee=<amount></translation> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source>Rescanning...</source> + <translation>Rescaneando...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> - <translation>Precaución: Por favor revise que la fecha y hora de tu ordenador son correctas. Si tu reloj está mal configurado Bitcoin no funcionará correctamente.</translation> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Warning: Disk space is low</source> + <translation>Atención: Poco espacio en el disco duro</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation>Error: CreateThread(StartNode) fallido</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="133"/> + <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> + <translation>No es posible escuchar en el puerto %d en este ordenador. Probablemente Bitcoin ya se está ejecutando.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation>Dirección -proxy invalida</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> + <location filename="../bitcoinstrings.cpp" line="129"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation>Precaución: -paytxfee es muy alta. Esta es la comisión que pagarás si envias una transacción.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> - <source>Error loading wallet.dat</source> - <translation>Error cargando wallet.dat</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="82"/> + <location filename="../bitcoinstrings.cpp" line="120"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>La billetera necesita ser reescrita: reinicie Bitcoin para completar</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Error loading blkindex.dat</source> + <translation>Error cargando blkindex.dat</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="45"/> <source>Get help for a command</source> <translation>Recibir ayuda para un comando </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Options:</source> - <translation>Opciones: + <location filename="../bitcoinstrings.cpp" line="44"/> + <source>List commands</source> + <translation>Muestra comandos </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> + <location filename="../bitcoinstrings.cpp" line="47"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Especifica archivo de configuración (predeterminado: bitcoin.conf) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Send command to -server or bitcoind</source> - <translation>Envia comando a bitcoin lanzado con -server u bitcoind -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="11"/> - <source>List commands</source> - <translation>Muestra comandos -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="17"/> + <location filename="../bitcoinstrings.cpp" line="50"/> <source>Don't generate coins</source> <translation>No generar monedas </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>Especifica archivo pid (predeterminado: bitcoin.pid) +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> + <location filename="../bitcoinstrings.cpp" line="114"/> <source>Error loading addr.dat</source> <translation>Error cargando addr.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Generate coins</source> - <translation>Genera monedas + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Specify data directory</source> + <translation>Especifica directorio para los datos </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Specify data directory</source> - <translation>Especifica directorio para los datos + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Specify connection timeout (in milliseconds)</source> + <translation>Especifica tiempo de espera para conexion (en milisegundos) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> + <location filename="../bitcoinstrings.cpp" line="59"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Escuchar por conecciones en <puerto> (Por defecto: 8333 o red de prueba: 18333)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> + <location filename="../bitcoinstrings.cpp" line="60"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>Mantener al menos <n> conecciones por cliente (por defecto: 125) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Especifica tiempo de espera para conexion (en milisegundos) -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Find peers using internet relay chat (default: 0)</source> - <translation>Buscar pares usando 'internet relay chat (IRC)' (predeterminado: 0)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="33"/> + <location filename="../bitcoinstrings.cpp" line="67"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Umbral de desconección de clientes con mal comportamiento (por defecto: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> + <location filename="../bitcoinstrings.cpp" line="51"/> <source>Start minimized</source> <translation>Arranca minimizado </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> - <source>Accept command line and JSON-RPC commands</source> - <translation>Aceptar comandos consola y JSON-RPC -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="44"/> + <location filename="../bitcoinstrings.cpp" line="80"/> <source>Use the test network</source> <translation>Usa la red de pruebas </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Password for JSON-RPC connections</source> - <translation>Contraseña para las conexiones JSON-RPC + <location filename="../bitcoinstrings.cpp" line="57"/> + <source>Connect through socks4 proxy</source> + <translation>Conecta mediante proxy socks4 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> - <source>Prepend debug output with timestamp</source> - <translation>Anteponer salida de depuracion con marca de tiempo</translation> + <location filename="../bitcoinstrings.cpp" line="107"/> + <source>This help message</source> + <translation>Este mensaje de ayuda +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Enviar informacion de seguimiento a la consola en vez del archivo debug.log</translation> + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>Escucha conexiones JSON-RPC en el puerto <port> (predeterminado: 8332) +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Send trace/debug info to debugger</source> - <translation>Enviar informacion de seguimiento al depurador</translation> + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>Ajusta el numero de claves en reserva <n> (predeterminado: 100) +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> - <source>This help message</source> - <translation>Este mensaje de ayuda + <location filename="../bitcoinstrings.cpp" line="102"/> + <source>Server certificate file (default: server.cert)</source> + <translation>Certificado del servidor (Predeterminado: server.cert) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> - <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>Usa OpenSSL (https) para las conexiones JSON-RPC + <location filename="../bitcoinstrings.cpp" line="61"/> + <source>Add a node to connect to and attempt to keep the connection open</source> + <translation>Agrega un nodo para conectarse and attempt to keep the connection open</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>Username for JSON-RPC connections</source> + <translation>Usuario para las conexiones JSON-RPC </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> - <source>Server private key (default: server.pem)</source> - <translation>Clave privada del servidor (Predeterminado: server.pem) + <location filename="../bitcoinstrings.cpp" line="62"/> + <source>Connect only to the specified node</source> + <translation>Conecta solo al nodo especificado </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Add a node to connect to and attempt to keep the connection open</source> - <translation>Agrega un nodo para conectarse and attempt to keep the connection open</translation> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Show splash screen on startup (default: 1)</source> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">Error: La transacción no se pudo crear.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">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.</translation> + </message> + <message> <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="52"/> + <source>Show splash screen on startup (default: 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="54"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Connect through socks4 proxy</source> - <translation>Conecta mediante proxy socks4 -</translation> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation type="unfinished">Aceptar conexiones desde el exterior (predeterminado: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> + <location filename="../bitcoinstrings.cpp" line="65"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> + <location filename="../bitcoinstrings.cpp" line="66"/> <source>Find peers using DNS lookup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> + <location filename="../bitcoinstrings.cpp" line="68"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation>Escucha conexiones JSON-RPC en el puerto <port> (predeterminado: 8332) -</translation> + <location filename="../bitcoinstrings.cpp" line="73"/> + <source>Use Universal Plug and Play to map the listening port (default: 1)</source> + <translation type="unfinished">Intenta usar UPnP para mapear el puerto de escucha (default: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>Envia comando al nodo situado en <ip> (predeterminado: 127.0.0.1) -</translation> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="77"/> + <source>Fee per KB to add to transactions you send</source> + <translation>Comisión por kB para adicionarla a las transacciones enviadas</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation>Ajusta el numero de claves en reserva <n> (predeterminado: 100) -</translation> + <location filename="../bitcoinstrings.cpp" line="90"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> + <location filename="../bitcoinstrings.cpp" line="96"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> + <location filename="../bitcoinstrings.cpp" line="97"/> <source>How thorough the block verification is (0-6, default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> - <source>Server certificate file (default: server.cert)</source> - <translation>Certificado del servidor (Predeterminado: server.cert) + <location filename="../bitcoinstrings.cpp" line="98"/> + <source> +SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation>Opciones SSL: (ver la Bitcoin Wiki para instrucciones de configuración SSL) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>Cifrados aceptados (Predeterminado: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) -</translation> + <location filename="../bitcoinstrings.cpp" line="113"/> + <source>Loading addresses...</source> + <translation>Cargando direcciónes...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> - <source>Output extra debugging information</source> - <translation>Adjuntar informacion extra de depuracion</translation> + <location filename="../bitcoinstrings.cpp" line="122"/> + <source>Cannot downgrade wallet</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> - <source>Loading addresses...</source> - <translation>Cargando direcciónes...</translation> + <location filename="../bitcoinstrings.cpp" line="123"/> + <source>Cannot initialize keypool</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> - <translation>Atención: Poco espacio en el disco duro</translation> + <location filename="../bitcoinstrings.cpp" line="124"/> + <source>Cannot write default address</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> - <source>Loading wallet...</source> - <translation>Cargando cartera...</translation> + <location filename="../bitcoinstrings.cpp" line="128"/> + <source>Invalid amount for -paytxfee=<amount></source> + <translation>Cantidad inválida para -paytxfee=<amount></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> - <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> - <translation>No es posible escuchar en el puerto %d en este ordenador. Probablemente Bitcoin ya se está ejecutando.</translation> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <translation>Precaución: Por favor revise que la fecha y hora de tu ordenador son correctas. Si tu reloj está mal configurado Bitcoin no funcionará correctamente.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>beta</translation> + <location filename="../bitcoinstrings.cpp" line="42"/> + <source>Usage:</source> + <translation>Uso:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> - <source>Error loading blkindex.dat</source> - <translation>Error cargando blkindex.dat</translation> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>No se puede obtener permiso de trabajo en la carpeta de datos %s. Probablemente Bitcoin ya se está ejecutando. +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>Done loading</source> + <translation>Carga completa</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Enviando...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>Cantidad inválida</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>Fondos insuficientes</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="118"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Error cargando wallet.dat: Billetera corrupta</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> + <location filename="../bitcoinstrings.cpp" line="119"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> <translation>Error cargando wallet.dat: Billetera necesita una vercion reciente de Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>Especifica archivo pid (predeterminado: bitcoin.pid) + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>Error loading wallet.dat</source> + <translation>Error cargando wallet.dat</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation>Error</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="43"/> + <source>Send command to -server or bitcoind</source> + <translation>Envia comando a bitcoin lanzado con -server u bitcoind </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Allow DNS lookups for addnode and connect</source> - <translation>Permite búsqueda DNS para addnode y connect + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="46"/> + <source>Options:</source> + <translation>Opciones: </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Connect only to the specified node</source> - <translation>Conecta solo al nodo especificado + <location filename="../bitcoinstrings.cpp" line="49"/> + <source>Generate coins</source> + <translation>Genera monedas </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Use Universal Plug and Play to map the listening port (default: 1)</source> - <translation type="unfinished">Intenta usar UPnP para mapear el puerto de escucha (default: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="58"/> + <source>Allow DNS lookups for addnode and connect</source> + <translation>Permite búsqueda DNS para addnode y connect +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="63"/> + <source>Find peers using internet relay chat (default: 0)</source> + <translation>Buscar pares usando 'internet relay chat (IRC)' (predeterminado: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished">Intenta usar UPnP para mapear el puerto de escucha (default: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Comisión por kB para adicionarla a las transacciones enviadas</translation> + <location filename="../bitcoinstrings.cpp" line="78"/> + <source>Accept command line and JSON-RPC commands</source> + <translation>Aceptar comandos consola y JSON-RPC +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> + <location filename="../bitcoinstrings.cpp" line="79"/> <source>Run in the background as a daemon and accept commands</source> <translation>Correr como demonio y acepta comandos </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> - <source>Username for JSON-RPC connections</source> - <translation>Usuario para las conexiones JSON-RPC + <location filename="../bitcoinstrings.cpp" line="81"/> + <source>Output extra debugging information</source> + <translation>Adjuntar informacion extra de depuracion</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Prepend debug output with timestamp</source> + <translation>Anteponer salida de depuracion con marca de tiempo</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="83"/> + <source>Send trace/debug info to console instead of debug.log file</source> + <translation>Enviar informacion de seguimiento a la consola en vez del archivo debug.log</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="84"/> + <source>Send trace/debug info to debugger</source> + <translation>Enviar informacion de seguimiento al depurador</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="86"/> + <source>Password for JSON-RPC connections</source> + <translation>Contraseña para las conexiones JSON-RPC </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> + <location filename="../bitcoinstrings.cpp" line="88"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Permite conexiones JSON-RPC desde la dirección IP especificada </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>Envia comando al nodo situado en <ip> (predeterminado: 127.0.0.1) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="93"/> <source>Upgrade wallet to latest format</source> <translation>Actualizar billetera al formato actual</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> + <location filename="../bitcoinstrings.cpp" line="95"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>Rescanea la cadena de bloques para transacciones perdidas de la cartera </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> - <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation>Opciones SSL: (ver la Bitcoin Wiki para instrucciones de configuración SSL) + <location filename="../bitcoinstrings.cpp" line="101"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>Usa OpenSSL (https) para las conexiones JSON-RPC </translation> </message> + <message> + <location filename="../bitcoinstrings.cpp" line="103"/> + <source>Server private key (default: server.pem)</source> + <translation>Clave privada del servidor (Predeterminado: server.pem) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>Cifrados aceptados (Predeterminado: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation>Uso</translation> + </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts index 2534be10c8..c3ace4bcd8 100644 --- a/src/qt/locale/bitcoin_et.ts +++ b/src/qt/locale/bitcoin_et.ts @@ -15,7 +15,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -89,42 +89,42 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Kustuta</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation type="unfinished">Muuda</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>Kustuta</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>Viga eksportimisel</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation type="unfinished"></translation> </message> @@ -292,208 +292,202 @@ Are you sure you wish to encrypt your wallet?</source> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="73"/> + <location filename="../bitcoingui.cpp" line="71"/> <source>Bitcoin Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> - <source>Synchronizing with network...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="187"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>&Overview</source> <translation>&Ülevaade</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="186"/> <source>Show general overview of wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> + <location filename="../bitcoingui.cpp" line="191"/> <source>&Transactions</source> <translation>&Tehingud</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="192"/> <source>Browse transaction history</source> <translation>Sirvi tehingute ajalugu</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> + <location filename="../bitcoingui.cpp" line="197"/> <source>&Address Book</source> <translation>&Aadressiraamat</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> + <location filename="../bitcoingui.cpp" line="198"/> <source>Edit the list of stored addresses and labels</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> + <location filename="../bitcoingui.cpp" line="209"/> <source>&Send coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> + <location filename="../bitcoingui.cpp" line="210"/> <source>Send coins to a bitcoin address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> + <location filename="../bitcoingui.cpp" line="215"/> <source>Sign &message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> + <location filename="../bitcoingui.cpp" line="216"/> <source>Prove you control an address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> + <location filename="../bitcoingui.cpp" line="235"/> <source>E&xit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> + <location filename="../bitcoingui.cpp" line="236"/> <source>Quit application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> + <location filename="../bitcoingui.cpp" line="239"/> <source>&About %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> + <location filename="../bitcoingui.cpp" line="240"/> <source>Show information about Bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> + <location filename="../bitcoingui.cpp" line="242"/> <source>About &Qt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> + <location filename="../bitcoingui.cpp" line="243"/> <source>Show information about Qt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> + <location filename="../bitcoingui.cpp" line="245"/> <source>&Options...</source> <translation>&Valikud...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> + <location filename="../bitcoingui.cpp" line="246"/> <source>Modify configuration options for bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> + <location filename="../bitcoingui.cpp" line="250"/> <source>&Export...</source> <translation>&Ekspordi...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> + <location filename="../bitcoingui.cpp" line="251"/> <source>Export the data in the current tab to a file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> + <location filename="../bitcoingui.cpp" line="252"/> <source>&Encrypt Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="255"/> + <location filename="../bitcoingui.cpp" line="253"/> <source>Encrypt or decrypt wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> + <location filename="../bitcoingui.cpp" line="255"/> <source>&Backup Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> + <location filename="../bitcoingui.cpp" line="256"/> <source>Backup wallet to another location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> + <location filename="../bitcoingui.cpp" line="257"/> <source>&Change Passphrase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> + <location filename="../bitcoingui.cpp" line="258"/> <source>Change the passphrase used for wallet encryption</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> + <location filename="../bitcoingui.cpp" line="281"/> <source>&File</source> <translation>&Fail</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> + <location filename="../bitcoingui.cpp" line="290"/> <source>&Settings</source> <translation>&Seaded</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> + <location filename="../bitcoingui.cpp" line="296"/> <source>&Help</source> <translation>&Abiinfo</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> + <location filename="../bitcoingui.cpp" line="303"/> <source>Tabs toolbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> + <location filename="../bitcoingui.cpp" line="314"/> <source>Actions toolbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="418"/> <source>bitcoin-qt</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> + <location filename="../bitcoingui.cpp" line="482"/> <source>%n active connection(s) to Bitcoin network</source> <translation type="unfinished"> <numerusform></numerusform> @@ -501,17 +495,22 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> + <location filename="../bitcoingui.cpp" line="506"/> + <source>Synchronizing with network...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> + <location filename="../bitcoingui.cpp" line="531"/> <source>Downloaded %1 blocks of transaction history.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -519,7 +518,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -527,7 +526,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -535,7 +534,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -543,42 +542,42 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> + <location filename="../bitcoingui.cpp" line="632"/> <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> + <location filename="../bitcoingui.cpp" line="636"/> <source>Sending...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> + <location filename="../bitcoingui.cpp" line="663"/> <source>Sent transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> + <location filename="../bitcoingui.cpp" line="664"/> <source>Incoming transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -587,37 +586,45 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Backup Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation type="unfinished"></translation> </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -625,22 +632,22 @@ Address: %4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished"></translation> </message> @@ -716,85 +723,95 @@ Address: %4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="180"/> - <source>Map port using &UPnP</source> + <source>M&inimize on close</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="181"/> - <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="185"/> - <source>M&inimize on close</source> + <source>Map port using &UPnP</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="186"/> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> + <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessagePage</name> @@ -889,17 +906,17 @@ Address: %4 <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation type="unfinished">Valikud</translation> </message> @@ -1000,17 +1017,22 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation type="unfinished"></translation> </message> @@ -1192,140 +1214,140 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="18"/> + <location filename="../transactiondesc.cpp" line="20"/> <source>Open for %1 blocks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> + <location filename="../transactiondesc.cpp" line="22"/> <source>Open until %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="28"/> + <location filename="../transactiondesc.cpp" line="30"/> <source>%1/unconfirmed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation type="unfinished"><b>Staatus:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation type="unfinished"><b>Kuupäev:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="92"/> <source>unknown</source> <translation>tundmatu</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>Sõnum:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>Kommentaar:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation type="unfinished"></translation> </message> @@ -1393,6 +1415,14 @@ Address: %4 <source>Confirmed (%1 confirmations)</source> <translation type="unfinished"></translation> </message> + <message numerus="yes"> + <location filename="../transactiontablemodel.cpp" line="297"/> + <source>Mined balance will be available in %n more blocks</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> <message> <location filename="../transactiontablemodel.cpp" line="303"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> @@ -1458,18 +1488,20 @@ Address: %4 <source>Amount removed from or added to balance.</source> <translation type="unfinished"></translation> </message> - <message numerus="yes"> - <location filename="../transactiontablemodel.cpp" line="297"/> - <source>Mined balance will be available in %n more blocks</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> - </translation> - </message> </context> <context> <name>TransactionView</name> <message> + <location filename="../transactionview.cpp" line="284"/> + <source>Amount</source> + <translation>Kogus</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="285"/> + <source>ID</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../transactionview.cpp" line="289"/> <source>Error exporting</source> <translation>Viga eksportimisel</translation> @@ -1606,16 +1638,6 @@ Address: %4 <translation>Aadress</translation> </message> <message> - <location filename="../transactionview.cpp" line="284"/> - <source>Amount</source> - <translation>Kogus</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="285"/> - <source>ID</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../transactionview.cpp" line="289"/> <source>Could not write to file %1.</source> <translation type="unfinished"></translation> @@ -1634,7 +1656,7 @@ Address: %4 <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation type="unfinished"></translation> </message> @@ -1642,400 +1664,484 @@ Address: %4 <context> <name>bitcoin-core</name> <message> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Bitcoin version</source> + <source>Error: Wallet locked, unable to create transaction.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Warning: Disk space is low</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="41"/> + <source>Bitcoin version</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="42"/> <source>Usage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> + <location filename="../bitcoinstrings.cpp" line="43"/> <source>Send command to -server or bitcoind</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> + <location filename="../bitcoinstrings.cpp" line="44"/> <source>List commands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> + <location filename="../bitcoinstrings.cpp" line="45"/> <source>Get help for a command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> + <location filename="../bitcoinstrings.cpp" line="46"/> <source>Options:</source> <translation type="unfinished">Valikud:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> + <location filename="../bitcoinstrings.cpp" line="47"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> + <location filename="../bitcoinstrings.cpp" line="48"/> <source>Specify pid file (default: bitcoind.pid)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> + <location filename="../bitcoinstrings.cpp" line="49"/> <source>Generate coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> + <location filename="../bitcoinstrings.cpp" line="50"/> <source>Don't generate coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> + <location filename="../bitcoinstrings.cpp" line="51"/> <source>Start minimized</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> + <location filename="../bitcoinstrings.cpp" line="52"/> <source>Show splash screen on startup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> + <location filename="../bitcoinstrings.cpp" line="53"/> <source>Specify data directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> + <location filename="../bitcoinstrings.cpp" line="54"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="56"/> <source>Specify connection timeout (in milliseconds)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> + <location filename="../bitcoinstrings.cpp" line="57"/> <source>Connect through socks4 proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> + <location filename="../bitcoinstrings.cpp" line="58"/> <source>Allow DNS lookups for addnode and connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> + <location filename="../bitcoinstrings.cpp" line="59"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> + <location filename="../bitcoinstrings.cpp" line="60"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> + <location filename="../bitcoinstrings.cpp" line="61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> + <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> + <location filename="../bitcoinstrings.cpp" line="63"/> <source>Find peers using internet relay chat (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> + <location filename="../bitcoinstrings.cpp" line="65"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> + <location filename="../bitcoinstrings.cpp" line="66"/> <source>Find peers using DNS lookup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> + <location filename="../bitcoinstrings.cpp" line="67"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> + <location filename="../bitcoinstrings.cpp" line="68"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> + <location filename="../bitcoinstrings.cpp" line="78"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> + <location filename="../bitcoinstrings.cpp" line="79"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> + <location filename="../bitcoinstrings.cpp" line="80"/> <source>Use the test network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> + <location filename="../bitcoinstrings.cpp" line="81"/> <source>Output extra debugging information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> + <location filename="../bitcoinstrings.cpp" line="82"/> <source>Prepend debug output with timestamp</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> + <location filename="../bitcoinstrings.cpp" line="83"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> + <location filename="../bitcoinstrings.cpp" line="84"/> <source>Send trace/debug info to debugger</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> + <location filename="../bitcoinstrings.cpp" line="85"/> <source>Username for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> + <location filename="../bitcoinstrings.cpp" line="86"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> + <location filename="../bitcoinstrings.cpp" line="87"/> <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> + <location filename="../bitcoinstrings.cpp" line="88"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> + <location filename="../bitcoinstrings.cpp" line="89"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> + <location filename="../bitcoinstrings.cpp" line="90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> + <location filename="../bitcoinstrings.cpp" line="93"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> + <location filename="../bitcoinstrings.cpp" line="94"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> + <location filename="../bitcoinstrings.cpp" line="95"/> <source>Rescan the block chain for missing wallet transactions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> + <location filename="../bitcoinstrings.cpp" line="96"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> + <location filename="../bitcoinstrings.cpp" line="97"/> <source>How thorough the block verification is (0-6, default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> + <location filename="../bitcoinstrings.cpp" line="101"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> + <location filename="../bitcoinstrings.cpp" line="102"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> + <location filename="../bitcoinstrings.cpp" line="103"/> <source>Server private key (default: server.pem)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> + <location filename="../bitcoinstrings.cpp" line="104"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> + <location filename="../bitcoinstrings.cpp" line="107"/> <source>This help message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="113"/> <source>Loading addresses...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> + <location filename="../bitcoinstrings.cpp" line="114"/> <source>Error loading addr.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> + <location filename="../bitcoinstrings.cpp" line="115"/> <source>Loading block index...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> + <location filename="../bitcoinstrings.cpp" line="116"/> <source>Error loading blkindex.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> + <location filename="../bitcoinstrings.cpp" line="117"/> <source>Loading wallet...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> + <location filename="../bitcoinstrings.cpp" line="118"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> + <location filename="../bitcoinstrings.cpp" line="119"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> + <location filename="../bitcoinstrings.cpp" line="120"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> + <location filename="../bitcoinstrings.cpp" line="121"/> <source>Error loading wallet.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> + <location filename="../bitcoinstrings.cpp" line="123"/> <source>Cannot initialize keypool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> + <location filename="../bitcoinstrings.cpp" line="124"/> <source>Cannot write default address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> + <location filename="../bitcoinstrings.cpp" line="125"/> <source>Rescanning...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> + <location filename="../bitcoinstrings.cpp" line="126"/> <source>Done loading</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> + <location filename="../bitcoinstrings.cpp" line="128"/> <source>Invalid amount for -paytxfee=<amount></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> + <location filename="../bitcoinstrings.cpp" line="129"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="96"/> + <location filename="../bitcoinstrings.cpp" line="133"/> <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../bitcoinstrings.cpp" line="99"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation type="unfinished"></translation> - </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_eu_ES.ts b/src/qt/locale/bitcoin_eu_ES.ts index 45aaf971c2..d17ca29232 100644 --- a/src/qt/locale/bitcoin_eu_ES.ts +++ b/src/qt/locale/bitcoin_eu_ES.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> Bertsio</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -89,42 +89,42 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Ezabatu</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>Ezabatu</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation type="unfinished"></translation> </message> @@ -292,208 +292,202 @@ Are you sure you wish to encrypt your wallet?</source> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="73"/> + <location filename="../bitcoingui.cpp" line="71"/> <source>Bitcoin Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> - <source>Synchronizing with network...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="187"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>&Overview</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="186"/> <source>Show general overview of wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> + <location filename="../bitcoingui.cpp" line="191"/> <source>&Transactions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="192"/> <source>Browse transaction history</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> + <location filename="../bitcoingui.cpp" line="197"/> <source>&Address Book</source> <translation type="unfinished">Helbide-liburu&a</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> + <location filename="../bitcoingui.cpp" line="198"/> <source>Edit the list of stored addresses and labels</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> + <location filename="../bitcoingui.cpp" line="209"/> <source>&Send coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> + <location filename="../bitcoingui.cpp" line="210"/> <source>Send coins to a bitcoin address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> + <location filename="../bitcoingui.cpp" line="215"/> <source>Sign &message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> + <location filename="../bitcoingui.cpp" line="216"/> <source>Prove you control an address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> + <location filename="../bitcoingui.cpp" line="235"/> <source>E&xit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> + <location filename="../bitcoingui.cpp" line="236"/> <source>Quit application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> + <location filename="../bitcoingui.cpp" line="239"/> <source>&About %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> + <location filename="../bitcoingui.cpp" line="240"/> <source>Show information about Bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> + <location filename="../bitcoingui.cpp" line="242"/> <source>About &Qt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> + <location filename="../bitcoingui.cpp" line="243"/> <source>Show information about Qt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> + <location filename="../bitcoingui.cpp" line="245"/> <source>&Options...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> + <location filename="../bitcoingui.cpp" line="246"/> <source>Modify configuration options for bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> + <location filename="../bitcoingui.cpp" line="250"/> <source>&Export...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> + <location filename="../bitcoingui.cpp" line="251"/> <source>Export the data in the current tab to a file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> + <location filename="../bitcoingui.cpp" line="252"/> <source>&Encrypt Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="255"/> + <location filename="../bitcoingui.cpp" line="253"/> <source>Encrypt or decrypt wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> + <location filename="../bitcoingui.cpp" line="255"/> <source>&Backup Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> + <location filename="../bitcoingui.cpp" line="256"/> <source>Backup wallet to another location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> + <location filename="../bitcoingui.cpp" line="257"/> <source>&Change Passphrase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> + <location filename="../bitcoingui.cpp" line="258"/> <source>Change the passphrase used for wallet encryption</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> + <location filename="../bitcoingui.cpp" line="281"/> <source>&File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> + <location filename="../bitcoingui.cpp" line="290"/> <source>&Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> + <location filename="../bitcoingui.cpp" line="296"/> <source>&Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> + <location filename="../bitcoingui.cpp" line="303"/> <source>Tabs toolbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> + <location filename="../bitcoingui.cpp" line="314"/> <source>Actions toolbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="418"/> <source>bitcoin-qt</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> + <location filename="../bitcoingui.cpp" line="482"/> <source>%n active connection(s) to Bitcoin network</source> <translation type="unfinished"> <numerusform></numerusform> @@ -501,17 +495,22 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> + <location filename="../bitcoingui.cpp" line="506"/> + <source>Synchronizing with network...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> + <location filename="../bitcoingui.cpp" line="531"/> <source>Downloaded %1 blocks of transaction history.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -519,7 +518,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -527,7 +526,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -535,7 +534,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -543,42 +542,42 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> + <location filename="../bitcoingui.cpp" line="632"/> <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> + <location filename="../bitcoingui.cpp" line="636"/> <source>Sending...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> + <location filename="../bitcoingui.cpp" line="663"/> <source>Sent transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> + <location filename="../bitcoingui.cpp" line="664"/> <source>Incoming transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -587,37 +586,45 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Backup Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation type="unfinished"></translation> </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -625,22 +632,22 @@ Address: %4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished"></translation> </message> @@ -716,85 +723,95 @@ Address: %4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="180"/> - <source>Map port using &UPnP</source> + <source>M&inimize on close</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="181"/> - <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="185"/> - <source>M&inimize on close</source> + <source>Map port using &UPnP</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="186"/> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> + <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessagePage</name> @@ -889,17 +906,17 @@ Address: %4 <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation type="unfinished"></translation> </message> @@ -1000,17 +1017,22 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation type="unfinished"></translation> </message> @@ -1192,140 +1214,140 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="18"/> + <location filename="../transactiondesc.cpp" line="20"/> <source>Open for %1 blocks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> + <location filename="../transactiondesc.cpp" line="22"/> <source>Open until %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="28"/> + <location filename="../transactiondesc.cpp" line="30"/> <source>%1/unconfirmed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="92"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation type="unfinished"></translation> </message> @@ -1347,11 +1369,6 @@ Address: %4 <name>TransactionTableModel</name> <message> <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Address</source> - <translation>Helbidea</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> <source>Date</source> <translation type="unfinished"></translation> </message> @@ -1466,6 +1483,11 @@ Address: %4 <source>Amount removed from or added to balance.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Address</source> + <translation>Helbidea</translation> + </message> </context> <context> <name>TransactionView</name> @@ -1634,7 +1656,7 @@ Address: %4 <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation type="unfinished"></translation> </message> @@ -1642,400 +1664,484 @@ Address: %4 <context> <name>bitcoin-core</name> <message> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Warning: Disk space is low</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="41"/> <source>Bitcoin version</source> <translation type="unfinished">Bitcoin Bertsio</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> + <location filename="../bitcoinstrings.cpp" line="42"/> <source>Usage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> + <location filename="../bitcoinstrings.cpp" line="43"/> <source>Send command to -server or bitcoind</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> + <location filename="../bitcoinstrings.cpp" line="44"/> <source>List commands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> + <location filename="../bitcoinstrings.cpp" line="45"/> <source>Get help for a command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> + <location filename="../bitcoinstrings.cpp" line="46"/> <source>Options:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> + <location filename="../bitcoinstrings.cpp" line="47"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> + <location filename="../bitcoinstrings.cpp" line="48"/> <source>Specify pid file (default: bitcoind.pid)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> + <location filename="../bitcoinstrings.cpp" line="49"/> <source>Generate coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> + <location filename="../bitcoinstrings.cpp" line="50"/> <source>Don't generate coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> + <location filename="../bitcoinstrings.cpp" line="51"/> <source>Start minimized</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> + <location filename="../bitcoinstrings.cpp" line="52"/> <source>Show splash screen on startup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> + <location filename="../bitcoinstrings.cpp" line="53"/> <source>Specify data directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> + <location filename="../bitcoinstrings.cpp" line="54"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="56"/> <source>Specify connection timeout (in milliseconds)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> + <location filename="../bitcoinstrings.cpp" line="57"/> <source>Connect through socks4 proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> + <location filename="../bitcoinstrings.cpp" line="58"/> <source>Allow DNS lookups for addnode and connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> + <location filename="../bitcoinstrings.cpp" line="59"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> + <location filename="../bitcoinstrings.cpp" line="60"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> + <location filename="../bitcoinstrings.cpp" line="61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> + <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> + <location filename="../bitcoinstrings.cpp" line="63"/> <source>Find peers using internet relay chat (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> + <location filename="../bitcoinstrings.cpp" line="65"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> + <location filename="../bitcoinstrings.cpp" line="66"/> <source>Find peers using DNS lookup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> + <location filename="../bitcoinstrings.cpp" line="67"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> + <location filename="../bitcoinstrings.cpp" line="68"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> + <location filename="../bitcoinstrings.cpp" line="78"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> + <location filename="../bitcoinstrings.cpp" line="79"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> + <location filename="../bitcoinstrings.cpp" line="80"/> <source>Use the test network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> + <location filename="../bitcoinstrings.cpp" line="81"/> <source>Output extra debugging information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> + <location filename="../bitcoinstrings.cpp" line="82"/> <source>Prepend debug output with timestamp</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> + <location filename="../bitcoinstrings.cpp" line="83"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> + <location filename="../bitcoinstrings.cpp" line="84"/> <source>Send trace/debug info to debugger</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> + <location filename="../bitcoinstrings.cpp" line="85"/> <source>Username for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> + <location filename="../bitcoinstrings.cpp" line="86"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> + <location filename="../bitcoinstrings.cpp" line="87"/> <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> + <location filename="../bitcoinstrings.cpp" line="88"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> + <location filename="../bitcoinstrings.cpp" line="89"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> + <location filename="../bitcoinstrings.cpp" line="90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> + <location filename="../bitcoinstrings.cpp" line="93"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> + <location filename="../bitcoinstrings.cpp" line="94"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> + <location filename="../bitcoinstrings.cpp" line="95"/> <source>Rescan the block chain for missing wallet transactions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> + <location filename="../bitcoinstrings.cpp" line="96"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> + <location filename="../bitcoinstrings.cpp" line="97"/> <source>How thorough the block verification is (0-6, default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> + <location filename="../bitcoinstrings.cpp" line="101"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> + <location filename="../bitcoinstrings.cpp" line="102"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> + <location filename="../bitcoinstrings.cpp" line="103"/> <source>Server private key (default: server.pem)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> + <location filename="../bitcoinstrings.cpp" line="104"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> + <location filename="../bitcoinstrings.cpp" line="107"/> <source>This help message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="113"/> <source>Loading addresses...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> + <location filename="../bitcoinstrings.cpp" line="114"/> <source>Error loading addr.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> + <location filename="../bitcoinstrings.cpp" line="115"/> <source>Loading block index...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> + <location filename="../bitcoinstrings.cpp" line="116"/> <source>Error loading blkindex.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> + <location filename="../bitcoinstrings.cpp" line="117"/> <source>Loading wallet...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> + <location filename="../bitcoinstrings.cpp" line="118"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> + <location filename="../bitcoinstrings.cpp" line="119"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> + <location filename="../bitcoinstrings.cpp" line="120"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> + <location filename="../bitcoinstrings.cpp" line="121"/> <source>Error loading wallet.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> + <location filename="../bitcoinstrings.cpp" line="123"/> <source>Cannot initialize keypool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> + <location filename="../bitcoinstrings.cpp" line="124"/> <source>Cannot write default address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> + <location filename="../bitcoinstrings.cpp" line="125"/> <source>Rescanning...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> + <location filename="../bitcoinstrings.cpp" line="126"/> <source>Done loading</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> + <location filename="../bitcoinstrings.cpp" line="128"/> <source>Invalid amount for -paytxfee=<amount></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> + <location filename="../bitcoinstrings.cpp" line="129"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="96"/> + <location filename="../bitcoinstrings.cpp" line="133"/> <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../bitcoinstrings.cpp" line="99"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation type="unfinished"></translation> - </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts index 1175fb51a8..98f953852f 100644 --- a/src/qt/locale/bitcoin_fa.ts +++ b/src/qt/locale/bitcoin_fa.ts @@ -15,7 +15,7 @@ <translation>نسخه Bitcoin</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -76,6 +76,11 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>نمایش &کد QR</translation> </message> <message> + <location filename="../forms/addressbookpage.ui" line="96"/> + <source>Sign a message to prove you own this address</source> + <translation>یک پیام را امضا کنید تا ثابت کنید صاحب این نشانی هستید</translation> + </message> + <message> <location filename="../forms/addressbookpage.ui" line="99"/> <source>Sign &Message</source> <translation>امضای &پیام</translation> @@ -91,47 +96,42 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>حذف</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="96"/> - <source>Sign a message to prove you own this address</source> - <translation>یک پیام را امضا کنید تا ثابت کنید صاحب این نشانی هستید</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>کپی آدرس </translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation>کپی بر چسب</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation>ویرایش</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>حذف</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation>آدرس انتخاب شده در سیستم تخته رسم گیره دار کپی کنید</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation>Comma separated file (*.csv)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>خطای صدور</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation>تا فایل %1 نمی شود نوشت</translation> </message> @@ -177,11 +177,6 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>تکرار عبارت عبور نو</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="94"/> - <source>TextLabel</source> - <translation>بر چسب</translation> - </message> - <message> <location filename="../askpassphrasedialog.cpp" line="34"/> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> <translation>وارد کنید..&lt;br/&gt عبارت عبور نو در پنجره @@ -228,10 +223,9 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>تایید رمز گذاری</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="102"/> - <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! -Are you sure you wish to encrypt your wallet?</source> - <translation>هشدار اگر شما روی پنجره رمز بگذارید و عبارت عبور فراموش کنید همه بیتکویینس شما گم می کنید. متماینید کن که می خواهید رمز بگذارید</translation> + <location filename="../forms/askpassphrasedialog.ui" line="94"/> + <source>TextLabel</source> + <translation>بر چسب</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="111"/> @@ -286,250 +280,198 @@ Are you sure you wish to encrypt your wallet?</source> <translation>wallet passphrase با موفقیت تغییر یافت</translation> </message> <message> + <location filename="../askpassphrasedialog.cpp" line="156"/> + <source>Wallet decryption failed</source> + <translation>ناموفق رمز بندی پنجره</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="102"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! +Are you sure you wish to encrypt your wallet?</source> + <translation>هشدار اگر شما روی پنجره رمز بگذارید و عبارت عبور فراموش کنید همه بیتکویینس شما گم می کنید. متماینید کن که می خواهید رمز بگذارید</translation> + </message> + <message> <location filename="../askpassphrasedialog.cpp" line="217"/> <location filename="../askpassphrasedialog.cpp" line="241"/> <source>Warning: The Caps Lock key is on.</source> <translation>هشدار: کلید حروف بزرگ روشن است.</translation> </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="156"/> - <source>Wallet decryption failed</source> - <translation>ناموفق رمز بندی پنجره</translation> - </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="200"/> + <location filename="../bitcoingui.cpp" line="198"/> <source>Edit the list of stored addresses and labels</source> <translation>ویرایش لیست آدرسها و بر چسب های ذخیره ای</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> + <location filename="../bitcoingui.cpp" line="250"/> <source>&Export...</source> <translation>&;صادرات</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> + <location filename="../bitcoingui.cpp" line="506"/> <source>Synchronizing with network...</source> <translation>همگام سازی با شبکه ...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="187"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>&Overview</source> <translation>بررسی اجمالی</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="186"/> <source>Show general overview of wallet</source> <translation>نمای کلی پنجره نشان بده</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> - <source>Show the list of addresses for receiving payments</source> - <translation>نمایش لیست آدرس ها برای در یافت پر داخت ها</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="501"/> + <location filename="../bitcoingui.cpp" line="531"/> <source>Downloaded %1 blocks of transaction history.</source> <translation>دانلود بلوکهای معملات %1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="192"/> <source>Browse transaction history</source> <translation>نمایش تاریخ معاملات</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> + <location filename="../bitcoingui.cpp" line="197"/> <source>&Address Book</source> <translation>دفتر آدرس</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>%n بعد از چند روزز </numerusform> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> + <location filename="../bitcoingui.cpp" line="209"/> <source>&Send coins</source> <translation>رسال سکه ها</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> - <source>Last received block was generated %1.</source> - <translation>خرین بلوک در یافت شده تولید شده بود %1 </translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="238"/> + <location filename="../bitcoingui.cpp" line="236"/> <source>Quit application</source> <translation>خروج از برنامه </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> - <source>Sent transaction</source> - <translation>معامله ارسال شده</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="212"/> - <source>Send coins to a bitcoin address</source> - <translation>ارسال سکه به آدرس بیتکویین </translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="193"/> + <location filename="../bitcoingui.cpp" line="191"/> <source>&Transactions</source> <translation>&معاملات</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation>تا تاریخ</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation>در یافت سکه</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>زمایش شبکه</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> + <location filename="../bitcoingui.cpp" line="235"/> <source>E&xit</source> <translation>خروج</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> + <location filename="../bitcoingui.cpp" line="240"/> <source>Show information about Bitcoin</source> <translation>نمایش اطلاعات در مورد بیتکویین</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> - <source>&Options...</source> - <translation>تنظیمات...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="255"/> - <source>Encrypt or decrypt wallet</source> - <translation>رمز بندی یا رمز گشایی پنجره</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="283"/> + <location filename="../bitcoingui.cpp" line="281"/> <source>&File</source> <translation>فایل</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> + <location filename="../bitcoingui.cpp" line="258"/> <source>Change the passphrase used for wallet encryption</source> <translation>عبارت عبور رمز گشایی پنجره تغییر کنید</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> - <source>Sign &message</source> - <translation>امضای &پیام</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="305"/> + <location filename="../bitcoingui.cpp" line="303"/> <source>Tabs toolbar</source> <translation>نوار ابزار زبانه ها</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> + <location filename="../bitcoingui.cpp" line="314"/> <source>Actions toolbar</source> <translation>نوار ابزار عملیت</translation> </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> - <source>%n active connection(s) to Bitcoin network</source> - <translation> - <numerusform>در صد ارتباطات فعال بیتکویین با شبکه %n</numerusform> - </translation> - </message> <message> <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>صلاح تنظیمات برای بیتکویین</translation> + <source>Show/Hide &Bitcoin</source> + <translation>نمایش/ عدم نمایش BITCOIN</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation>صفحه Bitcoin را نمایش دهید/ندهید</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="73"/> + <location filename="../bitcoingui.cpp" line="215"/> + <source>Sign &message</source> + <translation>امضای &پیام</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="71"/> <source>Bitcoin Wallet</source> <translation>پنجره بیتکویین</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>همگام زنجیر بلوک در حال پیشرفت</translation> + <location filename="../bitcoingui.cpp" line="204"/> + <source>Show the list of addresses for receiving payments</source> + <translation>نمایش لیست آدرس ها برای در یافت پر داخت ها</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> - <source>Prove you control an address</source> - <translation>اثبات کنید که روی یک نشانی کنترل دارید</translation> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Send coins to a bitcoin address</source> + <translation>ارسال سکه به آدرس بیتکویین </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> + <location filename="../bitcoingui.cpp" line="239"/> <source>&About %1</source> <translation>&حدود%1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>باز کردن &بیتکویین </translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>نمایش پنجره بیتکویین</translation> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>صلاح تنظیمات برای بیتکویین</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> + <location filename="../bitcoingui.cpp" line="252"/> <source>&Encrypt Wallet</source> <translation>&رمز بندی پنجره</translation> </message> - <message> - <location filename="../bitcoingui.cpp" line="257"/> - <source>&Backup Wallet</source> - <translation type="unfinished">پشتیبان گیری از wallet</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>تغییر عبارت عبور</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="421"/> - <source>bitcoin-qt</source> - <translation>بیتکویین</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation> %1 %2 دانلود 1% 2% بلوک معاملات</translation> - </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation> <numerusform>%n بعد از چند دقیقه </numerusform> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation> <numerusform>%n بعد از چند دقیقه </numerusform> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> + <location filename="../bitcoingui.cpp" line="632"/> <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -541,89 +483,154 @@ Address: %4 آدرس %4</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Backup Wallet</source> - <translation>نسخه پیشتیبان از wallet </translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Wallet Data (*.dat)</source> - <translation>داده wallet (*.DAT)</translation> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>دانلود %1 از %2 بلاکهای تاریخچه تراکنش (%3% انجام شد)</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> - <source>Backup Failed</source> - <translation>عملیات پیشتیبان گیری انجام نشد</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="292"/> - <source>&Settings</source> - <translation>تنظیمات</translation> + <location filename="../bitcoingui.cpp" line="216"/> + <source>Prove you control an address</source> + <translation>اثبات کنید که روی یک نشانی کنترل دارید</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> + <location filename="../bitcoingui.cpp" line="296"/> <source>&Help</source> <translation>کمک</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>خطا روی داده است. Bitcoin نمی تواند بدون مشکل ادامه دهد و باید بسته شود</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation> <numerusform>%n بعد از چند دقیقه</numerusform> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> + <location filename="../bitcoingui.cpp" line="242"/> <source>About &Qt</source> <translation>درباره &Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> + <location filename="../bitcoingui.cpp" line="243"/> <source>Show information about Qt</source> <translation>نمایش اطلاعات درباره Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> + <location filename="../bitcoingui.cpp" line="251"/> <source>Export the data in the current tab to a file</source> <translation>داده ها نوارِ جاری را به فایل انتقال دهید</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> + <location filename="../bitcoingui.cpp" line="256"/> <source>Backup wallet to another location</source> <translation>نسخه پیشتیبان wallet را به محل دیگر انتقال دهید</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="255"/> + <source>&Backup Wallet</source> + <translation type="unfinished">پشتیبان گیری از wallet</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation>تغییر عبارت عبور</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="245"/> + <source>&Options...</source> + <translation>تنظیمات...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="253"/> + <source>Encrypt or decrypt wallet</source> + <translation>رمز بندی یا رمز گشایی پنجره</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="290"/> + <source>&Settings</source> + <translation>تنظیمات</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation>آزمایش شبکه</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation>مشتری Bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="418"/> + <source>bitcoin-qt</source> + <translation>بیتکویین</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="482"/> + <source>%n active connection(s) to Bitcoin network</source> + <translation> + <numerusform>در صد ارتباطات فعال بیتکویین با شبکه %n</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation> + <numerusform>%n بلاکِ باقیمانده +%n بلاکِ باقیمانده</numerusform> + </translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>ابتلا به بالا</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> + <location filename="../bitcoingui.cpp" line="577"/> + <source>Last received block was generated %1.</source> + <translation>خرین بلوک در یافت شده تولید شده بود %1 </translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="663"/> + <source>Sent transaction</source> + <translation>معامله ارسال شده</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="664"/> <source>Incoming transaction</source> <translation>معامله در یافت شده</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Backup Wallet</source> + <translation>نسخه پیشتیبان از wallet </translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>زمایش شبکهه</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Wallet Data (*.dat)</source> + <translation>داده wallet (*.DAT)</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="824"/> + <source>Backup Failed</source> + <translation>عملیات پیشتیبان گیری انجام نشد</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation>در زمان انتقال داده wallet به محل جدید خطا روی داد</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> + <location filename="../bitcoingui.cpp" line="636"/> <source>Sending...</source> <translation>ارسال...</translation> </message> @@ -631,22 +638,22 @@ Address: %4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&;واحد نمایش مبلغ</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>زیر بخش پیش فرض در واسط انتخاب کنید و سکه ها ارسال کنید</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>نمایش آدرسها در فهرست تراکنش</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished">تا آدرسهای bITCOIN در فهرست تراکنش نمایش داده شوند یا نشوند.</translation> </message> @@ -654,11 +661,6 @@ Address: %4 <context> <name>EditAddressDialog</name> <message> - <location filename="../forms/editaddressdialog.ui" line="35"/> - <source>The label associated with this address book entry</source> - <translation>بر چسب با دفتر آدرس ورود مرتبط است</translation> - </message> - <message> <location filename="../forms/editaddressdialog.ui" line="42"/> <source>&Address</source> <translation>آدرس</translation> @@ -674,6 +676,11 @@ Address: %4 <translation>بر چسب</translation> </message> <message> + <location filename="../forms/editaddressdialog.ui" line="35"/> + <source>The label associated with this address book entry</source> + <translation>بر چسب با دفتر آدرس ورود مرتبط است</translation> + </message> + <message> <location filename="../forms/editaddressdialog.ui" line="52"/> <source>The address associated with this address book entry. This can only be modified for sending addresses.</source> <translation>آدرس با دفتر آدرس ورودی مرتبط است. این فقط در مورد آدرسهای ارسال شده است</translation> @@ -694,9 +701,9 @@ Address: %4 <translation>اصلاح آدرس در یافت</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="31"/> - <source>Edit sending address</source> - <translation>اصلاح آدرس ارسال</translation> + <location filename="../editaddressdialog.cpp" line="106"/> + <source>New key generation failed.</source> + <translation>کلید نسل جدید ناموفق است</translation> </message> <message> <location filename="../editaddressdialog.cpp" line="101"/> @@ -704,16 +711,16 @@ Address: %4 <translation>رمز گشایی پنجره امکان پذیر نیست</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="106"/> - <source>New key generation failed.</source> - <translation>کلید نسل جدید ناموفق است</translation> - </message> - <message> <location filename="../editaddressdialog.cpp" line="91"/> <source>The entered address "%1" is already in the address book.</source> <translation>%1آدرس وارد شده دیگر در دفتر آدرس است</translation> </message> <message> + <location filename="../editaddressdialog.cpp" line="31"/> + <source>Edit sending address</source> + <translation>اصلاح آدرس ارسال</translation> + </message> + <message> <location filename="../editaddressdialog.cpp" line="96"/> <source>The entered address "%1" is not a valid bitcoin address.</source> <translation>آدرس وارد شده آدرس معتبر بیتکویید نیست %1 </translation> @@ -722,82 +729,92 @@ Address: %4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>شروع بیتکویین از پنجره سیستم استارت</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>شروع بیتکویین اتوماتین بعد از روشن کامپیوتر</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>حد اقل رساندن در جای نوار ابزار ها</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>نمایش فقط نماد سینی بعد از حد اقل رساندن پنجره</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> + <location filename="../optionsdialog.cpp" line="185"/> <source>Map port using &UPnP</source> <translation>درگاه با استفاده از</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="181"/> + <location filename="../optionsdialog.cpp" line="186"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>اتوماتیک باز کردن بندر بیتکویین در روتر . این فقط در مواردی می باشد که روتر با کمک یو پ ن پ کار می کند</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="180"/> <source>M&inimize on close</source> <translation>حد اقل رساندن در نزدیک</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="186"/> + <location filename="../optionsdialog.cpp" line="181"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>حد اقل رساندن در جای خروج بر نامه وقتیکه پنجره بسته است.وقتیکه این فعال است برنامه خاموش می شود بعد از انتخاب دستور خاموش در منیو</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>ارتباط با توسط</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation type="unfinished">وسل به شبکه بیتکویین با توسط</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>درس پروکسی</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>درس پروکسی</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>پورت پروکسی</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>ورت پروکسی</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>دستمزد&پر داخت معامله</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation>تفکیک بانک داده در زمان خاموشی</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation>بلاک و آدرس بانکهای داده را در زمان خاموشی جدا کن.این بدان معنی است که آنها می توانند به دایرکتوری داده دیگری منتقل شوند اما این باعث کندی روند خاموشی در سیستم خواهد شد. wallet همیشه تفکیک شده است.</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>نرخ اختیاری تراکنش هر کیلوبایت که به شما کمک میکند اطمینان پیدا کنید که تراکنشها به سرعت پردازش میشوند. بیشتر تراکنشها ۱ کیلوبایت هستند. نرخ 0.01 پیشنهاد میشود.</translation> </message> @@ -895,17 +912,17 @@ Address: %4 <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>صلی</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>دیسپلی</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>اصلی</translation> </message> @@ -928,6 +945,11 @@ Address: %4 <translation>راز:</translation> </message> <message> + <location filename="../forms/overviewpage.ui" line="61"/> + <source>0</source> + <translation>0</translation> + </message> + <message> <location filename="../overviewpage.cpp" line="103"/> <source>Your current balance</source> <translation>تزار جاری شما</translation> @@ -948,44 +970,39 @@ Address: %4 <translation>تعداد معامله</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="124"/> - <source><b>Recent transactions</b></source> - <translation>اخرین معاملات&lt</translation> - </message> - <message> <location filename="../overviewpage.cpp" line="111"/> <source>Total number of transactions in wallet</source> <translation>تعداد معاملات در صندوق</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="61"/> - <source>0</source> - <translation>0</translation> + <location filename="../forms/overviewpage.ui" line="124"/> + <source><b>Recent transactions</b></source> + <translation>اخرین معاملات&lt</translation> </message> </context> <context> <name>QRCodeDialog</name> <message> - <location filename="../forms/qrcodedialog.ui" line="144"/> - <source>Message:</source> - <translation>پیام</translation> - </message> - <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation>خطا در زمان رمزدار کردن URI در کد QR</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation>تصاویر با فرمت PNG (*.png)</translation> </message> <message> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>URI ذکر شده بسیار طولانی است، متن برچسب/پیام را کوتاه کنید</translation> + </message> + <message> <location filename="../forms/qrcodedialog.ui" line="55"/> <source>Request Payment</source> <translation>درخواست پرداخت</translation> @@ -1016,6 +1033,11 @@ Address: %4 <translation>کد QR</translation> </message> <message> + <location filename="../forms/qrcodedialog.ui" line="144"/> + <source>Message:</source> + <translation>پیام</translation> + </message> + <message> <location filename="../forms/qrcodedialog.ui" line="186"/> <source>&Save As...</source> <translation>&ذخیره به عنوان...</translation> @@ -1134,21 +1156,6 @@ Address: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="14"/> - <source>Form</source> - <translation>تراز</translation> - </message> - <message> - <location filename="../forms/sendcoinsentry.ui" line="29"/> - <source>A&mount:</source> - <translation>A&مبلغ :</translation> - </message> - <message> - <location filename="../forms/sendcoinsentry.ui" line="42"/> - <source>Pay &To:</source> - <translation>به&پر داخت :</translation> - </message> - <message> <location filename="../forms/sendcoinsentry.ui" line="66"/> <location filename="../sendcoinsentry.cpp" line="26"/> <source>Enter a label for this address to add it to your address book</source> @@ -1194,144 +1201,159 @@ Address: %4 <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>آدرس بیتکویین وارد کنید (bijvoorbeeld: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="14"/> + <source>Form</source> + <translation>تراز</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="29"/> + <source>A&mount:</source> + <translation>A&مبلغ :</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="42"/> + <source>Pay &To:</source> + <translation>به&پر داخت :</translation> + </message> </context> <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="28"/> + <location filename="../transactiondesc.cpp" line="30"/> <source>%1/unconfirmed</source> <translation>%1 تایید نشده </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation>ایید %1 </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> - <source>unknown</source> - <translation>مشخص نیست </translation> + <location filename="../transactiondesc.cpp" line="20"/> + <source>Open for %1 blocks</source> + <translation>باز کردن 1% بلوک 1%1 </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="22"/> + <source>Open until %1</source> + <translation>باز کردن تا%1</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="28"/> + <source>%1/offline?</source> + <translation>%1 انلاین نیست </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="50"/> + <source><b>Status:</b> </source> + <translation>&lt;b&gt;وضعیت :&lt;/b&gt;</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="55"/> + <source>, has not been successfully broadcast yet</source> + <translation>هنوز با مو فقیت ارسال نشده</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="57"/> + <source>, broadcast through %1 node</source> + <translation>ارسال توسط گره %1</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation>&lt;b&gt;به :&lt;/b&gt;</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation>مال شما) (</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation>&lt;b&gt;پر داخت معامله :&lt;/b&gt;</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation>&lt;b&gt;مبلغ خالص :&lt;/b&gt;</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>پیام</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>مورد نظر</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation>شماره تراکنش:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation> برای ارسال واحد های تولید شده باید 120 بلوک باشند. هنگامی که بلون ایجاد می شود به شبکه ارسال می شود تا در زنجیر بلوکها اضافه شود. و گر نه بلوک به غیر قابول و غیر ارسال عوض می شود. این اتفاقی می افتد وقتی که همزمان گره دیگر در بلوک ایجاد می شود.</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="18"/> - <source>Open for %1 blocks</source> - <translation>باز کردن 1% بلوک 1%1 </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="20"/> - <source>Open until %1</source> - <translation>باز کردن تا%1</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="26"/> - <source>%1/offline?</source> - <translation>%1 انلاین نیست </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="47"/> - <source><b>Status:</b> </source> - <translation>&lt;b&gt;وضعیت :&lt;/b&gt;</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="52"/> - <source>, has not been successfully broadcast yet</source> - <translation>هنوز با مو فقیت ارسال نشده</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="54"/> - <source>, broadcast through %1 node</source> - <translation>ارسال توسط گره %1</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>رسال توسط گره های %1</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation>&lt;b&gt;تاریخ :&lt;/b&gt</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation>&lt;b&gt;منبع :&lt;/b&gt; Generated&lt;br&gt</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation>&lt;b&gt;از:&lt;/b&gt;</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="92"/> + <source>unknown</source> + <translation>مشخص نیست </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation>&lt;b&gt;اعتبار :&lt;/b&gt;</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation>(%1 )بالغ در بلوک 2% و بیشتر%2</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation>قابل قبول نیست ( )</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation>&lt;b&gt;مقدار خالص:&lt;/b&gt;</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation>مال شما ، بر چسب( </translation> </message> @@ -1352,31 +1374,11 @@ Address: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="303"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>این بلوک از دیگر گره ها در یافت نشده بدین دلیل شاید قابل قابول نیست</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="306"/> - <source>Generated but not accepted</source> - <translation>تولید شده ولی قبول نشده</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="351"/> - <source>Received from</source> - <translation>دریافتی از</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="354"/> <source>Sent to</source> <translation>ارسال به :</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="356"/> - <source>Payment to yourself</source> - <translation>پر داخت به خودتان</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="214"/> <source>Date</source> <translation>تاریخ</translation> @@ -1392,6 +1394,26 @@ Address: %4 <translation>ایل جدا </translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="303"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>این بلوک از دیگر گره ها در یافت نشده بدین دلیل شاید قابل قابول نیست</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="306"/> + <source>Generated but not accepted</source> + <translation>تولید شده ولی قبول نشده</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="351"/> + <source>Received from</source> + <translation>دریافتی از</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="356"/> + <source>Payment to yourself</source> + <translation>پر داخت به خودتان</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="214"/> <source>Amount</source> <translation>مبلغ</translation> @@ -1427,7 +1449,7 @@ Address: %4 <location filename="../transactiontablemodel.cpp" line="297"/> <source>Mined balance will be available in %n more blocks</source> <translation> - <numerusform>و بیشتر باشند قابل قابول می شود %n تزار اصلی بعد از اینکه بلوکها</numerusform> + <numerusform></numerusform> </translation> </message> <message> @@ -1474,30 +1496,34 @@ Address: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="289"/> - <source>Could not write to file %1.</source> - <translation>تا فایل %1 نمی شود نوشت</translation> + <location filename="../transactionview.cpp" line="270"/> + <source>Export Transaction Data</source> + <translation>صادرات تاریخ معامله</translation> </message> <message> - <location filename="../transactionview.cpp" line="126"/> - <source>Copy amount</source> - <translation>روگرفت مقدار</translation> + <location filename="../transactionview.cpp" line="271"/> + <source>Comma separated file (*.csv)</source> + <translation>Comma فایل جدا </translation> </message> <message> - <location filename="../transactionview.cpp" line="281"/> - <source>Type</source> - <translation>نوع </translation> + <location filename="../transactionview.cpp" line="280"/> + <source>Date</source> + <translation>تاریخ </translation> </message> <message> - <location filename="../transactionview.cpp" line="283"/> - <source>Address</source> - <translation>ایل جدا </translation> + <location filename="../transactionview.cpp" line="282"/> + <source>Label</source> + <translation>ر چسب</translation> </message> <message> - <location filename="../transactionview.cpp" line="55"/> - <location filename="../transactionview.cpp" line="71"/> - <source>All</source> - <translation>همه</translation> + <location filename="../transactionview.cpp" line="392"/> + <source>to</source> + <translation>به</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="126"/> + <source>Copy amount</source> + <translation>روگرفت مقدار</translation> </message> <message> <location filename="../transactionview.cpp" line="57"/> @@ -1550,6 +1576,11 @@ Address: %4 <translation>یگر </translation> </message> <message> + <location filename="../transactionview.cpp" line="84"/> + <source>Enter address or label to search</source> + <translation>برای جستوجو نشانی یا برچسب را وارد کنید</translation> + </message> + <message> <location filename="../transactionview.cpp" line="90"/> <source>Min amount</source> <translation>حد اقل مبلغ </translation> @@ -1560,9 +1591,10 @@ Address: %4 <translation>امروز</translation> </message> <message> - <location filename="../transactionview.cpp" line="84"/> - <source>Enter address or label to search</source> - <translation>برای جستوجو نشانی یا برچسب را وارد کنید</translation> + <location filename="../transactionview.cpp" line="55"/> + <location filename="../transactionview.cpp" line="71"/> + <source>All</source> + <translation>همه</translation> </message> <message> <location filename="../transactionview.cpp" line="124"/> @@ -1585,29 +1617,14 @@ Address: %4 <translation>جزییت نشان بده</translation> </message> <message> - <location filename="../transactionview.cpp" line="270"/> - <source>Export Transaction Data</source> - <translation>صادرات تاریخ معامله</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="271"/> - <source>Comma separated file (*.csv)</source> - <translation>Comma فایل جدا </translation> - </message> - <message> - <location filename="../transactionview.cpp" line="280"/> - <source>Date</source> - <translation>تاریخ </translation> - </message> - <message> <location filename="../transactionview.cpp" line="279"/> <source>Confirmed</source> <translation>تایید شده</translation> </message> <message> - <location filename="../transactionview.cpp" line="282"/> - <source>Label</source> - <translation>ر چسب</translation> + <location filename="../transactionview.cpp" line="281"/> + <source>Type</source> + <translation>نوع </translation> </message> <message> <location filename="../transactionview.cpp" line="284"/> @@ -1625,20 +1642,25 @@ Address: %4 <translation>خطای صادرت</translation> </message> <message> + <location filename="../transactionview.cpp" line="289"/> + <source>Could not write to file %1.</source> + <translation>تا فایل %1 نمی شود نوشت</translation> + </message> + <message> <location filename="../transactionview.cpp" line="384"/> <source>Range:</source> <translation>>محدوده</translation> </message> <message> - <location filename="../transactionview.cpp" line="392"/> - <source>to</source> - <translation>به</translation> + <location filename="../transactionview.cpp" line="283"/> + <source>Address</source> + <translation>ایل جدا </translation> </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>ارسال...</translation> </message> @@ -1646,401 +1668,487 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> + <location filename="../bitcoinstrings.cpp" line="90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>زمانی که بهترین بلاک تغییر کرد، دستور را اجرا کن (%s در cmd با block hash جایگزین شده است)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> + <location filename="../bitcoinstrings.cpp" line="80"/> <source>Use the test network</source> <translation>استفاده شبکه آزمایش</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> - <source>Server private key (default: server.pem)</source> - <translation>(server.pemپیش فرض: ) کلید خصوصی سرور</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="71"/> - <source>This help message</source> - <translation>پیام کمکی</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="75"/> + <location filename="../bitcoinstrings.cpp" line="113"/> <source>Loading addresses...</source> <translation>بار گیری آدرس ها</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> + <location filename="../bitcoinstrings.cpp" line="116"/> <source>Error loading blkindex.dat</source> <translation>خطا در بارگیری blkindex.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> + <location filename="../bitcoinstrings.cpp" line="119"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> <translation>خطا در بارگیری wallet.dat: کیف پول به ویرایش جدیدتری از Biticon نیاز دارد</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation>امکان تنزل نسخه در wallet وجود ندارد</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> + <location filename="../bitcoinstrings.cpp" line="124"/> <source>Cannot write default address</source> <translation>آدرس پیش فرض قابل ذخیره نیست</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> - <source>Fee per KB to add to transactions you send</source> - <translation>پر داجت برای هر کیلو بیت برای اضافه به معامله ارسال</translation> + <location filename="../bitcoinstrings.cpp" line="54"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation>سایز کَش بانک داده را بر حسب مگابایت تنظیم کنید (پیش فرض:25)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>Username for JSON-RPC connections</source> + <translation>JSON-RPC شناسه برای ارتباطات</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="86"/> + <source>Password for JSON-RPC connections</source> + <translation>JSON-RPC عبارت عبور برای ارتباطات</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>(127.0.0.1پیش فرض: ) &lt;ip&gt; دادن فرمانها برای استفاده گره ها روی</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation>%s، شما باید یک rpcpassword را در فایل پیکربندی تنظیم کنید :⏎%s⏎ توصیه می شود از رمزهای تصادفی زیر استفاده کنید⏎ rpcuser=bitcoinrpc⏎ rpcpassword=%s⏎ (لازم نیست این رمز را به خاطر بسپارید) ⏎ اگر فایل ایجاد نشد، یک فایل فقط متنی ایجاد کنید +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="50"/> + <source>Don't generate coins</source> + <translation>تولید سکه ها</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation>%s، شما باید یک rpcpassword را در فایل پیکربندی تنظیم کنید :⏎%s⏎ اگر فایل ایجاد نشد، یک فایل فقط متنی ایجاد کنید. +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>بود جه نا کافی </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation>برای استفاده از %s از انتخابات</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="78"/> + <source>Accept command line and JSON-RPC commands</source> + <translation>JSON-RPC قابل فرمانها و</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="61"/> + <source>Add a node to connect to and attempt to keep the connection open</source> + <translation>به اتصال یک گره اضافه کنید و اتصال را باز نگاه دارید</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>( 8332پیش فرض :) &lt;poort&gt; JSON-RPC شنوایی برای ارتباطات</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="83"/> + <source>Send trace/debug info to console instead of debug.log file</source> + <translation>اطلاعات ردگیری/اشکالزدایی را به جای فایل لاگ اشکالزدایی به کنسول بفرستید</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="63"/> <source>Find peers using internet relay chat (default: 0)</source> <translation>یافتنت قرینه با استفاده از internet relay chat (پیش فرض:0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> - <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation>چند بلاک برای بررسی در زمان startup (پیش فرض:2500 , 0=همه)</translation> + <location filename="../bitcoinstrings.cpp" line="43"/> + <source>Send command to -server or bitcoind</source> + <translation>ارسال فرمان به سرور یا باتکویین</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="77"/> + <source>Fee per KB to add to transactions you send</source> + <translation>پر داجت برای هر کیلو بیت برای اضافه به معامله ارسال</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="47"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation>(: bitcoin.confپیش فرض: )فایل تنظیمی خاص </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation> (100پیش فرض:)&lt;n&gt; گذاشتن اندازه کلید روی </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source>Rescanning...</source> + <translation>اسکان مجدد</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="115"/> <source>Loading block index...</source> <translation>بار گیری شاخص بلوک</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> - <source>Loading wallet...</source> - <translation>بار گیری والت</translation> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>یت کویین </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>سایز کَش بانک داده را بر حسب مگابایت تنظیم کنید (پیش فرض:25)</translation> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source>How many blocks to check at startup (default: 2500, 0 = all)</source> + <translation>چند بلاک برای بررسی در زمان startup (پیش فرض:2500 , 0=همه)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> + <location filename="../bitcoinstrings.cpp" line="101"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>JSON-RPCبرای ارتباطات استفاده کنید OpenSSL (https)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="93"/> <source>Upgrade wallet to latest format</source> <translation>wallet را به جدیدترین فرمت روزآمد کنید</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Threshold for disconnecting misbehaving peers (default: 100)</source> - <translation>آستانه برای قطع ارتباط با همکاران بدرفتار (پیشفرض: 100)</translation> + <location filename="../bitcoinstrings.cpp" line="103"/> + <source>Server private key (default: server.pem)</source> + <translation>(server.pemپیش فرض: ) کلید خصوصی سرور</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> + <location filename="../bitcoinstrings.cpp" line="107"/> + <source>This help message</source> + <translation>پیام کمکی</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Loading wallet...</source> + <translation>بار گیری والت</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="79"/> <source>Run in the background as a daemon and accept commands</source> <translation>اجرای در پس زمینه به عنوان شبح و قبول فرمان ها</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> + <location filename="../bitcoinstrings.cpp" line="84"/> <source>Send trace/debug info to debugger</source> <translation>اطلاعات ردگیری/اشکالزدایی را به اشکالزدا بفرستید</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> - <source>Username for JSON-RPC connections</source> - <translation>JSON-RPC شناسه برای ارتباطات</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Password for JSON-RPC connections</source> - <translation>JSON-RPC عبارت عبور برای ارتباطات</translation> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>ارسال...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>(127.0.0.1پیش فرض: ) &lt;ip&gt; دادن فرمانها برای استفاده گره ها روی</translation> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>میزان وجه اشتباه</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation> (100پیش فرض:)&lt;n&gt; گذاشتن اندازه کلید روی </translation> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>رمز های قابل قبول( TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> - <source>Rescan the block chain for missing wallet transactions</source> - <translation>اسکان مجدد زنجیر بلوکها برای گم والت معامله</translation> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>رمز گشایی دایرکتور داده ها امکان پذیر نیست. شاید بیت کویین در حال فعال می باشد%s</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> - <source>How thorough the block verification is (0-6, default: 1)</source> - <translation>چقد کامل بلوک تصدیق است (0-6, پیش فرض:1)</translation> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation>خطا</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> - <source>Server certificate file (default: server.cert)</source> - <translation> (server.certپیش فرض: )گواهی نامه سرور</translation> + <location filename="../bitcoinstrings.cpp" line="68"/> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> + <translation>مدت زمان به ثانیه برای جلوگیری از همکاران بدرفتار برای اتصال دوباره (پیشفرض: 86400)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> + <location filename="../bitcoinstrings.cpp" line="44"/> <source>List commands</source> <translation>لیست فومان ها</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> + <location filename="../bitcoinstrings.cpp" line="46"/> <source>Options:</source> <translation>تنظیمات</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Don't generate coins</source> - <translation>تولید سکه ها</translation> + <location filename="../bitcoinstrings.cpp" line="49"/> + <source>Generate coins</source> + <translation>سکه های تولید شده</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> + <location filename="../bitcoinstrings.cpp" line="53"/> <source>Specify data directory</source> <translation>دایرکتور اطلاعاتی خاص</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>(میلی ثانیه )فاصله ارتباط خاص</translation> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation>سایز دیسک لاگِ بانک داده را بر حسب مگابایت تنظیم کنید (پیش فرض:100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Generate coins</source> - <translation>سکه های تولید شده</translation> + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Specify connection timeout (in milliseconds)</source> + <translation>(میلی ثانیه )فاصله ارتباط خاص</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Add a node to connect to and attempt to keep the connection open</source> - <translation>به اتصال یک گره اضافه کنید و اتصال را باز نگاه دارید</translation> + <location filename="../bitcoinstrings.cpp" line="88"/> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation>از آدرس آی پی خاص JSON-RPC قبول ارتباطات</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>اطلاعات ردگیری/اشکالزدایی را به جای فایل لاگ اشکالزدایی به کنسول بفرستید</translation> + <location filename="../bitcoinstrings.cpp" line="41"/> + <source>Bitcoin version</source> + <translation>سخه بیتکویین</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> - <source>Accept command line and JSON-RPC commands</source> - <translation>JSON-RPC قابل فرمانها و</translation> + <location filename="../bitcoinstrings.cpp" line="123"/> + <source>Cannot initialize keypool</source> + <translation>امکان مقداردهی اولیه برای key pool وجود ندارد</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> - <source>Prepend debug output with timestamp</source> - <translation>به خروجی اشکالزدایی برچسب زمان بزنید</translation> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation> تفکیک بلاک و آدرس بانک داده ها. افزایش زمان خاموشی (پیش فرض:0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation>( 8332پیش فرض :) &lt;poort&gt; JSON-RPC شنوایی برای ارتباطات</translation> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>Done loading</source> + <translation>بار گیری انجام شده است</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Allow JSON-RPC connections from specified IP address</source> - <translation>از آدرس آی پی خاص JSON-RPC قبول ارتباطات</translation> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>Error loading wallet.dat</source> + <translation>خطا در بارگیری wallet.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> - <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation>سلام</translation> + <location filename="../bitcoinstrings.cpp" line="118"/> + <source>Error loading wallet.dat: Wallet corrupted</source> + <translation>خطا در بارگیری wallet.dat: کیف پول خراب شده است</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> - <source>Error loading wallet.dat</source> - <translation>خطا در بارگیری wallet.dat</translation> + <location filename="../bitcoinstrings.cpp" line="45"/> + <source>Get help for a command</source> + <translation>کمک برای فرمان </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> - <source>Cannot initialize keypool</source> - <translation>امکان مقداردهی اولیه برای key pool وجود ندارد</translation> + <location filename="../bitcoinstrings.cpp" line="59"/> + <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> + <translation>برای اتصالات به <port> (پیشفرض: 8333 یا تستنت: 18333) گوش کنید</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Send command to -server or bitcoind</source> - <translation>ارسال فرمان به سرور یا باتکویین</translation> + <location filename="../bitcoinstrings.cpp" line="60"/> + <source>Maintain at most <n> connections to peers (default: 125)</source> + <translation>حداکثر <n> اتصال با همکاران برقرار داشته باشید (پیشفرض: 125)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> - <source>Error loading wallet.dat: Wallet corrupted</source> - <translation>خطا در بارگیری wallet.dat: کیف پول خراب شده است</translation> + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation>اسکان مجدد زنجیر بلوکها برای گم والت معامله</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify configuration file (default: bitcoin.conf)</source> - <translation>(: bitcoin.confپیش فرض: )فایل تنظیمی خاص </translation> + <location filename="../bitcoinstrings.cpp" line="102"/> + <source>Server certificate file (default: server.cert)</source> + <translation> (server.certپیش فرض: )گواهی نامه سرور</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> + <location filename="../bitcoinstrings.cpp" line="48"/> <source>Specify pid file (default: bitcoind.pid)</source> <translation>(bitcoind.pidپیش فرض : ) فایل پید خاص</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> + <location filename="../bitcoinstrings.cpp" line="67"/> + <source>Threshold for disconnecting misbehaving peers (default: 100)</source> + <translation>آستانه برای قطع ارتباط با همکاران بدرفتار (پیشفرض: 100)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="42"/> + <source>Usage:</source> + <translation>ستفاده :</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="120"/> + <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> + <translation>سلام</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Prepend debug output with timestamp</source> + <translation>به خروجی اشکالزدایی برچسب زمان بزنید</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Warning: Disk space is low</source> + <translation type="unfinished">هشدار: فضای دیسک محدود است!</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation type="unfinished">ستفاده </translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="51"/> <source>Start minimized</source> <translation>شروع حد اقل</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> - <source>Done loading</source> - <translation>بار گیری انجام شده است</translation> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation>برای اتصالات به <port> (پیشفرض: 8333 یا تستنت: 18333) گوش کنید</translation> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> - <source>Rescanning...</source> - <translation>اسکان مجدد</translation> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">خطا: ایجاد تراکنش انجام نشد</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>رمز های قابل قبول( TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">خطا: تراکنش تایید نشد. این پیام زمانی روی می دهد که مقداری از سکه های WALLET شما استفاده شده اند برای مثال اگر شما از WALLET.DAT استفاده کرده اید، ممکن است سکه ها استفاده شده باشند اما در اینجا نمایش داده نشوند</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Maintain at most <n> connections to peers (default: 125)</source> - <translation>حداکثر <n> اتصال با همکاران برقرار داشته باشید (پیشفرض: 125)</translation> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation>در زمان تنظیم درگاه RPX %u در فهرست کردن %s اشکالی رخ داده است</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> + <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation>ارتباط فقط به گره خاص</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation>مدت زمان به ثانیه برای جلوگیری از همکاران بدرفتار برای اتصال دوباره (پیشفرض: 86400)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation>حداکثر بافر دریافتی در هر اتصال، 1000*<n> (پیشفرض: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation>حداکثر بافر ارسالی در هر اتصال، 1000*<n> (پیشفرض: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> + <location filename="../bitcoinstrings.cpp" line="81"/> <source>Output extra debugging information</source> <translation>اطلاعات اشکالزدایی اضافی خروجی</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>How thorough the block verification is (0-6, default: 1)</source> + <translation>چقد کامل بلوک تصدیق است (0-6, پیش فرض:1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation> ( نگاه کنید Bitcoin Wiki در SSLتنظیمات ):SSL گزینه های</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> - <translation type="unfinished">هشدار: فضای دیسک محدود است!</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="76"/> + <location filename="../bitcoinstrings.cpp" line="114"/> <source>Error loading addr.dat</source> <translation>خطا در بارگیری addr.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation>آدرس پروکسی معتبر نیست </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> + <location filename="../bitcoinstrings.cpp" line="128"/> <source>Invalid amount for -paytxfee=<amount></source> <translation>paytxfee=&lt;بالغ &gt;مبلغ نا معتبر</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> + <location filename="../bitcoinstrings.cpp" line="129"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation>خطا : پر داخت خیلی بالا است. این پر داخت معامله است که شما هنگام ارسال معامله باید پر داخت کنید</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> + <location filename="../bitcoinstrings.cpp" line="133"/> <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> <translation>وسل بندر به کامپیوتر امکان پذیر نیست. شاید بیتکویید در حال فعال است%d</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> + <location filename="../bitcoinstrings.cpp" line="38"/> <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> <translation>هشدار: تاریخ و ساعت کامپیوتر شما چک کنید. اگر ساعت درست نیست بیتکویین مناسب نخواهد کار کرد</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation>خطا :ایجاد موضوع(گره) اشتباه بود</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Bitcoin version</source> - <translation>سخه بیتکویین</translation> + <location filename="../bitcoinstrings.cpp" line="64"/> + <source>Accept connections from outside (default: 1)</source> + <translation type="unfinished">پذیرش اتصالات از بیرون (پیش فرض:1 بدون پراکسی یا اتصال)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Usage:</source> - <translation>ستفاده :</translation> + <location filename="../bitcoinstrings.cpp" line="65"/> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>زبان را تنظیم کنید برای مثال "de_DE" (پیش فرض: system locale)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Get help for a command</source> - <translation>کمک برای فرمان </translation> + <location filename="../bitcoinstrings.cpp" line="73"/> + <source>Use Universal Plug and Play to map the listening port (default: 1)</source> + <translation type="unfinished">از UPnP برای شناسایی درگاه شنیداری استفاده کنید (پیش فرض:1 در زمان شنیدن)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> + <location filename="../bitcoinstrings.cpp" line="74"/> + <source>Use Universal Plug and Play to map the listening port (default: 0)</source> + <translation type="unfinished">از UPnP برای شناسایی درگاه شنیداری استفاده کنید (پیش فرض:0)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="52"/> <source>Show splash screen on startup (default: 1)</source> <translation>نمایش صفحه splash در STARTUP (پیش فرض:1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> + <location filename="../bitcoinstrings.cpp" line="57"/> <source>Connect through socks4 proxy</source> <translation>socks4 proxy ارتباط توسط</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> + <location filename="../bitcoinstrings.cpp" line="58"/> <source>Allow DNS lookups for addnode and connect</source> <translation>اجازه متغیر دی ان اس برای اضافه گره یا ارتباط</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Accept connections from outside (default: 1)</source> - <translation type="unfinished">پذیرش اتصالات از بیرون (پیش فرض:1 بدون پراکسی یا اتصال)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="65"/> - <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>JSON-RPCبرای ارتباطات استفاده کنید OpenSSL (https)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>زبان را تنظیم کنید برای مثال "de_DE" (پیش فرض: system locale)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="32"/> + <location filename="../bitcoinstrings.cpp" line="66"/> <source>Find peers using DNS lookup (default: 1)</source> <translation type="unfinished">قرینه ها را برای جستجوی DNS بیاب (پیش فرض: 1 مگر در زمان اتصال)</translation> </message> - <message> - <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Use Universal Plug and Play to map the listening port (default: 1)</source> - <translation type="unfinished">از UPnP برای شناسایی درگاه شنیداری استفاده کنید (پیش فرض:1 در زمان شنیدن)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Use Universal Plug and Play to map the listening port (default: 0)</source> - <translation type="unfinished">از UPnP برای شناسایی درگاه شنیداری استفاده کنید (پیش فرض:0)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>بتا</translation> - </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/bitcoin_fa_IR.ts index d6c001c532..cfc3418c37 100644 --- a/src/qt/locale/bitcoin_fa_IR.ts +++ b/src/qt/locale/bitcoin_fa_IR.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> version</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -89,42 +89,42 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>و حذف</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>آدرس را کپی کنید</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation>برچسب را کپی کنید</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation type="unfinished">و ویرایش</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>و حذف</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation>انتقال اطلاعات دفترچه آدرس</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation>سی.اس.وی. (فایل جداگانه دستوری)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>صدور پیام خطا</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation>قابل کپی در فایل نیست %1</translation> </message> @@ -292,163 +292,152 @@ Are you sure you wish to encrypt your wallet?</source> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="200"/> + <location filename="../bitcoingui.cpp" line="198"/> <source>Edit the list of stored addresses and labels</source> <translation>فهرست آدرسها و برچسبهای ذخیره شده را ویرایش کن</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation>و دریافت سکه ها</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> + <location filename="../bitcoingui.cpp" line="209"/> <source>&Send coins</source> <translation>و ارسال سکه ها</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> + <location filename="../bitcoingui.cpp" line="235"/> <source>E&xit</source> <translation>خروج</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> + <location filename="../bitcoingui.cpp" line="236"/> <source>Quit application</source> <translation>از "درخواست نامه"/ application خارج شو</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> + <location filename="../bitcoingui.cpp" line="240"/> <source>Show information about Bitcoin</source> <translation>اطلاعات در مورد Bitcoin را نشان بده</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> + <location filename="../bitcoingui.cpp" line="242"/> <source>About &Qt</source> <translation>درباره و QT</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> + <location filename="../bitcoingui.cpp" line="243"/> <source>Show information about Qt</source> <translation>نمایش اطلاعات درباره QT</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> + <location filename="../bitcoingui.cpp" line="245"/> <source>&Options...</source> <translation>و انتخابها</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> - <translation>و صدور</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="253"/> - <source>Export the data in the current tab to a file</source> - <translation>صدور داده نوار جاری به یک فایل</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="255"/> - <source>Encrypt or decrypt wallet</source> - <translation>رمزگذاری با رمزگشایی از wallet</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="260"/> - <source>Change the passphrase used for wallet encryption</source> - <translation>رمز مربوط به رمزگذاریِ wallet را تغییر دهید</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="305"/> - <source>Tabs toolbar</source> - <translation>نوار ابزار</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> + <location filename="../bitcoingui.cpp" line="506"/> <source>Synchronizing with network...</source> <translation>به روز رسانی با شبکه...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="187"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>&Overview</source> <translation>و بازبینی</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="186"/> <source>Show general overview of wallet</source> <translation>نمای کلی از wallet را نشان بده</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="192"/> <source>Browse transaction history</source> <translation>تاریخچه تراکنش را باز کن</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> + <location filename="../bitcoingui.cpp" line="197"/> <source>&Address Book</source> <translation>و دفترجه ادرس</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation>فهرست آدرسها را برای دریافت وجه نشان بده</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> + <location filename="../bitcoingui.cpp" line="191"/> <source>&Transactions</source> <translation>و تراکنش</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> + <location filename="../bitcoingui.cpp" line="71"/> + <source>Bitcoin Wallet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Send coins to a bitcoin address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="215"/> <source>Sign &message</source> <translation type="unfinished">امضا و پیام</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>اصلاح انتخابها برای پیکربندی Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="216"/> + <source>Prove you control an address</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> - <source>Up to date</source> - <translation>روزآمد</translation> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>اصلاح انتخابها برای پیکربندی Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> + <location filename="../bitcoingui.cpp" line="256"/> <source>Backup wallet to another location</source> <translation>گرفتن نسخه پیشتیبان در آدرسی دیگر</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> + <location filename="../bitcoingui.cpp" line="257"/> <source>&Change Passphrase</source> <translation type="unfinished">تغییر رمز/پَس فرِیز</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> + <location filename="../bitcoingui.cpp" line="281"/> <source>&File</source> <translation>و فایل</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> + <location filename="../bitcoingui.cpp" line="290"/> <source>&Settings</source> <translation>و تنظیمات</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> + <location filename="../bitcoingui.cpp" line="296"/> <source>&Help</source> <translation>و راهنما</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> + <location filename="../bitcoingui.cpp" line="314"/> <source>Actions toolbar</source> <translation>نوار عملیات</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> + <message> + <location filename="../bitcoingui.cpp" line="418"/> + <source>bitcoin-qt</source> + <translation type="unfinished"></translation> + </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> + <location filename="../bitcoingui.cpp" line="482"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n ارتباط فعال به شبکه Bitcoin @@ -456,12 +445,12 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> + <location filename="../bitcoingui.cpp" line="531"/> <source>Downloaded %1 blocks of transaction history.</source> <translation>دانلود %1 از بلاکها در تاریخچه تراکنش</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>%n روز قبل @@ -470,17 +459,12 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation type="unfinished">دانلود %1 از %2 بلاک مربوط به تاریخچه تراکنش </translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation>بلاک دریافت شده قبلی به میزان %1 تولید شده است</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation> <numerusform>%n ثانیه قبل @@ -488,98 +472,121 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="73"/> - <source>Bitcoin Wallet</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation>نمایش/ عدم نمایش و bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation type="unfinished">درباره و %1</translation> </message> - <message> - <location filename="../bitcoingui.cpp" line="212"/> - <source>Send coins to a bitcoin address</source> - <translation type="unfinished"></translation> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="550"/> + <source>%n minute(s) ago</source> + <translation> + <numerusform>%n دقیقه قبل +%n دقیقه قبل</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="554"/> + <source>%n hour(s) ago</source> + <translation> + <numerusform>%n ساعت قبل +%n ساعت قبل</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> - <source>Prove you control an address</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="255"/> + <source>&Backup Wallet</source> + <translation type="unfinished">گرفتن نسخه پیشتیبان از Wallet</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation type="unfinished">درباره و %1</translation> + <location filename="../bitcoingui.cpp" line="252"/> + <source>&Encrypt Wallet</source> + <translation type="unfinished">و رمزگذاری wallet</translation> </message> <message> <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation type="unfinished"></translation> + <source>&Export...</source> + <translation>و صدور</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation>نمایش یا عدم نمایش در صفحه bitcoin</translation> </message> <message> <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation type="unfinished">نمایش یا عدم نمایش در صفحه bitcoin</translation> + <source>Export the data in the current tab to a file</source> + <translation>صدور داده نوار جاری به یک فایل</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation type="unfinished">و رمزگذاری wallet</translation> + <location filename="../bitcoingui.cpp" line="253"/> + <source>Encrypt or decrypt wallet</source> + <translation>رمزگذاری با رمزگشایی از wallet</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> - <source>&Backup Wallet</source> - <translation type="unfinished">گرفتن نسخه پیشتیبان از Wallet</translation> + <location filename="../bitcoingui.cpp" line="258"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>رمز مربوط به رمزگذاریِ wallet را تغییر دهید</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> - <source>bitcoin-qt</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="303"/> + <source>Tabs toolbar</source> + <translation>نوار ابزار</translation> </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> - <source>%n minute(s) ago</source> - <translation> - <numerusform>%n دقیقه قبل -%n دقیقه قبل</numerusform> - </translation> + <message> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation>مشتری bitcoin</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> - <source>%n hour(s) ago</source> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> <translation> - <numerusform>%n ساعت قبل -%n ساعت قبل</numerusform> + <numerusform>~%n بلاک باقی مانده است +~%n بلاک باقی مانده است</numerusform> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>دانلود %1 از %2 بلاک مربوط به تاریخچه تراکنش (%3% انجام شده است)</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>در حال روزآمد سازی..</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> + <location filename="../bitcoingui.cpp" line="564"/> + <source>Up to date</source> + <translation>روزآمد</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="632"/> <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> + <location filename="../bitcoingui.cpp" line="636"/> <source>Sending...</source> <translation>در حال ارسال...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> + <location filename="../bitcoingui.cpp" line="663"/> <source>Sent transaction</source> <translation>ارسال تراکنش</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> + <location filename="../bitcoingui.cpp" line="664"/> <source>Incoming transaction</source> <translation>تراکنش دریافتی</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -589,38 +596,38 @@ Address: %4 </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>wallet رمزگذاری شد و در حال حاضر از حالت قفل در آمده است</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>wallet رمزگذاری شد و در حال حاضر قفل است</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Backup Wallet</source> <translation>گرفتن نسخه پیشتیبان از Wallet</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation>داده های Wallet (*.dat)</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation>عملیات گرفتن نسخه پیشتیبان انجام نشد</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation>در هنگام ذخیره داده های wallet به نسخه جدید خطایی ایجاد شده است</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -628,22 +635,22 @@ Address: %4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>و نمایش آدرسها در فهرست تراکنش</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished"></translation> </message> @@ -719,85 +726,95 @@ Address: %4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="180"/> - <source>Map port using &UPnP</source> + <source>M&inimize on close</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="181"/> - <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="185"/> - <source>M&inimize on close</source> + <source>Map port using &UPnP</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="186"/> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> + <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessagePage</name> @@ -892,17 +909,17 @@ Address: %4 <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>انتخاب/آپشن</translation> </message> @@ -963,11 +980,26 @@ Address: %4 <context> <name>QRCodeDialog</name> <message> + <location filename="../forms/qrcodedialog.ui" line="14"/> + <source>Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="32"/> + <source>QR Code</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/qrcodedialog.ui" line="55"/> <source>Request Payment</source> <translation>درخواست وجه</translation> </message> <message> + <location filename="../forms/qrcodedialog.ui" line="105"/> + <source>BTC</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/qrcodedialog.ui" line="121"/> <source>Label:</source> <translation>برچسب:</translation> @@ -983,18 +1015,19 @@ Address: %4 <translation>میزان وجه:</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="14"/> - <source>Dialog</source> + <location filename="../qrcodedialog.cpp" line="46"/> + <source>Error encoding URI into QR Code.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="32"/> - <source>QR Code</source> - <translation type="unfinished"></translation> + <location filename="../qrcodedialog.cpp" line="121"/> + <source>PNG Images (*.png)</source> + <translation>تصاویر با فرمت PNG +(*.png)</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="105"/> - <source>BTC</source> + <location filename="../qrcodedialog.cpp" line="121"/> + <source>Save Image...</source> <translation type="unfinished"></translation> </message> <message> @@ -1003,20 +1036,9 @@ Address: %4 <translation>و ذخیره با عنوانِ...</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> - <source>Error encoding URI into QR Code.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qrcodedialog.cpp" line="113"/> - <source>PNG Images (*.png)</source> - <translation>تصاویر با فرمت PNG -(*.png)</translation> - </message> - <message> - <location filename="../qrcodedialog.cpp" line="113"/> - <source>Save Image...</source> - <translation type="unfinished"></translation> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>متن وارد شده طولانی است، متنِ برچسب/پیام را کوتاه کنید</translation> </message> </context> <context> @@ -1196,140 +1218,140 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="18"/> + <location filename="../transactiondesc.cpp" line="20"/> <source>Open for %1 blocks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> - <source>Open until %1</source> - <translation>باز کن تا %1</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="28"/> + <location filename="../transactiondesc.cpp" line="30"/> <source>%1/unconfirmed</source> <translation>%1 غیرقابل تایید</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation>%1 تاییدها</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="57"/> + <source>, broadcast through %1 node</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="59"/> + <source>, broadcast through %1 nodes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation type="unfinished"><b>تاریخ:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> - <source><b>To:</b> </source> + <location filename="../transactiondesc.cpp" line="70"/> + <source><b>Source:</b> Generated<br></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> + <source><b>From:</b> </source> <translation type="unfinished"></translation> </message> <message> <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> + <source><b>To:</b> </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>پیام:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation>تا به حال با موفقیت انتشار نیافته است</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> - <source>, broadcast through %1 node</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="56"/> - <source>, broadcast through %1 nodes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="67"/> - <source><b>Source:</b> Generated<br></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> - <source><b>From:</b> </source> - <translation type="unfinished"></translation> + <location filename="../transactiondesc.cpp" line="22"/> + <source>Open until %1</source> + <translation>باز کن تا %1</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="92"/> <source>unknown</source> <translation>ناشناس</translation> </message> @@ -1349,6 +1371,11 @@ Address: %4 </context> <context> <name>TransactionTableModel</name> + <message> + <location filename="../transactiontablemodel.cpp" line="356"/> + <source>Payment to yourself</source> + <translation>وجه برای شما </translation> + </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="277"/> <source>Open for %n block(s)</source> @@ -1379,11 +1406,6 @@ Address: %4 <translation>میزان وجه</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="280"/> - <source>Open until %1</source> - <translation>باز کن تا %1</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="286"/> <source>Unconfirmed (%1 of %2 confirmations)</source> <translation>تایید نشده (%1 از %2 تاییدها)</translation> @@ -1394,6 +1416,11 @@ Address: %4 <translation>برون خطی (%1 تاییدها)</translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="280"/> + <source>Open until %1</source> + <translation>باز کن تا %1</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="289"/> <source>Confirmed (%1 confirmations)</source> <translation>تایید شده (%1 تاییدها)</translation> @@ -1431,11 +1458,6 @@ Address: %4 <translation>ارسال به</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="356"/> - <source>Payment to yourself</source> - <translation>وجه برای شما </translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="358"/> <source>Mined</source> <translation>استخراج شده</translation> @@ -1474,9 +1496,9 @@ Address: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="384"/> - <source>Range:</source> - <translation>دامنه:</translation> + <location filename="../transactionview.cpp" line="284"/> + <source>Amount</source> + <translation>میزان</translation> </message> <message> <location filename="../transactionview.cpp" line="55"/> @@ -1610,11 +1632,6 @@ Address: %4 <translation>آدرس</translation> </message> <message> - <location filename="../transactionview.cpp" line="284"/> - <source>Amount</source> - <translation>میزان</translation> - </message> - <message> <location filename="../transactionview.cpp" line="285"/> <source>ID</source> <translation>شناسه کاربری</translation> @@ -1630,6 +1647,11 @@ Address: %4 <translation>قابل کپی به فایل نیست %1.</translation> </message> <message> + <location filename="../transactionview.cpp" line="384"/> + <source>Range:</source> + <translation>دامنه:</translation> + </message> + <message> <location filename="../transactionview.cpp" line="392"/> <source>to</source> <translation>به</translation> @@ -1638,7 +1660,7 @@ Address: %4 <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>در حال ارسال...</translation> </message> @@ -1646,400 +1668,486 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>تعیین مدت زمان وقفه (time out) به هزارم ثانیه</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="88"/> - <source>Done loading</source> - <translation>اتمام لود شدن</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="54"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>دستور را وقتی بهترین بلاک تغییر کرد اجرا کن (%s در دستور توسط block hash جایگزین شده است)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>دستورات را به گره اجرا شده در<ip> ارسال کنید (پیش فرض:127.0.0.1)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="79"/> + <location filename="../bitcoinstrings.cpp" line="117"/> <source>Loading wallet...</source> <translation>wallet در حال لود شدن است...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> + <location filename="../bitcoinstrings.cpp" line="67"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>آستانه قطع برای قرینه سازی اشتباه (پیش فرض:100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> + <location filename="../bitcoinstrings.cpp" line="103"/> <source>Server private key (default: server.pem)</source> <translation>رمز اختصاصی سرور (پیش فرض: server.pem)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> + <location filename="../bitcoinstrings.cpp" line="94"/> <source>Set key pool size to <n> (default: 100)</source> <translation>حجم key pool را به اندازه <n> تنظیم کنید (پیش فرض:100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> + <location filename="../bitcoinstrings.cpp" line="107"/> <source>This help message</source> <translation>این پیام راهنما</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> + <location filename="../bitcoinstrings.cpp" line="101"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>برای ارتباطاتِ JSON-RPC از OpenSSL (https) استفاده کنید</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="88"/> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation>ارتباطاتِ JSON-RPC را از آدرس آی.پی. مشخصی برقرار کنید.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>ciphers قابل قبول (پیش فرض: default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>قفل دایرکتوری داده ها %s قابل دریافت نیست. احتمال این وجود دارد که Bitcoin در حال اجرا باشد</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="45"/> + <source>Get help for a command</source> + <translation>درخواست کمک برای یک دستور</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="54"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation>حافظه بانک داده را به مگابایت تنظیم کنید (پیش فرض: 25)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="118"/> + <source>Error loading wallet.dat: Wallet corrupted</source> + <translation>خطا در هنگام لود شدن wallet.dat: Wallet corrupted</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="119"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> + <translation>خطا در هنگام لود شدن wallet.dat. به نسخه جدید Bitocin برای wallet نیاز است.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source>How many blocks to check at startup (default: 2500, 0 = all)</source> + <translation>چند بلاک در startup بررسی شوند (پیش فرض: 2500 و 0= همه)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>How thorough the block verification is (0-6, default: 1)</source> + <translation>چگونگی تایید تمامی بلاکها (پیش فرض: 1 و 0-6)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>ارتباطاتِ JSON-RPC را در <port> گوش کنید (پیش فرض:8332)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">خطا: ایجاد تراکنش امکان پذیر نیست</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">خطا: تراکنش تایید نشد. این خطا ممکن است به این دلیل اتفاق بیافتد که سکه های wallet شما خرج شده باشند مثلا اگر wallet.dat را مپی کرده باشید و سکه های شما در آن کپی استفاده شده باشند اما در اینجا نمایش داده نشده اند.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Warning: Disk space is low</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation>شما باید یک رمز rpcpassword=<password> را در فایل تنظیمات ایجاد کنید⏎ %s ⏎ اگر فایل ایجاد نشده است، آن را با یک فایل "فقط متنی" ایجاد کنید. +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="51"/> <source>Start minimized</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> + <location filename="../bitcoinstrings.cpp" line="52"/> <source>Show splash screen on startup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Specify data directory</source> + <translation>دایرکتوری داده را مشخص کن</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="57"/> <source>Connect through socks4 proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> + <location filename="../bitcoinstrings.cpp" line="58"/> <source>Allow DNS lookups for addnode and connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> + <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> + <location filename="../bitcoinstrings.cpp" line="65"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> + <location filename="../bitcoinstrings.cpp" line="66"/> <source>Find peers using DNS lookup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> + <source>Fee per KB to add to transactions you send</source> + <translation>هزینه بر اساس کیلو بایت برای اضافه شدن به تراکنشی که ارسال کرده اید</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="79"/> + <source>Run in the background as a daemon and accept commands</source> + <translation>به عنوان daemon بک گراند را اجرا کنید و دستورات را قبول نمایید</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="81"/> <source>Output extra debugging information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Allow JSON-RPC connections from specified IP address</source> - <translation>ارتباطاتِ JSON-RPC را از آدرس آی.پی. مشخصی برقرار کنید.</translation> + <location filename="../bitcoinstrings.cpp" line="86"/> + <source>Password for JSON-RPC connections</source> + <translation>رمز برای ارتباطاتِ JSON-RPC</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation>زنجیره بلاک را برای تراکنش جا افتاده در WALLET دوباره اسکن کنید</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>ciphers قابل قبول (پیش فرض: default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> + <location filename="../bitcoinstrings.cpp" line="123"/> + <source>Cannot initialize keypool</source> + <translation>initialize keypool امکان پذیر نیست</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> + <location filename="../bitcoinstrings.cpp" line="128"/> <source>Invalid amount for -paytxfee=<amount></source> <translation type="unfinished">میزان اشتباه است for -paytxfee=<amount></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> + <location filename="../bitcoinstrings.cpp" line="129"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> + <location filename="../bitcoinstrings.cpp" line="133"/> + <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> - <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation>%s شما باید یک رمز rpc در فایل تنظیمات ایجاد کنید⏎ %s ⏎ توصیه می شود از رمزهای تصادفی زیر استفاده کنید rpcuser=bitcoinrpc⏎ rpcpassword=%s (شما لازم نیست این رمزها را به خاطر بسپارید)⏎ اگر فایل ایجاد نشده است، آن را با یک فایل "فقط متنی" ایجاد کنید. +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="63"/> + <source>Find peers using internet relay chat (default: 0)</source> + <translation>یافتن همتا/دوست با استفاده از internet relay chat (پیش فرض:0)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="113"/> + <source>Loading addresses...</source> + <translation>لود شدن آدرسها..</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation type="unfinished"></translation> + <source>Server certificate file (default: server.cert)</source> + <translation>فایل certificate سرور (پیش فرض server.cert)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source>Rescanning...</source> + <translation>اسکنِ دوباره...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>یک گره برای اتصال اضافه کنید و تلاش کنید تا اتصال را باز نگاه دارید</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> + <location filename="../bitcoinstrings.cpp" line="42"/> + <source>Usage:</source> + <translation>میزان استفاده:</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="47"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation>فایل پیکربندیِ را مشخص کنید (پیش فرض: bitcoin.conf)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="80"/> <source>Use the test network</source> <translation>از تستِ شبکه استفاده نمایید</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>ارسال اطلاعات پیگیری/خطایابی به کنسول به جای ارسال به فایل debug.log</translation> + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Specify connection timeout (in milliseconds)</source> + <translation>تعیین مدت زمان وقفه (time out) به هزارم ثانیه</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Send trace/debug info to debugger</source> - <translation>ارسال اطاعات خطایابی/پیگیری به سیستم خطایاب</translation> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Error loading blkindex.dat</source> + <translation>خطا در هنگام لود شدن فایل blkindex.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify configuration file (default: bitcoin.conf)</source> - <translation>فایل پیکربندیِ را مشخص کنید (پیش فرض: bitcoin.conf)</translation> + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>دستورات را به گره اجرا شده در<ip> ارسال کنید (پیش فرض:127.0.0.1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Specify data directory</source> - <translation>دایرکتوری داده را مشخص کن</translation> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Upgrade wallet to latest format</source> + <translation>wallet را به جدیدترین نسخه روزآمد کنید</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>فایل pid را مشخص کنید (پیش فرض: bitcoind.pid)</translation> + <location filename="../bitcoinstrings.cpp" line="83"/> + <source>Send trace/debug info to console instead of debug.log file</source> + <translation>ارسال اطلاعات پیگیری/خطایابی به کنسول به جای ارسال به فایل debug.log</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> + <location filename="../bitcoinstrings.cpp" line="84"/> + <source>Send trace/debug info to debugger</source> + <translation>ارسال اطاعات خطایابی/پیگیری به سیستم خطایاب</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="82"/> <source>Prepend debug output with timestamp</source> <translation>برونداد اشکال زدایی با timestamp</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>Done loading</source> + <translation>اتمام لود شدن</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="41"/> <source>Bitcoin version</source> <translation>نسخه bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> + <location filename="../bitcoinstrings.cpp" line="50"/> <source>Don't generate coins</source> <translation>سکه ها را تولید نکن</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> + <location filename="../bitcoinstrings.cpp" line="68"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>تعداد ثانیه ها برای اتصال دوباره قرینه های اشتباه (پیش فرض:86400)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> + <location filename="../bitcoinstrings.cpp" line="49"/> <source>Generate coins</source> <translation>سکه ها را تولید کن</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Get help for a command</source> - <translation>درخواست کمک برای یک دستور</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="11"/> + <location filename="../bitcoinstrings.cpp" line="44"/> <source>List commands</source> <translation>فهرست دستورها</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> + <location filename="../bitcoinstrings.cpp" line="59"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>ارتباطات را در <PORT> بشنوید (پیش فرض: 8333 or testnet: 18333)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> + <location filename="../bitcoinstrings.cpp" line="60"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>نگهداری <N> ارتباطات برای قرینه سازی (پیش فرض:125)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> + <location filename="../bitcoinstrings.cpp" line="46"/> <source>Options:</source> <translation>انتخابها:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> + <location filename="../bitcoinstrings.cpp" line="78"/> <source>Accept command line and JSON-RPC commands</source> <translation>command line و JSON-RPC commands را قبول کنید</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> + <location filename="../bitcoinstrings.cpp" line="43"/> <source>Send command to -server or bitcoind</source> <translation>ارسال دستور به سرور یا bitcoined</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>حافظه بانک داده را به مگابایت تنظیم کنید (پیش فرض: 25)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="76"/> + <location filename="../bitcoinstrings.cpp" line="114"/> <source>Error loading addr.dat</source> <translation type="unfinished">خطا در هنگام لود شدن addr.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> - <source>Error loading blkindex.dat</source> - <translation>خطا در هنگام لود شدن فایل blkindex.dat</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="83"/> + <location filename="../bitcoinstrings.cpp" line="121"/> <source>Error loading wallet.dat</source> <translation>خطا در هنگام لود شدن wallet.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation>قابلیت برگشت به نسخه قبلی برای wallet امکان پذیر نیست</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> - <source>Error loading wallet.dat: Wallet corrupted</source> - <translation>خطا در هنگام لود شدن wallet.dat: Wallet corrupted</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="81"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation>خطا در هنگام لود شدن wallet.dat. به نسخه جدید Bitocin برای wallet نیاز است.</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="60"/> - <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation>چند بلاک در startup بررسی شوند (پیش فرض: 2500 و 0= همه)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="61"/> - <source>How thorough the block verification is (0-6, default: 1)</source> - <translation>چگونگی تایید تمامی بلاکها (پیش فرض: 1 و 0-6)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="51"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation>ارتباطاتِ JSON-RPC را در <port> گوش کنید (پیش فرض:8332)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="77"/> + <location filename="../bitcoinstrings.cpp" line="115"/> <source>Loading block index...</source> <translation>لود شدن نمایه بلاکها..</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> - <source>Fee per KB to add to transactions you send</source> - <translation>هزینه بر اساس کیلو بایت برای اضافه شدن به تراکنشی که ارسال کرده اید</translation> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>وجوه ناکافی</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> - <source>Run in the background as a daemon and accept commands</source> - <translation>به عنوان daemon بک گراند را اجرا کنید و دستورات را قبول نمایید</translation> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation>برای استفاده از %s از اختیارات</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Password for JSON-RPC connections</source> - <translation>رمز برای ارتباطاتِ JSON-RPC</translation> + <location filename="../bitcoinstrings.cpp" line="90"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation>دستور را وقتی بهترین بلاک تغییر کرد اجرا کن (%s در دستور توسط block hash جایگزین شده است)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> - <source>Rescan the block chain for missing wallet transactions</source> - <translation>زنجیره بلاک را برای تراکنش جا افتاده در WALLET دوباره اسکن کنید</translation> + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>Username for JSON-RPC connections</source> + <translation>شناسه کاربری برای ارتباطاتِ JSON-RPC</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> - <source>Cannot initialize keypool</source> - <translation>initialize keypool امکان پذیر نیست</translation> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation type="unfinished">میزان استفاده</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> - <source>Cannot write default address</source> - <translation>آدرس پیش فرض قابل ذخیره نیست</translation> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Find peers using internet relay chat (default: 0)</source> - <translation>یافتن همتا/دوست با استفاده از internet relay chat (پیش فرض:0)</translation> + <location filename="../bitcoinstrings.cpp" line="124"/> + <source>Cannot write default address</source> + <translation>آدرس پیش فرض قابل ذخیره نیست</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> - <source>Loading addresses...</source> - <translation>لود شدن آدرسها..</translation> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>فایل pid را مشخص کنید (پیش فرض: bitcoind.pid)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> - <source>Server certificate file (default: server.cert)</source> - <translation>فایل certificate سرور (پیش فرض server.cert)</translation> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation>سایز disk log بانک داده را به مگابایت تنظیم کنید (پیش فرض: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> - <source>Rescanning...</source> - <translation>اسکنِ دوباره...</translation> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>میزان اشتباه است</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> - <source>Upgrade wallet to latest format</source> - <translation>wallet را به جدیدترین نسخه روزآمد کنید</translation> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation>خطا</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> - <source>Username for JSON-RPC connections</source> - <translation>شناسه کاربری برای ارتباطاتِ JSON-RPC</translation> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>در حال ارسال...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> + <location filename="../bitcoinstrings.cpp" line="120"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>wallet نیاز به بازنویسی دارد. Bitcoin را برای تکمیل عملیات دوباره اجرا کنید.</translation> </message> - <message> - <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Usage:</source> - <translation>میزان استفاده:</translation> - </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts index 0c00f55524..726ca6fff6 100644 --- a/src/qt/locale/bitcoin_fi.ts +++ b/src/qt/locale/bitcoin_fi.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> versio</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -23,13 +23,13 @@ This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php. This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source> - <translation>Copyright © 2009-2012 Bitcoin kehittäjät + <translation>Copyright © 2009-2012 Bitcoin Developers -Tämä on kokeellinen ohjelmisto. +This is experimental software. -Levitetään MIT/X11 ohjelmistolisenssin alaisuudessa. Tarkemmat tiedot löytyvät tiedostosta license.txt tai osoitteesta http://www.opensource.org/licenses/mit-license.php. +Distributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php. -Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.openssl.org/), Eric Youngin (eay@cryptsoft.com) kehittämän salausohjelmiston sekä Thomas Bernardin UPnP ohjelmiston.</translation> +This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</translation> </message> </context> <context> @@ -95,42 +95,42 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation>&Poista</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>Kopioi osoite</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation>Kopioi nimi</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation>Muokkaa</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>Poista</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation>Vie osoitekirja</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation>Comma separated file (*.csv)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>Virhe viedessä osoitekirjaa</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation>Ei voida kirjoittaa tiedostoon %1.</translation> </message> @@ -206,6 +206,11 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation>Bitcoin sulkeutuu lopettaakseen salausprosessin. Muista, että salattu lompakko ei täysin suojaa sitä haittaohjelmien aiheuttamilta varkauksilta.</translation> </message> <message> + <location filename="../askpassphrasedialog.cpp" line="46"/> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Tätä toimintoa varten sinun täytyy antaa lompakon tunnuslause salauksen purkuun.</translation> + </message> + <message> <location filename="../askpassphrasedialog.cpp" line="102"/> <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! Are you sure you wish to encrypt your wallet?</source> @@ -213,11 +218,6 @@ Are you sure you wish to encrypt your wallet?</source> Tahdotko varmasti salata lompakon?</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="46"/> - <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>Tätä toimintoa varten sinun täytyy antaa lompakon tunnuslause salauksen purkuun.</translation> - </message> - <message> <location filename="../askpassphrasedialog.cpp" line="117"/> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> <translation type="unfinished"></translation> @@ -299,37 +299,32 @@ Tahdotko varmasti salata lompakon?</translation> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation>&Vastaanota Bitcoineja</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation>Näytä Bitcoinien vastaanottamiseen käytetyt osoitteet</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> - <source>&Send coins</source> - <translation>&Lähetä Bitcoineja</translation> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation>Bitcoin-asiakas</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> + <location filename="../bitcoingui.cpp" line="256"/> <source>Backup wallet to another location</source> <translation>Varmuuskopioi lompakko toiseen sijaintiin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> - <source>Change the passphrase used for wallet encryption</source> - <translation>Vaihda lompakon salaukseen käytettävä tunnuslause</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="615"/> + <location filename="../bitcoingui.cpp" line="632"/> <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -341,260 +336,257 @@ Tyyppi: %3 Osoite: %4</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Lompakko on <b>salattu</b> ja tällä hetkellä <b>lukittuna</b></translation> </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="482"/> + <source>%n active connection(s) to Bitcoin network</source> + <translation> + <numerusform>%n aktiivinen yhteys Bitcoin-verkkoon</numerusform> + <numerusform>%n aktiivista yhteyttä Bitcoin-verkkoon</numerusform> + </translation> + </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> - <source>Tabs toolbar</source> - <translation>Välilehtipalkki</translation> + <location filename="../bitcoingui.cpp" line="531"/> + <source>Downloaded %1 blocks of transaction history.</source> + <translation>Ladattu %1 lohkoa rahansiirron historiasta.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> + <location filename="../bitcoingui.cpp" line="664"/> + <source>Incoming transaction</source> + <translation>Saapuva rahansiirto</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="251"/> + <source>Export the data in the current tab to a file</source> + <translation>Vie auki olevan välilehden tiedot tiedostoon</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="253"/> + <source>Encrypt or decrypt wallet</source> + <translation>Salaa tai poista salaus lompakosta</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="314"/> <source>Actions toolbar</source> <translation>Toimintopalkki</translation> </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> - <source>%n day(s) ago</source> - <translation> - <numerusform>%n päivä sitten</numerusform> - <numerusform>%n päivää sitten</numerusform> - </translation> + <message> + <location filename="../bitcoingui.cpp" line="209"/> + <source>&Send coins</source> + <translation>&Lähetä Bitcoineja</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> - <source>Catching up...</source> - <translation>Kurotaan kiinni...</translation> + <location filename="../bitcoingui.cpp" line="258"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>Vaihda lompakon salaukseen käytettävä tunnuslause</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> + <location filename="../bitcoingui.cpp" line="506"/> <source>Synchronizing with network...</source> <translation>Synkronoidaan verkon kanssa...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Block chainin synkronointi kesken</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="187"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>&Overview</source> <translation>&Yleisnäkymä</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="186"/> <source>Show general overview of wallet</source> <translation>Näyttää kokonaiskatsauksen lompakon tilanteesta</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> + <location filename="../bitcoingui.cpp" line="191"/> <source>&Transactions</source> <translation>&Rahansiirrot</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="192"/> <source>Browse transaction history</source> <translation>Selaa rahansiirtohistoriaa</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> + <location filename="../bitcoingui.cpp" line="197"/> <source>&Address Book</source> <translation>&Osoitekirja</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> - <source>Edit the list of stored addresses and labels</source> - <translation>Muokkaa tallennettujen nimien ja osoitteiden listaa</translation> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Send coins to a bitcoin address</source> + <translation>Lähetä Bitcoin-osoitteeseen</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> + <location filename="../bitcoingui.cpp" line="215"/> <source>Sign &message</source> <translation>Allekirjoita &viesti</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> - <source>E&xit</source> - <translation>L&opeta</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="238"/> - <source>Quit application</source> - <translation>Lopeta ohjelma</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>Muokkaa asetuksia</translation> + <location filename="../bitcoingui.cpp" line="216"/> + <source>Prove you control an address</source> + <translation>Todista että hallitset osoitetta</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>Avaa &Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="240"/> + <source>Show information about Bitcoin</source> + <translation>Näytä tietoa Bitcoin-projektista</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Näytä Bitcoin-ikkuna</translation> + <location filename="../bitcoingui.cpp" line="243"/> + <source>Show information about Qt</source> + <translation>Näytä tietoja QT:ta</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation>&Salaa lompakko</translation> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation>Näytä tai piillota Bitcoin-ikkuna</translation> </message> <message> <location filename="../bitcoingui.cpp" line="255"/> - <source>Encrypt or decrypt wallet</source> - <translation>Kryptaa tai dekryptaa lompakko</translation> + <source>&Backup Wallet</source> + <translation>&Varmuuskopioi lompakko</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> + <location filename="../bitcoingui.cpp" line="257"/> <source>&Change Passphrase</source> <translation>&Vaihda tunnuslause</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> + <location filename="../bitcoingui.cpp" line="281"/> <source>&File</source> <translation>&Tiedosto</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> - <source>&Settings</source> - <translation>&Asetukset</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="421"/> + <location filename="../bitcoingui.cpp" line="418"/> <source>bitcoin-qt</source> <translation>bitcoin-qt</translation> </message> - <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>Ladattu %1 of %2 rahansiirtohistorian lohkoa.</translation> - </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation> <numerusform>%n tunti sitten</numerusform> <numerusform>%n tuntia sitten</numerusform> </translation> </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> - <source>%n active connection(s) to Bitcoin network</source> - <translation> - <numerusform>%n aktiivinen yhteys Bitcoin-verkkoon</numerusform> - <numerusform>%n aktiivista yhteyttä Bitcoin-verkkoon</numerusform> - </translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="218"/> - <source>Prove you control an address</source> - <translation>Todista että hallitset osoitetta</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="242"/> - <source>Show information about Bitcoin</source> - <translation>Näytä tietoa Bitcoin-projektista</translation> - </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> - <source>About &Qt</source> - <translation>Tietoja &Qt</translation> + <location filename="../bitcoingui.cpp" line="198"/> + <source>Edit the list of stored addresses and labels</source> + <translation>Muokkaa tallennettujen nimien ja osoitteiden listaa</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> - <source>Show information about Qt</source> - <translation>Näytä tietoja QT:ta</translation> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation>Näytä/Kätke &Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> - <source>&Options...</source> - <translation>&Asetukset...</translation> + <location filename="../bitcoingui.cpp" line="235"/> + <source>E&xit</source> + <translation>L&opeta</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> - <source>Export the data in the current tab to a file</source> - <translation>Vie auki olevan välilehden tiedot tiedostoon</translation> + <location filename="../bitcoingui.cpp" line="236"/> + <source>Quit application</source> + <translation>Lopeta ohjelma</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> - <source>Downloaded %1 blocks of transaction history.</source> - <translation>Ladattu %1 lohkoa rahansiirron historiasta.</translation> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>Muokkaa asetuksia</translation> </message> <message> <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> - <translation>&Vie...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="73"/> - <source>Bitcoin Wallet</source> - <translation>Bitcoin-lompakko</translation> + <source>&Encrypt Wallet</source> + <translation>&Salaa lompakko</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation> <numerusform>%n sekunti sitten</numerusform> <numerusform>%n sekuntia sitten</numerusform> </translation> </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="558"/> + <source>%n day(s) ago</source> + <translation> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> - <source>Last received block was generated %1.</source> - <translation>Viimeisin vastaanotettu lohko tuotettu %1.</translation> + <location filename="../bitcoingui.cpp" line="564"/> + <source>Up to date</source> + <translation>Rahansiirtohistoria on ajan tasalla</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> - <source>Sending...</source> - <translation>Lähetetään...</translation> + <location filename="../bitcoingui.cpp" line="569"/> + <source>Catching up...</source> + <translation>Kurotaan kiinni...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> - <source>Sent transaction</source> - <translation>Lähetetyt rahansiirrot</translation> + <location filename="../bitcoingui.cpp" line="577"/> + <source>Last received block was generated %1.</source> + <translation>Viimeisin vastaanotettu lohko tuotettu %1.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="790"/> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation>Lompakko on <b>salattu</b> ja tällä hetkellä <b>avoinna</b></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="821"/> <source>Backup Wallet</source> <translation>Varmuuskopioi lompakko</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation>Lompakkodata (*.dat)</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation>Varmuuskopio epäonnistui</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation>Virhe tallennettaessa lompakkodataa uuteen sijaintiin.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> - <source>Send coins to a bitcoin address</source> - <translation>Lähetä Bitcoin-osoitteeseen</translation> + <location filename="../bitcoingui.cpp" line="242"/> + <source>About &Qt</source> + <translation>Tietoja &Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>&Tietoja %1</translation> + <location filename="../bitcoingui.cpp" line="245"/> + <source>&Options...</source> + <translation>&Asetukset...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> - <source>&Backup Wallet</source> - <translation>&Varmuuskopioi lompakko</translation> + <location filename="../bitcoingui.cpp" line="250"/> + <source>&Export...</source> + <translation>&Vie...</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation> + <numerusform>~%n lohko jäljellä</numerusform> + <numerusform>~%n lohkoja jäljellä</numerusform> + </translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>Ladattu %1 / %2 lohkoista rahansiirtohistoriasta (%3% suoritettu).</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation> <numerusform>%n minuutti sitten</numerusform> @@ -602,32 +594,47 @@ Osoite: %4</translation> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> - <source>Up to date</source> - <translation>Rahansiirtohistoria on ajan tasalla</translation> + <location filename="../bitcoingui.cpp" line="71"/> + <source>Bitcoin Wallet</source> + <translation>Bitcoin-lompakko</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> - <source>Incoming transaction</source> - <translation>Saapuva rahansiirto</translation> + <location filename="../bitcoingui.cpp" line="636"/> + <source>Sending...</source> + <translation>Lähetetään...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> - <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation>Lompakko on <b>salattu</b> ja tällä hetkellä <b>avoinna</b></translation> + <location filename="../bitcoingui.cpp" line="663"/> + <source>Sent transaction</source> + <translation>Lähetetyt rahansiirrot</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>&Tietoja %1</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> + <location filename="../bitcoingui.cpp" line="290"/> + <source>&Settings</source> + <translation>&Asetukset</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="296"/> <source>&Help</source> <translation>&Apua</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoingui.cpp" line="303"/> + <source>Tabs toolbar</source> + <translation>Välilehtipalkki</translation> + </message> + <message> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Peruuttamaton virhe on tapahtunut. Bitcoin ei voi enää jatkaa turvallisesti ja sammutetaan.</translation> </message> @@ -635,22 +642,22 @@ Osoite: %4</translation> <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&Yksikkö, jossa määrät näytetään: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>Valitse oletus lisämääre mikä näkyy käyttöliittymässä ja kun lähetät kolikoita</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&Näytä osoitteet rahansiirtoluettelossa</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished">Näytetäänkö Bitcoin-osoitteet rahansiirrot listassa vai ei.</translation> </message> @@ -658,16 +665,16 @@ Osoite: %4</translation> <context> <name>EditAddressDialog</name> <message> - <location filename="../forms/editaddressdialog.ui" line="25"/> - <source>&Label</source> - <translation>&Nimi</translation> - </message> - <message> <location filename="../forms/editaddressdialog.ui" line="14"/> <source>Edit Address</source> <translation>Muokkaa osoitetta</translation> </message> <message> + <location filename="../forms/editaddressdialog.ui" line="25"/> + <source>&Label</source> + <translation>&Nimi</translation> + </message> + <message> <location filename="../forms/editaddressdialog.ui" line="35"/> <source>The label associated with this address book entry</source> <translation>Tähän osoitteeseen liitetty nimi</translation> @@ -726,85 +733,95 @@ Osoite: %4</translation> <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>&Käynnistä Bitcoin kun kirjaudutaan sisään</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Käynnistä Bitcoin automaattisesti, kun tietokone kytketään päälle</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>&Pienennä ilmaisinalueelle työkalurivin sijasta</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>Näytä ainoastaan pikkukuvake ikkunan pienentämisen jälkeen</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> + <location filename="../optionsdialog.cpp" line="185"/> <source>Map port using &UPnP</source> <translation>Portin uudelleenohjaus &UPnP:llä</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="181"/> + <location filename="../optionsdialog.cpp" line="186"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Avaa Bitcoin-asiakasohjelman portti reitittimellä automaattisesti. Tämä toimii vain, jos reitittimesi tukee UPnP:tä ja se on käytössä.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="180"/> <source>M&inimize on close</source> <translation>P&ienennä ikkuna suljettaessa</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="186"/> + <location filename="../optionsdialog.cpp" line="181"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>Ikkunaa suljettaessa vain pienentää Bitcoin-ohjelman ikkunan lopettamatta itse ohjelmaa. Kun tämä asetus on valittuna, ohjelman voi sulkea vain valitsemalla Lopeta ohjelman valikosta.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>&Yhdistä SOCKS4-välityspalvelimen kautta:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Yhdistä Bitcoin-verkkoon SOCKS4-välityspalvelimen kautta (esimerkiksi käyttäessä Tor:ia)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>Palvelimen &IP: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>Välityspalvelimen IP-osoite (esim. 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>&Portti: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Portti, johon Bitcoin-asiakasohjelma yhdistää (esim. 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>Vapaaehtoinen rahansiirtopalkkio per kB auttaa nopeuttamaan siirtoja. Useimmat rahansiirrot ovat 1 kB. 0.01 palkkio on suositeltava.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>Maksa rahansiirtopalkkio</translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation>Irroita tietokannat sammutuksen yhteydessä</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation>Irroita lohko- ja osoite-tietokannat sammuttaessa. Tämä hidastaa sammutusta, mutta mahdollistaa tietokantojen kopioimisen toiselle koneelle. Lompakko irroitetaan aina.</translation> + </message> </context> <context> <name>MessagePage</name> @@ -899,17 +916,17 @@ Osoite: %4</translation> <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>Yleiset</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>Näyttö</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>Asetukset</translation> </message> @@ -957,25 +974,30 @@ Osoite: %4</translation> <translation>Tililläsi tällä hetkellä olevien Bitcoinien määrä</translation> </message> <message> - <location filename="../overviewpage.cpp" line="108"/> - <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> - <translation>Niiden saapuvien rahansiirtojen määrä, joita Bitcoin-verkko ei vielä ole ehtinyt vahvistaa ja siten eivät vielä näy saldossa.</translation> - </message> - <message> <location filename="../overviewpage.cpp" line="111"/> <source>Total number of transactions in wallet</source> <translation>Lompakolla tehtyjen rahansiirtojen yhteismäärä</translation> </message> + <message> + <location filename="../overviewpage.cpp" line="108"/> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> + <translation>Niiden saapuvien rahansiirtojen määrä, joita Bitcoin-verkko ei vielä ole ehtinyt vahvistaa ja siten eivät vielä näy saldossa.</translation> + </message> </context> <context> <name>QRCodeDialog</name> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation>Virhe käännettäessä URI:a QR-koodiksi.</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>Tuloksen URI liian pitkä, yritä lyhentää otsikon tekstiä / viestiä.</translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation>PNG kuvat (*png)</translation> </message> @@ -1010,7 +1032,7 @@ Osoite: %4</translation> <translation>Tunniste:</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation>Tallenna kuva...</translation> </message> @@ -1105,6 +1127,21 @@ Osoite: %4</translation> <translation>Maksettavan summan tulee olla suurempi kuin 0 Bitcoinia.</translation> </message> <message> + <location filename="../sendcoinsdialog.cpp" line="145"/> + <source>Duplicate address found, can only send to each address once per send operation.</source> + <translation>Tuplaosite löytynyt, voit ainoastaan lähettää kunkin osoitteen kerran yhdessä lähetysoperaatiossa.</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="150"/> + <source>Error: Transaction creation failed.</source> + <translation>Virhe: Rahansiirron luonti epäonnistui.</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="155"/> + <source>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.</source> + <translation>Virhe: Rahansiirto hylättiin. Tämä voi tapahtua jos jotkin bitcoineistasi on jo käytetty, esimerkiksi jos olet käyttänyt kopiota wallet.dat-lompakkotiedostosta ja bitcoinit on merkitty käytetyksi vain kopiossa.</translation> + </message> + <message> <location filename="../sendcoinsdialog.cpp" line="124"/> <source>The recipient address is not valid, please recheck.</source> <translation>Vastaanottajan osoite ei kelpaa, ole hyvä ja tarkista.</translation> @@ -1119,28 +1156,23 @@ Osoite: %4</translation> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation>Kokonaissumma ylittäää tilisi saldon, kun siihen lisätään %1 BTC rahansiirtomaksu.</translation> </message> +</context> +<context> + <name>SendCoinsEntry</name> <message> - <location filename="../sendcoinsdialog.cpp" line="145"/> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Tuplaosite löytynyt, voit ainoastaan lähettää kunkin osoitteen kerran yhdessä lähetysoperaatiossa.</translation> - </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="150"/> - <source>Error: Transaction creation failed.</source> - <translation>Virhe: Rahansiirron luonti epäonnistui.</translation> + <location filename="../forms/sendcoinsentry.ui" line="42"/> + <source>Pay &To:</source> + <translation>Maksun saaja:</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="155"/> - <source>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.</source> - <translation>Virhe: Rahansiirto hylättiin. Tämä voi tapahtua jos jotkin bitcoineistasi on jo käytetty, esimerkiksi jos olet käyttänyt kopiota wallet.dat-lompakkotiedostosta ja bitcoinit on merkitty käytetyksi vain kopiossa.</translation> + <location filename="../forms/sendcoinsentry.ui" line="93"/> + <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"></translation> </message> -</context> -<context> - <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="14"/> - <source>Form</source> - <translation>Lomake</translation> + <location filename="../forms/sendcoinsentry.ui" line="113"/> + <source>Alt+A</source> + <translation>Alt+A</translation> </message> <message> <location filename="../forms/sendcoinsentry.ui" line="29"/> @@ -1148,9 +1180,9 @@ Osoite: %4</translation> <translation>M&äärä:</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="42"/> - <source>Pay &To:</source> - <translation>Maksun saaja:</translation> + <location filename="../forms/sendcoinsentry.ui" line="14"/> + <source>Form</source> + <translation>Lomake</translation> </message> <message> <location filename="../forms/sendcoinsentry.ui" line="66"/> @@ -1164,21 +1196,11 @@ Osoite: %4</translation> <translation>&Nimi:</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="93"/> - <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../forms/sendcoinsentry.ui" line="103"/> <source>Choose address from address book</source> <translation>Valitse osoite osoitekirjasta</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="113"/> - <source>Alt+A</source> - <translation>Alt+A</translation> - </message> - <message> <location filename="../forms/sendcoinsentry.ui" line="120"/> <source>Paste address from clipboard</source> <translation>Liitä osoite leikepöydältä</translation> @@ -1202,143 +1224,143 @@ Osoite: %4</translation> <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="28"/> + <location filename="../transactiondesc.cpp" line="30"/> <source>%1/unconfirmed</source> <translation>%1/vahvistamaton</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="50"/> + <source><b>Status:</b> </source> + <translation><b>Tila:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>, lähetetään %1 solmun kautta</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>, lähetetään %1 solmunkautta</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation><b>Päivä:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>Lähde:</b> Generoitu<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>Lähettäjä:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> - <source>unknown</source> - <translation>tuntematon</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation><b>Vast. ott.:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="18"/> + <location filename="../transactiondesc.cpp" line="20"/> <source>Open for %1 blocks</source> <translation>Avoinna %1 lohkolle</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> + <location filename="../transactiondesc.cpp" line="22"/> <source>Open until %1</source> <translation>Avoinna %1 asti</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation>%1 vahvistusta</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation>%1/ei linjalla?</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> - <source><b>Status:</b> </source> - <translation><b>Tila:</b> </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="93"/> - <source> (yours, label: </source> - <translation>(sinun, tunniste: </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="95"/> - <source> (yours)</source> - <translation>(sinun)</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation><b>Krediitti:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation>(%1 erääntyy %2 useammassa lohkossa)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> - <source>(not accepted)</source> - <translation>(ei hyväksytty)</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> - <source><b>Debit:</b> </source> - <translation><b>Debit:</b> </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation><b>Rahansiirtomaksu:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>Nettomäärä:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>Viesti:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>Kommentti:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation>Rahansiirron ID:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation>Luotujen kolikoiden on odotettava 120 lohkoa ennen kuin ne voidaan käyttää. Kun loit tämän lohkon, se lähetettiin verkkoon lisättäväksi lohkoketjuun. Jos se epäonnistuu ketjuun liittymisessä, se tila tulee muuttumaan "ei hyväksytty" eikä sitä voi käyttää. Tätä voi silloin tällöin esiintyä jos toinen solmu luo lohkon muutamia sekunteja omastasi.</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="139"/> + <source>(not accepted)</source> + <translation>(ei hyväksytty)</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="96"/> + <source> (yours, label: </source> + <translation>(sinun, tunniste: </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="98"/> + <source> (yours)</source> + <translation>(sinun)</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> + <source><b>Debit:</b> </source> + <translation><b>Debit:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation>, ei ole vielä onnistuneesti lähetetty</translation> </message> + <message> + <location filename="../transactiondesc.cpp" line="92"/> + <source>unknown</source> + <translation>tuntematon</translation> + </message> </context> <context> <name>TransactionDescDialog</name> @@ -1356,51 +1378,6 @@ Osoite: %4</translation> <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="358"/> - <source>Mined</source> - <translation>Louhittu</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="396"/> - <source>(n/a)</source> - <translation>(ei saatavilla)</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="595"/> - <source>Transaction status. Hover over this field to show number of confirmations.</source> - <translation>Rahansiirron tila. Siirrä osoitin kentän päälle nähdäksesi vahvistusten lukumäärä.</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="597"/> - <source>Date and time that the transaction was received.</source> - <translation>Rahansiirron vastaanottamisen päivämäärä ja aika.</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="601"/> - <source>Destination address of transaction.</source> - <translation>Rahansiirron kohteen Bitcoin-osoite</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="603"/> - <source>Amount removed from or added to balance.</source> - <translation>Saldoon lisätty tai siitä vähennetty määrä.</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Date</source> - <translation>Päivämäärä</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Amount</source> - <translation>Määrä</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Type</source> - <translation>Laatu</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="214"/> <source>Address</source> <translation>Osoite</translation> @@ -1433,14 +1410,6 @@ Osoite: %4</translation> <source>Confirmed (%1 confirmations)</source> <translation>Vahvistettu (%1 vahvistusta)</translation> </message> - <message numerus="yes"> - <location filename="../transactiontablemodel.cpp" line="297"/> - <source>Mined balance will be available in %n more blocks</source> - <translation> - <numerusform>Louhittu saldo tulee saataville %n lohkossa</numerusform> - <numerusform>Louhittu saldo tulee saataville %n lohkossa</numerusform> - </translation> - </message> <message> <location filename="../transactiontablemodel.cpp" line="303"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> @@ -1467,78 +1436,110 @@ Osoite: %4</translation> <translation>Saaja</translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Date</source> + <translation>Päivämäärä</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Amount</source> + <translation>Määrä</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Type</source> + <translation>Laatu</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="356"/> <source>Payment to yourself</source> <translation>Maksu itsellesi</translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="396"/> + <source>(n/a)</source> + <translation>(ei saatavilla)</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="599"/> <source>Type of transaction.</source> <translation>Rahansiirron laatu.</translation> </message> -</context> -<context> - <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="280"/> - <source>Date</source> - <translation>Aika</translation> + <location filename="../transactiontablemodel.cpp" line="595"/> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Rahansiirron tila. Siirrä osoitin kentän päälle nähdäksesi vahvistusten lukumäärä.</translation> </message> <message> - <location filename="../transactionview.cpp" line="55"/> - <location filename="../transactionview.cpp" line="71"/> - <source>All</source> - <translation>Kaikki</translation> + <location filename="../transactiontablemodel.cpp" line="358"/> + <source>Mined</source> + <translation>Louhittu</translation> </message> <message> - <location filename="../transactionview.cpp" line="56"/> - <source>Today</source> - <translation>Tänään</translation> + <location filename="../transactiontablemodel.cpp" line="597"/> + <source>Date and time that the transaction was received.</source> + <translation>Rahansiirron vastaanottamisen päivämäärä ja aika.</translation> </message> <message> - <location filename="../transactionview.cpp" line="57"/> - <source>This week</source> - <translation>Tällä viikolla</translation> + <location filename="../transactiontablemodel.cpp" line="601"/> + <source>Destination address of transaction.</source> + <translation>Rahansiirron kohteen Bitcoin-osoite</translation> </message> <message> - <location filename="../transactionview.cpp" line="72"/> - <source>Received with</source> - <translation>Vastaanotettu osoitteella</translation> + <location filename="../transactiontablemodel.cpp" line="603"/> + <source>Amount removed from or added to balance.</source> + <translation>Saldoon lisätty tai siitä vähennetty määrä.</translation> + </message> + <message numerus="yes"> + <location filename="../transactiontablemodel.cpp" line="297"/> + <source>Mined balance will be available in %n more blocks</source> + <translation> + <numerusform>Louhittu saldo tulee saataville %n lohkossa</numerusform> + <numerusform>Louhittu saldo tulee saataville %n lohkossa</numerusform> + </translation> </message> +</context> +<context> + <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="58"/> - <source>This month</source> - <translation>Tässä kuussa</translation> + <location filename="../transactionview.cpp" line="125"/> + <source>Copy label</source> + <translation>Kopioi nimi</translation> </message> <message> - <location filename="../transactionview.cpp" line="59"/> - <source>Last month</source> - <translation>Viime kuussa</translation> + <location filename="../transactionview.cpp" line="270"/> + <source>Export Transaction Data</source> + <translation>Vie rahansiirron tiedot</translation> </message> <message> - <location filename="../transactionview.cpp" line="60"/> - <source>This year</source> - <translation>Tänä vuonna</translation> + <location filename="../transactionview.cpp" line="281"/> + <source>Type</source> + <translation>Laatu</translation> </message> <message> - <location filename="../transactionview.cpp" line="61"/> - <source>Range...</source> - <translation>Alue...</translation> + <location filename="../transactionview.cpp" line="282"/> + <source>Label</source> + <translation>Nimi</translation> </message> <message> - <location filename="../transactionview.cpp" line="74"/> - <source>Sent to</source> - <translation>Saaja</translation> + <location filename="../transactionview.cpp" line="284"/> + <source>Amount</source> + <translation>Määrä</translation> </message> <message> - <location filename="../transactionview.cpp" line="76"/> - <source>To yourself</source> - <translation>Itsellesi</translation> + <location filename="../transactionview.cpp" line="285"/> + <source>ID</source> + <translation>ID</translation> </message> <message> - <location filename="../transactionview.cpp" line="77"/> - <source>Mined</source> - <translation>Louhittu</translation> + <location filename="../transactionview.cpp" line="289"/> + <source>Error exporting</source> + <translation>Virhe tietojen viennissä</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="56"/> + <source>Today</source> + <translation>Tänään</translation> </message> <message> <location filename="../transactionview.cpp" line="78"/> @@ -1566,24 +1567,55 @@ Osoite: %4</translation> <translation>Kopioi osoite</translation> </message> <message> - <location filename="../transactionview.cpp" line="125"/> - <source>Copy label</source> - <translation>Kopioi nimi</translation> + <location filename="../transactionview.cpp" line="55"/> + <location filename="../transactionview.cpp" line="71"/> + <source>All</source> + <translation>Kaikki</translation> </message> <message> - <location filename="../transactionview.cpp" line="126"/> - <source>Copy amount</source> - <translation>Kopioi määrä</translation> + <location filename="../transactionview.cpp" line="57"/> + <source>This week</source> + <translation>Tällä viikolla</translation> </message> <message> - <location filename="../transactionview.cpp" line="128"/> - <source>Show details...</source> - <translation>Näytä tarkemmat tiedot...</translation> + <location filename="../transactionview.cpp" line="58"/> + <source>This month</source> + <translation>Tässä kuussa</translation> </message> <message> - <location filename="../transactionview.cpp" line="270"/> - <source>Export Transaction Data</source> - <translation>Vie rahansiirron tiedot</translation> + <location filename="../transactionview.cpp" line="59"/> + <source>Last month</source> + <translation>Viime kuussa</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="60"/> + <source>This year</source> + <translation>Tänä vuonna</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="61"/> + <source>Range...</source> + <translation>Alue...</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="72"/> + <source>Received with</source> + <translation>Vastaanotettu osoitteella</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="76"/> + <source>To yourself</source> + <translation>Itsellesi</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="77"/> + <source>Mined</source> + <translation>Louhittu</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="126"/> + <source>Copy amount</source> + <translation>Kopioi määrä</translation> </message> <message> <location filename="../transactionview.cpp" line="271"/> @@ -1596,14 +1628,9 @@ Osoite: %4</translation> <translation>Vahvistettu</translation> </message> <message> - <location filename="../transactionview.cpp" line="281"/> - <source>Type</source> - <translation>Laatu</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="282"/> - <source>Label</source> - <translation>Nimi</translation> + <location filename="../transactionview.cpp" line="280"/> + <source>Date</source> + <translation>Aika</translation> </message> <message> <location filename="../transactionview.cpp" line="283"/> @@ -1611,21 +1638,6 @@ Osoite: %4</translation> <translation>Osoite</translation> </message> <message> - <location filename="../transactionview.cpp" line="284"/> - <source>Amount</source> - <translation>Määrä</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="285"/> - <source>ID</source> - <translation>ID</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="289"/> - <source>Error exporting</source> - <translation>Virhe tietojen viennissä</translation> - </message> - <message> <location filename="../transactionview.cpp" line="289"/> <source>Could not write to file %1.</source> <translation>Ei voida kirjoittaa tiedostoon %1.</translation> @@ -1640,11 +1652,21 @@ Osoite: %4</translation> <source>to</source> <translation>kenelle</translation> </message> + <message> + <location filename="../transactionview.cpp" line="74"/> + <source>Sent to</source> + <translation>Saaja</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="128"/> + <source>Show details...</source> + <translation>Näytä tarkemmat tiedot...</translation> + </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>Lähetetään...</translation> </message> @@ -1652,401 +1674,494 @@ Osoite: %4</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> + <location filename="../bitcoinstrings.cpp" line="78"/> <source>Accept command line and JSON-RPC commands</source> <translation>Hyväksy merkkipohjaiset- ja JSON-RPC-käskyt</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> + <location filename="../bitcoinstrings.cpp" line="102"/> <source>Server certificate file (default: server.cert)</source> <translation>Palvelimen sertifikaatti-tiedosto (oletus: server.cert)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> + <location filename="../bitcoinstrings.cpp" line="107"/> <source>This help message</source> <translation>Tämä ohjeviesti</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> - <source>Prepend debug output with timestamp</source> - <translation>Lisää debuggaustiedon tulostukseen aikaleima</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="47"/> + <location filename="../bitcoinstrings.cpp" line="83"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Lähetä jäljitys/debug-tieto konsoliin, debug.log-tiedoston sijaan</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>Lähetä käskyjä solmuun osoitteessa <ip> (oletus: 127.0.0.1)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="58"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation>Aseta avainpoolin koko arvoon <n> (oletus: 100)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="65"/> + <location filename="../bitcoinstrings.cpp" line="101"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Käytä OpenSSL:ää (https) JSON-RPC-yhteyksille</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>Hyväksyttävä salaus (oletus: -TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="82"/> - <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation>Lompakko tarvitsee uudelleenkirjoittaa: käynnistä Bitcoin uudelleen</translation> + <location filename="../bitcoinstrings.cpp" line="115"/> + <source>Loading block index...</source> + <translation>Ladataan lohkoindeksiä...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> + <location filename="../bitcoinstrings.cpp" line="121"/> <source>Error loading wallet.dat</source> <translation>Virhe ladattaessa wallet.dat-tiedostoa</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> + <location filename="../bitcoinstrings.cpp" line="117"/> <source>Loading wallet...</source> <translation>Ladataan lompakkoa...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> + <location filename="../bitcoinstrings.cpp" line="41"/> <source>Bitcoin version</source> <translation>Bitcoinin versio</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation>Kuuntele yhteyksiä portista <port> (oletus: 8333 tai testnet: 18333)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="51"/> + <location filename="../bitcoinstrings.cpp" line="87"/> <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation>Kuuntele JSON-RPC -yhteyksiä portista <port> (oletus: 8332)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Allow JSON-RPC connections from specified IP address</source> - <translation>Salli JSON-RPC yhteydet tietystä ip-osoitteesta</translation> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>En pääse käsiksi data-hakemiston lukitukseen %s. Bitcoin on todennäköisesti jo käynnistetty.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> - <source>Loading addresses...</source> - <translation>Ladataan osoitteita...</translation> + <location filename="../bitcoinstrings.cpp" line="45"/> + <source>Get help for a command</source> + <translation>Hanki apua käskyyn</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> - <source>Loading block index...</source> - <translation>Ladataan lohkoindeksiä...</translation> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Upgrade wallet to latest format</source> + <translation>Päivitä lompakko uusimpaan formaattiin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Suorita käsky kun paras lohko muuttuu (%s cmd on vaihdettu block hashin kanssa)</translation> + <location filename="../bitcoinstrings.cpp" line="122"/> + <source>Cannot downgrade wallet</source> + <translation>Et voi päivittää lompakkoasi vanhempaan versioon</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Aseta tietokannan välimuistin koko megatavuina (oletus: 25)</translation> + <location filename="../bitcoinstrings.cpp" line="43"/> + <source>Send command to -server or bitcoind</source> + <translation>Lähetä käsky palvelimelle tai bitcoind:lle</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> - <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation>Kuinka monta lohkoa tarkistetaan käynnistettäessä (oletus: 2500, 0 = kaikki)</translation> + <location filename="../bitcoinstrings.cpp" line="49"/> + <source>Generate coins</source> + <translation>Generoi kolikoita</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Get help for a command</source> - <translation>Hanki apua käskyyn</translation> + <location filename="../bitcoinstrings.cpp" line="67"/> + <source>Threshold for disconnecting misbehaving peers (default: 100)</source> + <translation>Kynnysarvo aikakatkaisulle heikosti toimiville verkoille (oletus: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Don't generate coins</source> - <translation>Älä generoi kolikoita</translation> + <location filename="../bitcoinstrings.cpp" line="119"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> + <translation>Virhe ladattaessa wallet.dat-tiedostoa: Tarvitset uudemman version Bitcoinista</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Add a node to connect to and attempt to keep the connection open</source> - <translation>Linää solmu mihin liittyä pitääksesi yhteyden auki</translation> + <location filename="../bitcoinstrings.cpp" line="123"/> + <source>Cannot initialize keypool</source> + <translation>Avainvarastoa ei voi alustaa</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> - <source>Rescanning...</source> - <translation>Skannataan uudelleen...</translation> + <location filename="../bitcoinstrings.cpp" line="124"/> + <source>Cannot write default address</source> + <translation>Oletusosoitetta ei voi kirjoittaa</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Find peers using internet relay chat (default: 0)</source> - <translation>Etsi solmuja käyttäen internet relay chatia (oletus: 0)</translation> + <location filename="../bitcoinstrings.cpp" line="44"/> + <source>List commands</source> + <translation>Lista komennoista</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation>Virhe ladattaessa wallet.dat-tiedostoa: Tarvitset uudemman version Bitcoinista</translation> + <location filename="../bitcoinstrings.cpp" line="47"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation>Määritä asetustiedosto (oletus: bitcoin.conf)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> - <source>Run in the background as a daemon and accept commands</source> - <translation>Aja taustalla daemonina ja hyväksy komennot</translation> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>Määritä pid-tiedosto (oletus: bitcoin.pid)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> - <source>Server private key (default: server.pem)</source> - <translation>Palvelimen yksityisavain (oletus: server.pem)</translation> + <location filename="../bitcoinstrings.cpp" line="118"/> + <source>Error loading wallet.dat: Wallet corrupted</source> + <translation>Virhe ladattaessa wallet.dat-tiedostoa: Lompakko vioittunut</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> - <source>Use the test network</source> - <translation>Käytä test -verkkoa</translation> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>How thorough the block verification is (0-6, default: 1)</source> + <translation>Kuinka tiukka lohkovarmistus on (0-6, oletus: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> - <source>Upgrade wallet to latest format</source> - <translation>Päivitä lompakko uusimpaan formaattiin</translation> + <location filename="../bitcoinstrings.cpp" line="86"/> + <source>Password for JSON-RPC connections</source> + <translation>Salasana JSON-RPC-yhteyksille</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="84"/> - <source>Cannot downgrade wallet</source> - <translation>Et voi päivittää lompakkoasi vanhempaan versioon</translation> + <source>Send trace/debug info to debugger</source> + <translation>Lähetä jäljitys/debug-tieto debuggeriin</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="85"/> - <source>Cannot initialize keypool</source> - <translation>Avainvarastoa ei voi alustaa</translation> + <source>Username for JSON-RPC connections</source> + <translation>Käyttäjätunnus JSON-RPC-yhteyksille</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> - <source>Cannot write default address</source> - <translation>Oletusosoitetta ei voi kirjoittaa</translation> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation>%s, sinun täytyy asettaa rpcpassword asetustiedostoon: +%s +On suositeltavaa käyttää seuraavaan satunnaista salasanaa: +rpcuser=bitcoinrpc +rpcpassword=%s +(sinun ei tarvitse muistaa tätä salasanaa) +Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin. +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> - <source>Rescan the block chain for missing wallet transactions</source> - <translation>Skannaa uudelleen lohkoketju lompakon puuttuvien rahasiirtojen vuoksi</translation> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Lähetetään...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation>Sinun täytyy asettaa rpcpassword=<password> asetustiedostoon: +%s +Jos tiedostoa ei ole, niin luo se ainoastaan omistajan kirjoitusoikeuksin.</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="88"/> - <source>Done loading</source> - <translation>Lataus on valmis</translation> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation>Salli JSON-RPC yhteydet tietystä ip-osoitteesta</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Rahansiirtopalkkio per KB lisätään lähettämääsi rahansiirtoon</translation> + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Specify data directory</source> + <translation>Määritä data-hakemisto</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Usage:</source> - <translation>Käyttö:</translation> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation>Käytä %s optiota</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Send command to -server or bitcoind</source> - <translation>Lähetä käsky palvelimelle tai bitcoind:lle</translation> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation>Virhe</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Options:</source> - <translation>Asetukset:</translation> + <location filename="../bitcoinstrings.cpp" line="113"/> + <source>Loading addresses...</source> + <translation>Ladataan osoitteita...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Generate coins</source> - <translation>Generoi kolikoita</translation> + <location filename="../bitcoinstrings.cpp" line="61"/> + <source>Add a node to connect to and attempt to keep the connection open</source> + <translation>Linää solmu mihin liittyä pitääksesi yhteyden auki</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Show splash screen on startup (default: 1)</source> - <translation>Näytä aloitusruutu käynnistettäessä (oletus: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="63"/> + <source>Find peers using internet relay chat (default: 0)</source> + <translation>Etsi solmuja käyttäen internet relay chatia (oletus: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Specify data directory</source> - <translation>Määritä data-hakemisto</translation> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Prepend debug output with timestamp</source> + <translation>Lisää debuggaustiedon tulostukseen aikaleima</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Määritä yhteyden aikakatkaisu (millisekunneissa)</translation> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Connect through socks4 proxy</source> - <translation>Yhteys socks4-proxyn kautta</translation> + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>Aseta avainpoolin koko arvoon <n> (oletus: 100)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>Hyväksyttävä salaus (oletus: +TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="59"/> + <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> + <translation>Kuuntele yhteyksiä portista <port> (oletus: 8333 tai testnet: 18333)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="90"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation>Suorita käsky kun paras lohko muuttuu (%s cmd on vaihdettu block hashin kanssa)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="54"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation>Aseta tietokannan välimuistin koko megatavuina (oletus: 25)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source>Rescanning...</source> + <translation>Skannataan uudelleen...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="79"/> + <source>Run in the background as a daemon and accept commands</source> + <translation>Aja taustalla daemonina ja hyväksy komennot</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="103"/> + <source>Server private key (default: server.pem)</source> + <translation>Palvelimen yksityisavain (oletus: server.pem)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>Done loading</source> + <translation>Lataus on valmis</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="42"/> + <source>Usage:</source> + <translation>Käyttö:</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="120"/> + <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> + <translation>Lompakko tarvitsee uudelleenkirjoittaa: käynnistä Bitcoin uudelleen</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="58"/> <source>Allow DNS lookups for addnode and connect</source> <translation>Salli DNS haut lisäsolmulle ja yhdistä</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Maintain at most <n> connections to peers (default: 125)</source> - <translation>Pidä enintään <n> yhteyttä verkkoihin (oletus: 125)</translation> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Connect only to the specified node</source> - <translation>Ota yhteys vain tiettyyn solmuun</translation> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Find peers using DNS lookup (default: 1)</source> - <translation>Hae naapureita DNS hauilla (vakioasetus: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">Virhe: Rahansiirron luonti epäonnistui.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Threshold for disconnecting misbehaving peers (default: 100)</source> - <translation>Kynnysarvo aikakatkaisulle heikosti toimiville verkoille (oletus: 100)</translation> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">Virhe: Rahansiirto hylättiin. Tämä voi tapahtua jos jotkin bitcoineistasi on jo käytetty, esimerkiksi jos olet käyttänyt kopiota wallet.dat-lompakkotiedostosta ja bitcoinit on merkitty käytetyksi vain kopiossa.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation>Sekuntien määrä, kuinka kauan uudelleenkytkeydytään verkkoihin (oletus: 86400)</translation> + <location filename="../bitcoinstrings.cpp" line="62"/> + <source>Connect only to the specified node</source> + <translation>Ota yhteys vain tiettyyn solmuun</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="66"/> + <source>Find peers using DNS lookup (default: 1)</source> + <translation>Hae naapureita DNS hauilla (vakioasetus: 1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation>Maksimi verkkoyhteyden lähetyspuskuri, <n>*1000 tavua (oletus: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation>Irroita lohko ja osoite-tietokannat. Pidentää sammutus-aikaa (vakioasetus: 0)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="81"/> <source>Output extra debugging information</source> <translation>Tulosta ylimääräistä debuggaustietoa</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>SSL-asetukset: (lisätietoja Bitcoin-Wikistä)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="76"/> + <location filename="../bitcoinstrings.cpp" line="114"/> <source>Error loading addr.dat</source> <translation>Virhe ladattaessa addr.dat-tiedostoa</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> - <source>Error loading blkindex.dat</source> - <translation>Virhe ladattaessa blkindex.dat-tiedostoa</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation>Virheellinen proxy-osoite</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> + <location filename="../bitcoinstrings.cpp" line="128"/> <source>Invalid amount for -paytxfee=<amount></source> <translation>Virheellinen määrä -paytxfee=<amount></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> + <location filename="../bitcoinstrings.cpp" line="129"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation>Varoitus:-paytxfee on erittäin korkea. Tämä on palkkio siirrosta minkä suoritat rahansiirrosta.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> - <source>Error: CreateThread(StartNode) failed</source> - <translation>Virhe: CreateThread(StartNode) epäonnistui</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="96"/> - <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> - <translation>En pysty varaamaan porttia %d tähän koneeseen. Ehkä Bitcoin on jo käynnissä.</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="99"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> - <translation>Varoitus: Tarkista, ovatko tietokoneesi päivämäärä ja aika oikein. Mikäli aika on väärin, Bitcoin-ohjelma ei toimi oikein.</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="95"/> + <location filename="../bitcoinstrings.cpp" line="20"/> <source>Warning: Disk space is low</source> <translation>Varoitus: Kiintolevytila on loppumassa</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation type="unfinished">Älä hyväksy ulkopuolisia yhteyksiä</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished">Yritä käyttää UPnP toimintoa kartoittamaan avointa porttia (default: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished">Yritä käyttää UPnP toimintoa kartoittamaan avointa porttia (default: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> - <source>List commands</source> - <translation>Lista komennoista</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify configuration file (default: bitcoin.conf)</source> - <translation>Määritä asetustiedosto (oletus: bitcoin.conf)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>Määritä pid-tiedosto (oletus: bitcoin.pid)</translation> + <location filename="../bitcoinstrings.cpp" line="80"/> + <source>Use the test network</source> + <translation>Käytä test -verkkoa</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> + <location filename="../bitcoinstrings.cpp" line="51"/> <source>Start minimized</source> <translation>Käynnistä pienennettynä</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> + <location filename="../bitcoinstrings.cpp" line="65"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation>Set language, for example "de_DE" (default: system locale)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation>Maksimi verkkoyhteyden vastaanottopuskuri, <n>*1000 tavua (oletus: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> - <source>Error loading wallet.dat: Wallet corrupted</source> - <translation>Virhe ladattaessa wallet.dat-tiedostoa: Lompakko vioittunut</translation> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>Virheellinen määrä</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>beta</translation> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>Lompakon saldo ei riitä</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> - <source>How thorough the block verification is (0-6, default: 1)</source> - <translation>Kuinka tiukka lohkovarmistus on (0-6, oletus: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation>Virhe valmisteltaessa RPC-portin %u avaamista kuunneltavaksi: %s</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="60"/> + <source>Maintain at most <n> connections to peers (default: 125)</source> + <translation>Pidä enintään <n> yhteyttä verkkoihin (oletus: 125)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="68"/> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> + <translation>Sekuntien määrä, kuinka kauan uudelleenkytkeydytään verkkoihin (oletus: 86400)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="46"/> + <source>Options:</source> + <translation>Asetukset:</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Password for JSON-RPC connections</source> - <translation>Salasana JSON-RPC-yhteyksille</translation> + <source>Don't generate coins</source> + <translation>Älä generoi kolikoita</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Send trace/debug info to debugger</source> - <translation>Lähetä jäljitys/debug-tieto debuggeriin</translation> + <location filename="../bitcoinstrings.cpp" line="52"/> + <source>Show splash screen on startup (default: 1)</source> + <translation>Näytä aloitusruutu käynnistettäessä (oletus: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> - <source>Username for JSON-RPC connections</source> - <translation>Käyttäjätunnus JSON-RPC-yhteyksille</translation> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation>Aseta tietokannan lokitiedoston koko megatavuina (oletus: 100)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Specify connection timeout (in milliseconds)</source> + <translation>Määritä yhteyden aikakatkaisu (millisekunneissa)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="57"/> + <source>Connect through socks4 proxy</source> + <translation>Yhteys socks4-proxyn kautta</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Error loading blkindex.dat</source> + <translation>Virhe ladattaessa blkindex.dat-tiedostoa</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>Lähetä käskyjä solmuun osoitteessa <ip> (oletus: 127.0.0.1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="132"/> + <source>Error: CreateThread(StartNode) failed</source> + <translation>Virhe: CreateThread(StartNode) epäonnistui</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="133"/> + <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> + <translation>En pysty varaamaan porttia %d tähän koneeseen. Ehkä Bitcoin on jo käynnissä.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <translation>Varoitus: Tarkista, ovatko tietokoneesi päivämäärä ja aika oikein. Mikäli aika on väärin, Bitcoin-ohjelma ei toimi oikein.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation>Käyttö</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source>How many blocks to check at startup (default: 2500, 0 = all)</source> + <translation>Kuinka monta lohkoa tarkistetaan käynnistettäessä (oletus: 2500, 0 = kaikki)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> + <source>Fee per KB to add to transactions you send</source> + <translation>Rahansiirtopalkkio per KB lisätään lähettämääsi rahansiirtoon</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation>Skannaa uudelleen lohkoketju lompakon puuttuvien rahasiirtojen vuoksi</translation> </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_fr_CA.ts b/src/qt/locale/bitcoin_fr_CA.ts index b5618cdb79..f306ab8b8c 100644 --- a/src/qt/locale/bitcoin_fr_CA.ts +++ b/src/qt/locale/bitcoin_fr_CA.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> version</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -25,11 +25,11 @@ Distributed under the MIT/X11 software license, see the accompanying file licens This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source> <translation>Copyright © 2009-2012 Développeurs de Bitcoin -This is experimental software. +Ce logiciel est en phase expérimentale. -Distributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php. +Distribué sous licence MIT/X11, voir le fichier license.txt ou http://www.opensource.org/licenses/mit-license.php. -This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</translation> +Ce produit comprend des logiciels développés par le projet OpenSSL pour être utilisés dans la boîte à outils OpenSSL (http://www.openssl.org/), un logiciel cryptographique écrit par Eric Young (eay@cryptsoft.com) et un logiciel UPnP écrit par Thomas Bernard.</translation> </message> </context> <context> @@ -95,42 +95,42 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Supprimer</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation type="unfinished">Supprimer</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation>Exporter les données du carnet d'adresses</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation type="unfinished"></translation> </message> @@ -139,13 +139,13 @@ This product includes software developed by the OpenSSL Project for use in the O <name>AddressTableModel</name> <message> <location filename="../addresstablemodel.cpp" line="78"/> - <source>Label</source> - <translation type="unfinished"></translation> + <source>Address</source> + <translation type="unfinished">Adresse</translation> </message> <message> <location filename="../addresstablemodel.cpp" line="78"/> - <source>Address</source> - <translation type="unfinished">Adresse</translation> + <source>Label</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../addresstablemodel.cpp" line="114"/> @@ -298,208 +298,202 @@ Are you sure you wish to encrypt your wallet?</source> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="73"/> + <location filename="../bitcoingui.cpp" line="71"/> <source>Bitcoin Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> - <source>Synchronizing with network...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="187"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>&Overview</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="186"/> <source>Show general overview of wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> + <location filename="../bitcoingui.cpp" line="191"/> <source>&Transactions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="192"/> <source>Browse transaction history</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> + <location filename="../bitcoingui.cpp" line="197"/> <source>&Address Book</source> <translation type="unfinished">Carnet d'&adresses</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> + <location filename="../bitcoingui.cpp" line="198"/> <source>Edit the list of stored addresses and labels</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> + <location filename="../bitcoingui.cpp" line="209"/> <source>&Send coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> + <location filename="../bitcoingui.cpp" line="210"/> <source>Send coins to a bitcoin address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> + <location filename="../bitcoingui.cpp" line="215"/> <source>Sign &message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> + <location filename="../bitcoingui.cpp" line="216"/> <source>Prove you control an address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> + <location filename="../bitcoingui.cpp" line="235"/> <source>E&xit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> + <location filename="../bitcoingui.cpp" line="236"/> <source>Quit application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> + <location filename="../bitcoingui.cpp" line="239"/> <source>&About %1</source> <translation type="unfinished">&A propos de %1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> + <location filename="../bitcoingui.cpp" line="240"/> <source>Show information about Bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> + <location filename="../bitcoingui.cpp" line="242"/> <source>About &Qt</source> <translation type="unfinished">A propos de &Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> + <location filename="../bitcoingui.cpp" line="243"/> <source>Show information about Qt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> + <location filename="../bitcoingui.cpp" line="245"/> <source>&Options...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> + <location filename="../bitcoingui.cpp" line="246"/> <source>Modify configuration options for bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> + <location filename="../bitcoingui.cpp" line="250"/> <source>&Export...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> + <location filename="../bitcoingui.cpp" line="251"/> <source>Export the data in the current tab to a file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> + <location filename="../bitcoingui.cpp" line="252"/> <source>&Encrypt Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="255"/> + <location filename="../bitcoingui.cpp" line="253"/> <source>Encrypt or decrypt wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> + <location filename="../bitcoingui.cpp" line="255"/> <source>&Backup Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> + <location filename="../bitcoingui.cpp" line="256"/> <source>Backup wallet to another location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> + <location filename="../bitcoingui.cpp" line="257"/> <source>&Change Passphrase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> + <location filename="../bitcoingui.cpp" line="258"/> <source>Change the passphrase used for wallet encryption</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> + <location filename="../bitcoingui.cpp" line="281"/> <source>&File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> + <location filename="../bitcoingui.cpp" line="290"/> <source>&Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> + <location filename="../bitcoingui.cpp" line="296"/> <source>&Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> + <location filename="../bitcoingui.cpp" line="303"/> <source>Tabs toolbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> + <location filename="../bitcoingui.cpp" line="314"/> <source>Actions toolbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="418"/> <source>bitcoin-qt</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> + <location filename="../bitcoingui.cpp" line="482"/> <source>%n active connection(s) to Bitcoin network</source> <translation type="unfinished"> <numerusform></numerusform> @@ -507,17 +501,22 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> + <location filename="../bitcoingui.cpp" line="506"/> + <source>Synchronizing with network...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> + <location filename="../bitcoingui.cpp" line="531"/> <source>Downloaded %1 blocks of transaction history.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -525,7 +524,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -533,7 +532,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -541,7 +540,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -549,42 +548,42 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> + <location filename="../bitcoingui.cpp" line="632"/> <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> + <location filename="../bitcoingui.cpp" line="636"/> <source>Sending...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> + <location filename="../bitcoingui.cpp" line="663"/> <source>Sent transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> + <location filename="../bitcoingui.cpp" line="664"/> <source>Incoming transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -593,37 +592,45 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Backup Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation type="unfinished"></translation> </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -631,22 +638,22 @@ Address: %4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished"></translation> </message> @@ -722,85 +729,95 @@ Address: %4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="180"/> - <source>Map port using &UPnP</source> + <source>M&inimize on close</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="181"/> - <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="185"/> - <source>M&inimize on close</source> + <source>Map port using &UPnP</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="186"/> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> + <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessagePage</name> @@ -895,17 +912,17 @@ Address: %4 <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation type="unfinished"></translation> </message> @@ -1006,17 +1023,22 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation type="unfinished"></translation> </message> @@ -1198,140 +1220,140 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="18"/> + <location filename="../transactiondesc.cpp" line="20"/> <source>Open for %1 blocks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> + <location filename="../transactiondesc.cpp" line="22"/> <source>Open until %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="28"/> + <location filename="../transactiondesc.cpp" line="30"/> <source>%1/unconfirmed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="92"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation type="unfinished"></translation> </message> @@ -1640,7 +1662,7 @@ Address: %4 <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation type="unfinished"></translation> </message> @@ -1648,400 +1670,484 @@ Address: %4 <context> <name>bitcoin-core</name> <message> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Warning: Disk space is low</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="41"/> <source>Bitcoin version</source> <translation type="unfinished">Bitcoin version</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> + <location filename="../bitcoinstrings.cpp" line="42"/> <source>Usage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> + <location filename="../bitcoinstrings.cpp" line="43"/> <source>Send command to -server or bitcoind</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> + <location filename="../bitcoinstrings.cpp" line="44"/> <source>List commands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> + <location filename="../bitcoinstrings.cpp" line="45"/> <source>Get help for a command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> + <location filename="../bitcoinstrings.cpp" line="46"/> <source>Options:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> + <location filename="../bitcoinstrings.cpp" line="47"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> + <location filename="../bitcoinstrings.cpp" line="48"/> <source>Specify pid file (default: bitcoind.pid)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> + <location filename="../bitcoinstrings.cpp" line="49"/> <source>Generate coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> + <location filename="../bitcoinstrings.cpp" line="50"/> <source>Don't generate coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> + <location filename="../bitcoinstrings.cpp" line="51"/> <source>Start minimized</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> + <location filename="../bitcoinstrings.cpp" line="52"/> <source>Show splash screen on startup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> + <location filename="../bitcoinstrings.cpp" line="53"/> <source>Specify data directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> + <location filename="../bitcoinstrings.cpp" line="54"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="56"/> <source>Specify connection timeout (in milliseconds)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> + <location filename="../bitcoinstrings.cpp" line="57"/> <source>Connect through socks4 proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> + <location filename="../bitcoinstrings.cpp" line="58"/> <source>Allow DNS lookups for addnode and connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> + <location filename="../bitcoinstrings.cpp" line="59"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> + <location filename="../bitcoinstrings.cpp" line="60"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> + <location filename="../bitcoinstrings.cpp" line="61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> + <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> + <location filename="../bitcoinstrings.cpp" line="63"/> <source>Find peers using internet relay chat (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> + <location filename="../bitcoinstrings.cpp" line="65"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> + <location filename="../bitcoinstrings.cpp" line="66"/> <source>Find peers using DNS lookup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> + <location filename="../bitcoinstrings.cpp" line="67"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> + <location filename="../bitcoinstrings.cpp" line="68"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> + <location filename="../bitcoinstrings.cpp" line="78"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> + <location filename="../bitcoinstrings.cpp" line="79"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> + <location filename="../bitcoinstrings.cpp" line="80"/> <source>Use the test network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> + <location filename="../bitcoinstrings.cpp" line="81"/> <source>Output extra debugging information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> + <location filename="../bitcoinstrings.cpp" line="82"/> <source>Prepend debug output with timestamp</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> + <location filename="../bitcoinstrings.cpp" line="83"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> + <location filename="../bitcoinstrings.cpp" line="84"/> <source>Send trace/debug info to debugger</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> + <location filename="../bitcoinstrings.cpp" line="85"/> <source>Username for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> + <location filename="../bitcoinstrings.cpp" line="86"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> + <location filename="../bitcoinstrings.cpp" line="87"/> <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> + <location filename="../bitcoinstrings.cpp" line="88"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> + <location filename="../bitcoinstrings.cpp" line="89"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> + <location filename="../bitcoinstrings.cpp" line="90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> + <location filename="../bitcoinstrings.cpp" line="93"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> + <location filename="../bitcoinstrings.cpp" line="94"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> + <location filename="../bitcoinstrings.cpp" line="95"/> <source>Rescan the block chain for missing wallet transactions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> + <location filename="../bitcoinstrings.cpp" line="96"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> + <location filename="../bitcoinstrings.cpp" line="97"/> <source>How thorough the block verification is (0-6, default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> + <location filename="../bitcoinstrings.cpp" line="101"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> + <location filename="../bitcoinstrings.cpp" line="102"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> + <location filename="../bitcoinstrings.cpp" line="103"/> <source>Server private key (default: server.pem)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> + <location filename="../bitcoinstrings.cpp" line="104"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> + <location filename="../bitcoinstrings.cpp" line="107"/> <source>This help message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="113"/> <source>Loading addresses...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> + <location filename="../bitcoinstrings.cpp" line="114"/> <source>Error loading addr.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> + <location filename="../bitcoinstrings.cpp" line="115"/> <source>Loading block index...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> + <location filename="../bitcoinstrings.cpp" line="116"/> <source>Error loading blkindex.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> + <location filename="../bitcoinstrings.cpp" line="117"/> <source>Loading wallet...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> + <location filename="../bitcoinstrings.cpp" line="118"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> + <location filename="../bitcoinstrings.cpp" line="119"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> + <location filename="../bitcoinstrings.cpp" line="120"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> + <location filename="../bitcoinstrings.cpp" line="121"/> <source>Error loading wallet.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> + <location filename="../bitcoinstrings.cpp" line="123"/> <source>Cannot initialize keypool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> + <location filename="../bitcoinstrings.cpp" line="124"/> <source>Cannot write default address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> + <location filename="../bitcoinstrings.cpp" line="125"/> <source>Rescanning...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> + <location filename="../bitcoinstrings.cpp" line="126"/> <source>Done loading</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> + <location filename="../bitcoinstrings.cpp" line="128"/> <source>Invalid amount for -paytxfee=<amount></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> + <location filename="../bitcoinstrings.cpp" line="129"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="96"/> + <location filename="../bitcoinstrings.cpp" line="133"/> <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../bitcoinstrings.cpp" line="99"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation type="unfinished"></translation> - </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_fr_FR.ts b/src/qt/locale/bitcoin_fr_FR.ts index ced0675553..fc8d234188 100644 --- a/src/qt/locale/bitcoin_fr_FR.ts +++ b/src/qt/locale/bitcoin_fr_FR.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> version</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -95,42 +95,42 @@ Ce produit inclut des logiciels développés par OpenSSL Project pour utilisatio <translation>&Supprimer</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>Copier l'adresse</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation>Copier l'étiquette</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation>Éditer</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>Effacer</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation>Exporter les données du carnet d'adresses</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation>Valeurs séparées par des virgules (*.csv)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>Erreur lors de l'exportation</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation>Impossible d'écrire sur le fichier %1.</translation> </message> @@ -299,226 +299,233 @@ Are you sure you wish to encrypt your wallet?</source> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="73"/> + <location filename="../bitcoingui.cpp" line="71"/> <source>Bitcoin Wallet</source> <translation>Porte-monnaie Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> + <location filename="../bitcoingui.cpp" line="506"/> <source>Synchronizing with network...</source> <translation>Synchronisation avec le réseau...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Synchronisation de la chaîne de blocs en cours</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="187"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>&Overview</source> <translation>&Vue d'ensemble</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="186"/> <source>Show general overview of wallet</source> <translation>Affiche une vue d'ensemble du porte-monnaie</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> + <location filename="../bitcoingui.cpp" line="191"/> <source>&Transactions</source> <translation>&Transactions</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="192"/> <source>Browse transaction history</source> <translation>Permet de parcourir l'historique des transactions</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> + <location filename="../bitcoingui.cpp" line="197"/> <source>&Address Book</source> <translation>Carnet d'&adresses</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> + <location filename="../bitcoingui.cpp" line="198"/> <source>Edit the list of stored addresses and labels</source> <translation>Éditer la liste des adresses et des étiquettes stockées</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation>&Recevoir des pièces</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation>Affiche la liste des adresses pour recevoir des paiements</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> + <location filename="../bitcoingui.cpp" line="209"/> <source>&Send coins</source> <translation>&Envoyer des pièces</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> + <location filename="../bitcoingui.cpp" line="210"/> <source>Send coins to a bitcoin address</source> <translation>Envoyer des pièces à une adresse bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> + <location filename="../bitcoingui.cpp" line="215"/> <source>Sign &message</source> <translation>Signer un &message</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> + <location filename="../bitcoingui.cpp" line="216"/> <source>Prove you control an address</source> <translation>Prouver que vous contrôlez une adresse</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> + <location filename="../bitcoingui.cpp" line="235"/> <source>E&xit</source> <translation>Q&uitter</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> + <location filename="../bitcoingui.cpp" line="236"/> <source>Quit application</source> <translation>Quitter l'application</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> + <location filename="../bitcoingui.cpp" line="239"/> <source>&About %1</source> <translation>&À propos de %1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> + <location filename="../bitcoingui.cpp" line="240"/> <source>Show information about Bitcoin</source> <translation>Afficher des informations à propos de Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> + <location filename="../bitcoingui.cpp" line="242"/> <source>About &Qt</source> <translation>À propos de &Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> + <location filename="../bitcoingui.cpp" line="243"/> <source>Show information about Qt</source> <translation>Afficher des informations sur Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> + <location filename="../bitcoingui.cpp" line="245"/> <source>&Options...</source> <translation>&Options...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> + <location filename="../bitcoingui.cpp" line="246"/> <source>Modify configuration options for bitcoin</source> <translation>Modifier les options de configuration pour bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>Ouvrir &Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation>Afficher/Cacher &Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Afficher la fenêtre de Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation>Afficher ou cacher la fenêtre Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> + <location filename="../bitcoingui.cpp" line="250"/> <source>&Export...</source> <translation>&Exporter...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> + <location filename="../bitcoingui.cpp" line="251"/> <source>Export the data in the current tab to a file</source> <translation>Exporter les données de l'onglet courant vers un fichier</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> + <location filename="../bitcoingui.cpp" line="252"/> <source>&Encrypt Wallet</source> <translation>&Chiffrer le porte-monnaie</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="255"/> + <location filename="../bitcoingui.cpp" line="253"/> <source>Encrypt or decrypt wallet</source> <translation>Chiffrer ou décrypter le porte-monnaie</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> + <location filename="../bitcoingui.cpp" line="255"/> <source>&Backup Wallet</source> <translation>&Sauvegarder le porte-monnaie</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> + <location filename="../bitcoingui.cpp" line="256"/> <source>Backup wallet to another location</source> <translation>Sauvegarder le porte-monnaie à un autre emplacement</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> + <location filename="../bitcoingui.cpp" line="257"/> <source>&Change Passphrase</source> <translation>&Modifier la phrase de passe</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> + <location filename="../bitcoingui.cpp" line="258"/> <source>Change the passphrase used for wallet encryption</source> <translation>Modifier la phrase de passe utilisée pour le cryptage du porte-monnaie</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> + <location filename="../bitcoingui.cpp" line="281"/> <source>&File</source> <translation>&Fichier</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> + <location filename="../bitcoingui.cpp" line="290"/> <source>&Settings</source> <translation>&Réglages</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> + <location filename="../bitcoingui.cpp" line="296"/> <source>&Help</source> <translation>&Aide</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> + <location filename="../bitcoingui.cpp" line="303"/> <source>Tabs toolbar</source> <translation>Barre d'outils des onglets</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> + <location filename="../bitcoingui.cpp" line="314"/> <source>Actions toolbar</source> <translation>Barre d'outils des actions</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation>Client Bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="418"/> <source>bitcoin-qt</source> <translation>bitcoin-qt</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> + <location filename="../bitcoingui.cpp" line="482"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n connexion active avec le réseau Bitcoin</numerusform> <numerusform>%n connexions actives avec le réseau Bitcoin</numerusform> </translation> </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>%1 blocs de l'historique des transactions téléchargés sur un total de %2.</translation> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>%1 blocs de l'historique des transactions sur %2 téléchargés (%3% effectué).</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> + <location filename="../bitcoingui.cpp" line="531"/> <source>Downloaded %1 blocks of transaction history.</source> <translation>%1 blocs de l'historique de transaction téléchargé.</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation> <numerusform>il y a %n seconde</numerusform> @@ -526,7 +533,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation> <numerusform>il y a %n minute</numerusform> @@ -534,7 +541,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation> <numerusform>il y a %n heure</numerusform> @@ -542,7 +549,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>il y a %n jour</numerusform> @@ -550,42 +557,42 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation>À jour</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>Rattrapage...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation>Le dernier bloc reçu a été généré %1.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> + <location filename="../bitcoingui.cpp" line="632"/> <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> + <location filename="../bitcoingui.cpp" line="636"/> <source>Sending...</source> <translation>Envoi en cours...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> + <location filename="../bitcoingui.cpp" line="663"/> <source>Sent transaction</source> <translation>Transaction envoyée</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> + <location filename="../bitcoingui.cpp" line="664"/> <source>Incoming transaction</source> <translation>Transaction entrante</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -598,37 +605,37 @@ Adresse : %4 </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Le porte-monnaie est <b>chiffré</b> et est actuellement <b>déverrouillé</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Le porte-monnaie est <b>chiffré</b> et est actuellement <b>verrouillé</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Backup Wallet</source> <translation>Sauvegarder le porte-monnaie</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation>Données de porte-monnaie (*.dat)</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation>La sauvegarde a échoué</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation>Une erreur est survenue lors de l'enregistrement des données de porte-monnaie à un autre emplacement.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Une erreur fatale est survenue. Bitcoin ne peut plus continuer à fonctionner de façon sûre et va s'arrêter.</translation> </message> @@ -636,22 +643,22 @@ Adresse : %4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&Unité d'affichage des montants : </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>Choisissez la sous-unité par défaut pour l'affichage dans l'interface et lors de l'envoi de pièces</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&Afficher les adresses dans la liste des transactions</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished">Détermine si les adresses Bitcoin seront affichées sur la liste des transactions.</translation> </message> @@ -727,82 +734,92 @@ Adresse : %4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>&Démarrer Bitcoin avec le système de fenêtres</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Lancer automatiquement Bitcoin lorsque l'ordinateur est allumé</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>&Minimiser dans la barre système au lieu de la barre des tâches</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>Montrer uniquement une icône système après minimisation</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> + <location filename="../optionsdialog.cpp" line="185"/> <source>Map port using &UPnP</source> <translation>Ouvrir le port avec l'&UPnP</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="181"/> + <location filename="../optionsdialog.cpp" line="186"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Ouvrir le port du client Bitcoin automatiquement sur le routeur. Cela ne fonctionne que si votre routeur supporte l'UPnP et si la fonctionnalité est activée.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="180"/> <source>M&inimize on close</source> <translation>M&inimiser lors de la fermeture</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="186"/> + <location filename="../optionsdialog.cpp" line="181"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>Minimiser au lieu quitter l'application lorsque la fenêtre est fermée. Lorsque cette option est activée, l'application ne pourra être fermée qu'en sélectionnant Quitter dans le menu déroulant.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>&Connexion à travers un proxy SOCKS4 :</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Connexion au réseau Bitcoin à travers un proxy SOCKS4 (par ex. lors d'une connexion via Tor)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>&IP du proxy : </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>Adresse IP du proxy (par ex. 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>&Port : </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Port du proxy (par ex. 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>Payer des &frais de transaction</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation type="unfinished">Détacher les bases de données lors de la fermeture</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation>Détacher les bases de données de blocs et d'adresses lors de la fermeture. Cela permet de les déplacer dans un autre répertoire de données mais ralentit la fermeture. Le porte-monnaie est toujours détaché.</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>Frais de transaction optionnels par ko qui aident à garantir un traitement rapide des transactions. La plupart des transactions occupent 1 ko. Des frais de 0.01 sont recommandés.</translation> </message> @@ -900,17 +917,17 @@ Adresse : %4 <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>Principal</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>Affichage</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>Options</translation> </message> @@ -1011,17 +1028,22 @@ Adresse : %4 <translation>&Enregistrer sous...</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation>Erreur de l'encodage de l'URI dans le QR Code.</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>L'URI résultant est trop long, essayez avec un texte d'étiquette ou de message plus court.</translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation>Enregistrer l'image...</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation>Images PNG (*.png)</translation> </message> @@ -1203,140 +1225,140 @@ Adresse : %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="18"/> + <location filename="../transactiondesc.cpp" line="20"/> <source>Open for %1 blocks</source> <translation>Ouvert pour %1 blocs</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> + <location filename="../transactiondesc.cpp" line="22"/> <source>Open until %1</source> <translation>Ouvert jusqu'à %1</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation>%1/hors ligne ?</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="28"/> + <location filename="../transactiondesc.cpp" line="30"/> <source>%1/unconfirmed</source> <translation>%1/non confirmée</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation>%1 confirmations</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation><b>État :</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation>, n'a pas encore été diffusée avec succès</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>, diffusée à travers %1 nœud</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>, diffusée à travers %1 nœuds</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation><b>Date :</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>Source :</b> Généré<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>De :</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="92"/> <source>unknown</source> <translation>inconnue</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation><b>À :</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation> (vôtre, étiquette : </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation> (vôtre)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation><b>Crédit : </b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation>(%1 sera considérée comme mûre suite à %2 blocs de plus)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation>(pas accepté)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation><b>Débit : </b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation><b>Frais de transaction :</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>Montant net :</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>Message :</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>Commentaire :</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation>ID de la transaction :</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation>Les pièces générées doivent attendre 120 blocs avant de pouvoir être dépensées. Lorsque vous avez généré ce bloc, il a été diffusé sur le réseau pour être ajouté à la chaîne des blocs. S'il échoue a intégrer la chaîne, il sera modifié en « pas accepté » et il ne sera pas possible de le dépenser. Cela peut arriver occasionnellement si un autre nœud génère un bloc quelques secondes avant ou après vous.</translation> </message> @@ -1645,7 +1667,7 @@ Adresse : %4 <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>Envoi en cours...</translation> </message> @@ -1653,401 +1675,494 @@ Adresse : %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> + <location filename="../bitcoinstrings.cpp" line="41"/> <source>Bitcoin version</source> <translation>Version de bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> + <location filename="../bitcoinstrings.cpp" line="42"/> <source>Usage:</source> <translation>Utilisation :</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> + <location filename="../bitcoinstrings.cpp" line="43"/> <source>Send command to -server or bitcoind</source> <translation>Envoyer une commande à -server ou à bitcoind</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> + <location filename="../bitcoinstrings.cpp" line="44"/> <source>List commands</source> <translation>Lister les commandes</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> + <location filename="../bitcoinstrings.cpp" line="45"/> <source>Get help for a command</source> <translation>Obtenir de l'aide pour une commande</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> + <location filename="../bitcoinstrings.cpp" line="46"/> <source>Options:</source> <translation>Options :</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> + <location filename="../bitcoinstrings.cpp" line="47"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Spécifier le fichier de configuration (par défaut : bitcoin.conf)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> + <location filename="../bitcoinstrings.cpp" line="48"/> <source>Specify pid file (default: bitcoind.pid)</source> <translation>Spécifier le fichier pid (par défaut : bitcoind.pid)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> + <location filename="../bitcoinstrings.cpp" line="49"/> <source>Generate coins</source> <translation>Générer des pièces</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> + <location filename="../bitcoinstrings.cpp" line="50"/> <source>Don't generate coins</source> <translation>Ne pas générer de pièces</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> + <location filename="../bitcoinstrings.cpp" line="51"/> <source>Start minimized</source> <translation>Démarrer sous forme minimisée</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Show splash screen on startup (default: 1)</source> - <translation>Afficher l'écran d'accueil au démarrage (par défaut : 1)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="20"/> + <location filename="../bitcoinstrings.cpp" line="53"/> <source>Specify data directory</source> <translation>Spécifier le répertoire de données</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Définir la taille du tampon en mégaoctets (par défaut : 25)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="22"/> + <location filename="../bitcoinstrings.cpp" line="56"/> <source>Specify connection timeout (in milliseconds)</source> <translation>Spécifier le délai d'expiration de la connexion (en millisecondes)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> + <location filename="../bitcoinstrings.cpp" line="57"/> <source>Connect through socks4 proxy</source> <translation>Connexion via un proxy socks4</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> + <location filename="../bitcoinstrings.cpp" line="58"/> <source>Allow DNS lookups for addnode and connect</source> <translation>Autoriser les recherches DNS pour l'ajout de nœuds et la connexion</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> + <location filename="../bitcoinstrings.cpp" line="59"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Écouter les connexions sur le <port> (par défaut : 8333 ou testnet : 18333)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> + <location filename="../bitcoinstrings.cpp" line="60"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>Garder au plus <n> connexions avec les pairs (par défaut : 125)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> + <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation>Ne se connecter qu'au nœud spécifié</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Envoi en cours...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>Montant invalide</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>Fonds insuffisants</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation>Pour utiliser l'option %s</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation>%s, vous devez établir un mot de passe rpc dans le fichier de configuration : + %s +Il est recommandé d'utiliser le mot de passe aléatoire suivant : +rcpuser=bitcoinrpc +rpcpassword=%s +(vous n'avez pas besoin de mémoriser ce mot de passe) +Si le fichier n'existe pas, créez-le avec les droits de lecture accordés au propriétaire. +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation>Erreur</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation>Vous devez ajouter la ligne rpcpassword=<mot-de-passe> au fichier de configuration : +%s +Si le fichier n'existe pas, créez-le avec les droits de lecture seule accordés au propriétaire.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="52"/> + <source>Show splash screen on startup (default: 1)</source> + <translation>Afficher l'écran d'accueil au démarrage (par défaut : 1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="54"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation>Définir la taille du tampon en mégaoctets (par défaut : 25)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation>Définir la taille du journal de la base de données sur le disque en mégaoctets (par défaut : 100)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="63"/> <source>Find peers using internet relay chat (default: 0)</source> <translation>Trouver des pairs en utilisant Internet Relay Chat (par défaut : 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation type="unfinished">Accepter les connexions entrantes (par défaut : 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> + <location filename="../bitcoinstrings.cpp" line="65"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation>Définir la langue, par exemple « de_DE » (par défaut : la langue du système)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> + <location filename="../bitcoinstrings.cpp" line="66"/> <source>Find peers using DNS lookup (default: 1)</source> <translation type="unfinished">Trouver des pairs en utilisant la recherche DNS (par défaut : 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> + <location filename="../bitcoinstrings.cpp" line="67"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Seuil de déconnexion des pairs de mauvaise qualité (par défaut : 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> + <location filename="../bitcoinstrings.cpp" line="68"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Délai en secondes de refus de reconnexion aux pairs de mauvaise qualité (par défaut : 86400)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation>Tampon maximal de réception par connexion, <n>*1000 octets (par défaut : 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation>Tampon maximal d'envoi par connexion, <n>*1000 octets (par défaut : 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation>Détacher les bases de données des blocs et des adresses. Augmente le délai de fermeture (par défaut : 0)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="78"/> <source>Accept command line and JSON-RPC commands</source> <translation>Accepter les commandes de JSON-RPC et de la ligne de commande</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> + <location filename="../bitcoinstrings.cpp" line="79"/> <source>Run in the background as a daemon and accept commands</source> <translation>Fonctionner en arrière-plan en tant que démon et accepter les commandes</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> + <location filename="../bitcoinstrings.cpp" line="80"/> <source>Use the test network</source> <translation>Utiliser le réseau de test</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> + <location filename="../bitcoinstrings.cpp" line="81"/> <source>Output extra debugging information</source> <translation>Informations de débogage supplémentaires</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> + <location filename="../bitcoinstrings.cpp" line="82"/> <source>Prepend debug output with timestamp</source> <translation>Faire précéder les données de débogage par un horodatage</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> + <location filename="../bitcoinstrings.cpp" line="83"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Envoyer les informations de débogage/trace à la console au lieu du fichier debug.log</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> + <location filename="../bitcoinstrings.cpp" line="84"/> <source>Send trace/debug info to debugger</source> <translation>Envoyer les informations de débogage/trace au débogueur</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> + <location filename="../bitcoinstrings.cpp" line="85"/> <source>Username for JSON-RPC connections</source> <translation>Nom d'utilisateur pour les connexions JSON-RPC</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> + <location filename="../bitcoinstrings.cpp" line="86"/> <source>Password for JSON-RPC connections</source> <translation>Mot de passe pour les connexions JSON-RPC</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> + <location filename="../bitcoinstrings.cpp" line="87"/> <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation>Écouter les connexions JSON-RPC sur le <port> (par défaut : 8332)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> + <location filename="../bitcoinstrings.cpp" line="88"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Autoriser les connexions JSON-RPC depuis l'adresse IP spécifiée</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> + <location filename="../bitcoinstrings.cpp" line="89"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Envoyer des commandes au nœud fonctionnant à <ip> (par défaut : 127.0.0.1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> + <location filename="../bitcoinstrings.cpp" line="90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Exécuter la commande lorsque le meilleur bloc change (%s est remplacé par le hachage du bloc dans cmd)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> - <source>Upgrade wallet to latest format</source> - <translation>Mettre à jour le format du porte-monnaie</translation> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source>How many blocks to check at startup (default: 2500, 0 = all)</source> + <translation>Nombre de blocs à tester au démarrage (par défaut : 2500, 0 = tous)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>How thorough the block verification is (0-6, default: 1)</source> + <translation>Profondeur de la vérification des blocs (0-6, par défaut : 1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="107"/> + <source>This help message</source> + <translation>Ce message d'aide</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation>Utilisation</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="94"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Régler la taille de la plage de clefs sur <n> (par défaut : 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> + <location filename="../bitcoinstrings.cpp" line="95"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>Réanalyser la chaîne de blocs pour les transactions de porte-monnaie manquantes</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> - <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation>Nombre de blocs à tester au démarrage (par défaut : 2500, 0 = tous)</translation> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Upgrade wallet to latest format</source> + <translation>Mettre à jour le format du porte-monnaie</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> - <source>How thorough the block verification is (0-6, default: 1)</source> - <translation>Profondeur de la vérification des blocs (0-6, par défaut : 1)</translation> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">Erreur : échec de la création de la transaction.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">Erreur : la transaction a été rejetée. Cela peut arriver si certaines pièces de votre porte-monnaie ont déjà été dépensées, par exemple si vous avez utilisé une copie de wallet.dat et si des pièces ont été dépensées avec cette copie sans être marquées comme telles ici.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation>Une erreur est survenue lors de la mise en place du port d'écoute RPC %u : %s</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation> Options SSL : (cf. le wiki Bitcoin pour les réglages SSL)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> + <location filename="../bitcoinstrings.cpp" line="101"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Utiliser OpenSSL (https) pour les connexions JSON-RPC</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> + <location filename="../bitcoinstrings.cpp" line="102"/> <source>Server certificate file (default: server.cert)</source> <translation>Fichier de certificat serveur (par défaut : server.cert)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> + <location filename="../bitcoinstrings.cpp" line="103"/> <source>Server private key (default: server.pem)</source> <translation>Clef privée du serveur (par défaut : server.pem)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> + <location filename="../bitcoinstrings.cpp" line="104"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Clefs de chiffrement acceptables (par défaut : TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> - <source>This help message</source> - <translation>Ce message d'aide</translation> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>Impossible d'obtenir un verrou sur le répertoire de données %s. Bitcoin fonctionne probablement déjà.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="113"/> <source>Loading addresses...</source> <translation>Chargement des adresses...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> + <location filename="../bitcoinstrings.cpp" line="114"/> <source>Error loading addr.dat</source> <translation>Erreur lors du chargement de addr.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> + <location filename="../bitcoinstrings.cpp" line="115"/> + <source>Loading block index...</source> + <translation>Chargement de l'index des blocs...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="116"/> <source>Error loading blkindex.dat</source> <translation>Erreur lors du chargement de blkindex.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Loading wallet...</source> + <translation>Chargement du porte-monnaie...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="118"/> <source>Error loading wallet.dat: Wallet corrupted</source> - <translation>Erreur lors du chargement de wallet.dat : porte-monnaie corrompu</translation> + <translation>Erreur lors du chargement de wallet.dat : porte-monnaie corrompu</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> + <location filename="../bitcoinstrings.cpp" line="119"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> <translation>Erreur lors du chargement de wallet.dat : le porte-monnaie nécessite une version plus récente de Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> + <location filename="../bitcoinstrings.cpp" line="120"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Le porte-monnaie nécessitait une réécriture. Veuillez redémarrer Bitcoin pour terminer l'opération</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> + <location filename="../bitcoinstrings.cpp" line="121"/> <source>Error loading wallet.dat</source> <translation>Erreur lors du chargement de wallet.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> - <source>Loading block index...</source> - <translation>Chargement de l'index des blocs...</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="79"/> - <source>Loading wallet...</source> - <translation>Chargement du porte-monnaie...</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation>Impossible de revenir à une version antérieure du porte-monnaie</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> + <location filename="../bitcoinstrings.cpp" line="123"/> <source>Cannot initialize keypool</source> <translation>Impossible d'initialiser la plage des clefs</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> + <location filename="../bitcoinstrings.cpp" line="124"/> <source>Cannot write default address</source> <translation>Impossible d'écrire l'adresse par défaut</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> + <location filename="../bitcoinstrings.cpp" line="125"/> <source>Rescanning...</source> <translation>Nouvelle analyse...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> + <location filename="../bitcoinstrings.cpp" line="126"/> <source>Done loading</source> <translation>Chargement terminé</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation>Adresse -proxy invalide</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> + <location filename="../bitcoinstrings.cpp" line="128"/> <source>Invalid amount for -paytxfee=<amount></source> <translation>Montant invalide pour -paytxfee=<montant></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> + <location filename="../bitcoinstrings.cpp" line="129"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation>Attention : -paytxfee est réglée sur un montant très élevé. Il s'agit des frais de transaction que vous payerez si vous envoyez une transaction.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation>Erreur : CreateThread(StartNode) a échoué</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> + <location filename="../bitcoinstrings.cpp" line="133"/> <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> <translation>Impossible de s'attacher au port %d sur cet ordinateur. Bitcoin fonctionne probablement déjà.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> + <location filename="../bitcoinstrings.cpp" line="38"/> <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> <translation>Attention : veuillez vérifier que l'heure et la date de votre ordinateur sont corrects. Si votre horloge n'est pas à l'heure, Bitcoin ne fonctionnera pas correctement.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> + <location filename="../bitcoinstrings.cpp" line="20"/> <source>Warning: Disk space is low</source> <translation>Attention : l'espace disque est faible</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> + <location filename="../bitcoinstrings.cpp" line="61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Ajouter un nœud auquel se connecter et tenter de garder la connexion ouverte</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished">Essayer d'utiliser l'UPnP pour ouvrir le port d'écoute (default: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished">Essayer d'utiliser l'UPnP pour ouvrir le port d'écoute (default: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> + <location filename="../bitcoinstrings.cpp" line="77"/> <source>Fee per KB to add to transactions you send</source> <translation>Frais par ko à ajouter aux transactions que vous enverrez</translation> </message> - <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>bêta</translation> - </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts index 57470551e4..f8379e7d7a 100644 --- a/src/qt/locale/bitcoin_he.ts +++ b/src/qt/locale/bitcoin_he.ts @@ -15,7 +15,7 @@ <translation>גרסת <b>ביטקוין</b></translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -95,42 +95,42 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&מחיקה</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>העתק כתובת</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation>העתק תוית</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation>ערוך</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>מחק</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation>יצוא נתוני פנקס כתובות</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation>קובץ מופרד בפסיקים (*.csv)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>שגיאה ביצוא</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation>לא מסוגל לכתוב לקובץ %1.</translation> </message> @@ -156,6 +156,11 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>AskPassphraseDialog</name> <message> + <location filename="../forms/askpassphrasedialog.ui" line="26"/> + <source>Dialog</source> + <translation>שיח</translation> + </message> + <message> <location filename="../forms/askpassphrasedialog.ui" line="47"/> <source>Enter passphrase</source> <translation>הכנס סיסמא</translation> @@ -171,9 +176,9 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>חזור על הסיסמה החדשה</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="26"/> - <source>Dialog</source> - <translation>שיח</translation> + <location filename="../forms/askpassphrasedialog.ui" line="94"/> + <source>TextLabel</source> + <translation>טקסטתוית</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="34"/> @@ -191,11 +196,6 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>הפעולה הזו דורשת את סיסמת הארנק שלך בשביל לפתוח את הארנק.</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="94"/> - <source>TextLabel</source> - <translation>טקסטתוית</translation> - </message> - <message> <location filename="../askpassphrasedialog.cpp" line="43"/> <source>Unlock wallet</source> <translation>פתיחת ארנק</translation> @@ -226,6 +226,13 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>אשר הצפנת ארנק</translation> </message> <message> + <location filename="../askpassphrasedialog.cpp" line="102"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! +Are you sure you wish to encrypt your wallet?</source> + <translation>אזהרה: אם תצפין את הארנק שלך ותאבד את הסיסמה אתה <b>תאבד את כל הביטקוין שלך</b>! +אתה בטוח שברצונך להצפין את הארנק?</translation> + </message> + <message> <location filename="../askpassphrasedialog.cpp" line="111"/> <location filename="../askpassphrasedialog.cpp" line="169"/> <source>Wallet encrypted</source> @@ -270,6 +277,14 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>פענוח הארנק נכשל</translation> </message> <message> + <location filename="../askpassphrasedialog.cpp" line="126"/> + <location filename="../askpassphrasedialog.cpp" line="133"/> + <location filename="../askpassphrasedialog.cpp" line="175"/> + <location filename="../askpassphrasedialog.cpp" line="181"/> + <source>Wallet encryption failed</source> + <translation>הצפנת הארנק נכשלה</translation> + </message> + <message> <location filename="../askpassphrasedialog.cpp" line="170"/> <source>Wallet passphrase was successfully changed.</source> <translation>סיסמת הארנק שונתה בהצלחה.</translation> @@ -280,87 +295,86 @@ This product includes software developed by the OpenSSL Project for use in the O <source>Warning: The Caps Lock key is on.</source> <translation>אזהרה: מקש Caps Lock מופעל.</translation> </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="102"/> - <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! -Are you sure you wish to encrypt your wallet?</source> - <translation>אזהרה: אם תצפין את הארנק שלך ותאבד את הסיסמה אתה <b>תאבד את כל הביטקוין שלך</b>! -אתה בטוח שברצונך להצפין את הארנק?</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="126"/> - <location filename="../askpassphrasedialog.cpp" line="133"/> - <location filename="../askpassphrasedialog.cpp" line="175"/> - <location filename="../askpassphrasedialog.cpp" line="181"/> - <source>Wallet encryption failed</source> - <translation>הצפנת הארנק נכשלה</translation> - </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="242"/> - <source>Show information about Bitcoin</source> - <translation>הצג מידע על ביטקוין</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> - <translation>י&צא לקובץ</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> + <location filename="../bitcoingui.cpp" line="506"/> <source>Synchronizing with network...</source> <translation>מסתנכרן עם הרשת...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="187"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>&Overview</source> <translation>&סקירה</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> - <source>Tabs toolbar</source> - <translation>סרגל כלים טאבים</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="316"/> + <location filename="../bitcoingui.cpp" line="314"/> <source>Actions toolbar</source> <translation>סרגל כלים פעולות</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation>[רשת-בדיקה]</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="186"/> <source>Show general overview of wallet</source> <translation>הצג סקירה כללית של הארנק</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> + <location filename="../bitcoingui.cpp" line="191"/> <source>&Transactions</source> <translation>&פעולות</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="192"/> <source>Browse transaction history</source> <translation>דפדף בהיסטוריית הפעולות</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> + <location filename="../bitcoingui.cpp" line="197"/> <source>&Address Book</source> <translation>פנקס &כתובות</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> + <location filename="../bitcoingui.cpp" line="198"/> <source>Edit the list of stored addresses and labels</source> <translation>ערוך את רשימת הכתובות והתויות</translation> </message> + <message> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Send coins to a bitcoin address</source> + <translation>שלח מטבעות לכתובת ביטקוין</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="215"/> + <source>Sign &message</source> + <translation>חתום על הו&דעה</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>&אודות %1</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="252"/> + <source>&Encrypt Wallet</source> + <translation>הצ&פן ארנק</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation>שנה &סיסמה</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="418"/> + <source>bitcoin-qt</source> + <translation>bitcoin-qt</translation> + </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> + <location filename="../bitcoingui.cpp" line="482"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>חיבור פעיל אחד לרשת הביטקוין</numerusform> @@ -368,12 +382,12 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> + <location filename="../bitcoingui.cpp" line="531"/> <source>Downloaded %1 blocks of transaction history.</source> <translation>הורדו %1 בלוקים של היסטוריית פעולות.</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation> <numerusform>לפני שניה</numerusform> @@ -381,7 +395,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>לפני יום</numerusform> @@ -389,27 +403,27 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> - <source>Incoming transaction</source> - <translation>פעולה שהתקבלה</translation> + <location filename="../bitcoingui.cpp" line="632"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> - <source>Catching up...</source> - <translation>מתעדכן...</translation> + <location filename="../bitcoingui.cpp" line="636"/> + <source>Sending...</source> + <translation>שולח...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>הארנק <b>מוצפן</b> וכרגע <b>נעול</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> + <location filename="../bitcoingui.cpp" line="663"/> <source>Sent transaction</source> <translation>פעולה שנשלחה</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -421,82 +435,52 @@ Address: %4 כתובת: %4</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>הארנק <b>מוצפן</b> וכרגע <b>פתוח</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> + <location filename="../bitcoingui.cpp" line="281"/> <source>&File</source> <translation>&קובץ</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> + <location filename="../bitcoingui.cpp" line="251"/> <source>Export the data in the current tab to a file</source> <translation>יצוא הנתונים בטאב הנוכחי לקובץ</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> - <source>Backup wallet to another location</source> - <translation>גיבוי הארנק למקום אחר</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="244"/> + <location filename="../bitcoingui.cpp" line="242"/> <source>About &Qt</source> <translation>אודות Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> - <source>Change the passphrase used for wallet encryption</source> - <translation>שנה את הסיסמה להצפנת הארנק</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>הצג את חלון ביטקוין</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="257"/> - <source>&Backup Wallet</source> - <translation>&גיבוי ארנק</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="292"/> + <location filename="../bitcoingui.cpp" line="290"/> <source>&Settings</source> <translation>ה&גדרות</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> + <location filename="../bitcoingui.cpp" line="296"/> <source>&Help</source> <translation>&עזרה</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> + <location filename="../bitcoingui.cpp" line="235"/> <source>E&xit</source> <translation>י&ציאה</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> - <source>Quit application</source> - <translation>סגור תוכנה</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="247"/> + <location filename="../bitcoingui.cpp" line="245"/> <source>&Options...</source> <translation>&אפשרויות</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>&אודות %1</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>פתח את &ביטקוין</translation> + <location filename="../bitcoingui.cpp" line="255"/> + <source>&Backup Wallet</source> + <translation>&גיבוי ארנק</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation> <numerusform>לפני דקה</numerusform> @@ -504,7 +488,7 @@ Address: %4 </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation> <numerusform>לפני שעה</numerusform> @@ -512,122 +496,145 @@ Address: %4 </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> - <source>bitcoin-qt</source> - <translation>bitcoin-qt</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation>&קבלת מטבעות</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="255"/> + <location filename="../bitcoingui.cpp" line="253"/> <source>Encrypt or decrypt wallet</source> <translation>הצפן או פענח ארנק</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation>הצג את רשימת הכתובות לקבלת תשלומים</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> + <location filename="../bitcoingui.cpp" line="243"/> <source>Show information about Qt</source> <translation>הצג מידע על Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>סנכרון עם שרשרת הבלוקים בעיצומו</translation> + <location filename="../bitcoingui.cpp" line="209"/> + <source>&Send coins</source> + <translation>&שלח מטבעות</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation>הצג או הסתר את חלון ביטקוין.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="73"/> + <location filename="../bitcoingui.cpp" line="71"/> <source>Bitcoin Wallet</source> <translation>ארנק ביטקוין</translation> </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation> + <numerusform>בלוק אחד נותר</numerusform> + <numerusform>~%n בלוקים נותרו</numerusform> + </translation> + </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> - <source>&Send coins</source> - <translation>&שלח מטבעות</translation> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>הורדו %1 בלוקים של היסטוריית פעולות מתוך %2 (הושלם %3% מהסה"כ).</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> - <source>Send coins to a bitcoin address</source> - <translation>שלח מטבעות לכתובת ביטקוין</translation> + <location filename="../bitcoingui.cpp" line="216"/> + <source>Prove you control an address</source> + <translation>הוכח שאתה שולט בכתובת</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> - <source>Sign &message</source> - <translation>חתום על הו&דעה</translation> + <location filename="../bitcoingui.cpp" line="303"/> + <source>Tabs toolbar</source> + <translation>סרגל כלים טאבים</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> - <source>Prove you control an address</source> - <translation>הוכח שאתה שולט בכתובת</translation> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation>תוכנת ביטקוין</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> + <location filename="../bitcoingui.cpp" line="246"/> <source>Modify configuration options for bitcoin</source> <translation>שנה הגדרות עבור ביטקוין</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation>הצ&פן ארנק</translation> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation>הצג/הסתר את &ביטקוין</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>שנה &סיסמה</translation> + <location filename="../bitcoingui.cpp" line="236"/> + <source>Quit application</source> + <translation>סגור תוכנה</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>הורדו %1 מתוך %2 בלוקים של היסטוריית פעולות.</translation> + <location filename="../bitcoingui.cpp" line="240"/> + <source>Show information about Bitcoin</source> + <translation>הצג מידע על ביטקוין</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="256"/> + <source>Backup wallet to another location</source> + <translation>גיבוי הארנק למקום אחר</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="258"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>שנה את הסיסמה להצפנת הארנק</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="250"/> + <source>&Export...</source> + <translation>י&צא לקובץ</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation>עדכני</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> - <source>Last received block was generated %1.</source> - <translation>הבלוק האחרון שהתקבל נוצר ב-%1.</translation> + <location filename="../bitcoingui.cpp" line="569"/> + <source>Catching up...</source> + <translation>מתעדכן...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> - <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="577"/> + <source>Last received block was generated %1.</source> + <translation>הבלוק האחרון שהתקבל נוצר ב-%1.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> - <source>Sending...</source> - <translation>שולח...</translation> + <location filename="../bitcoingui.cpp" line="664"/> + <source>Incoming transaction</source> + <translation>פעולה שהתקבלה</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Backup Wallet</source> <translation>גיבוי ארנק</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation>נתוני ארנק (*.dat)</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation>הגיבוי נכשל</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation>היתה שגיאה בניסיון לשמור את מידע הארנק למיקום החדש.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>שגיאה סופנית אירעה. ביטקוין אינו יכול להמשיך לפעול בבטחה ולכן ייסגר.</translation> </message> @@ -635,22 +642,22 @@ Address: %4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&יחידת מדידה להציג בה כמויות: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>בחר את יחידת החלוקה להצגה בממשק, ובעת שליחת מטבעות</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&הצג כתובות ברשימת הפעולות</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished">האם להציג כתובות ביטקוין ברשימת הפעולות או לא.</translation> </message> @@ -658,21 +665,6 @@ Address: %4 <context> <name>EditAddressDialog</name> <message> - <location filename="../forms/editaddressdialog.ui" line="35"/> - <source>The label associated with this address book entry</source> - <translation>התוית המשויכת לרשומה הזו בפנקס הכתובות</translation> - </message> - <message> - <location filename="../forms/editaddressdialog.ui" line="42"/> - <source>&Address</source> - <translation>&כתובת</translation> - </message> - <message> - <location filename="../editaddressdialog.cpp" line="106"/> - <source>New key generation failed.</source> - <translation>יצירת מפתח חדש נכשלה.</translation> - </message> - <message> <location filename="../forms/editaddressdialog.ui" line="14"/> <source>Edit Address</source> <translation>ערוך כתובת</translation> @@ -683,11 +675,26 @@ Address: %4 <translation>ת&וית</translation> </message> <message> + <location filename="../forms/editaddressdialog.ui" line="35"/> + <source>The label associated with this address book entry</source> + <translation>התוית המשויכת לרשומה הזו בפנקס הכתובות</translation> + </message> + <message> + <location filename="../forms/editaddressdialog.ui" line="42"/> + <source>&Address</source> + <translation>&כתובת</translation> + </message> + <message> <location filename="../forms/editaddressdialog.ui" line="52"/> <source>The address associated with this address book entry. This can only be modified for sending addresses.</source> <translation>הכתובת המשויכת לרשומה זו בפנקס הכתובות. ניתן לשנות זאת רק עבור כתובות לשליחה.</translation> </message> <message> + <location filename="../editaddressdialog.cpp" line="106"/> + <source>New key generation failed.</source> + <translation>יצירת מפתח חדש נכשלה.</translation> + </message> + <message> <location filename="../editaddressdialog.cpp" line="20"/> <source>New receiving address</source> <translation>כתובת חדשה לקבלה</translation> @@ -703,11 +710,6 @@ Address: %4 <translation>ערוך כתובת לקבלה</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="31"/> - <source>Edit sending address</source> - <translation>ערוך כתובת לשליחה</translation> - </message> - <message> <location filename="../editaddressdialog.cpp" line="101"/> <source>Could not unlock wallet.</source> <translation>פתיחת הארנק נכשלה.</translation> @@ -718,6 +720,11 @@ Address: %4 <translation>הכתובת שהכנסת "%1" כבר נמצאת בפנקס הכתובות.</translation> </message> <message> + <location filename="../editaddressdialog.cpp" line="31"/> + <source>Edit sending address</source> + <translation>ערוך כתובת לשליחה</translation> + </message> + <message> <location filename="../editaddressdialog.cpp" line="96"/> <source>The entered address "%1" is not a valid bitcoin address.</source> <translation>הכתובת שהכנסת "%1" אינה כתובת ביטקוין תקינה.</translation> @@ -726,82 +733,92 @@ Address: %4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>התח&ל את ביטקוין בהפעלת מערכת חלונות</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>התחל את ביטקוין אוטומטית כשהמחשב נדלק</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> - <source>&Minimize to the tray instead of the taskbar</source> - <translation>מ&זער למגש במקום לשורת המשימות</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>הצג אייקון מגש בלבד לאחר מזעור החלון</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> + <location filename="../optionsdialog.cpp" line="185"/> <source>Map port using &UPnP</source> <translation>מיפוי פורט באמצעות UPnP</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="181"/> + <location filename="../optionsdialog.cpp" line="186"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>פתח את פורט ביטקוין בנתב באופן אוטומטי. עובד רק אם UPnP מאופשר ונתמך ע"י הנתב.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="180"/> <source>M&inimize on close</source> <translation>מז&ער בעת סגירה</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="186"/> + <location filename="../optionsdialog.cpp" line="176"/> + <source>&Minimize to the tray instead of the taskbar</source> + <translation>מ&זער למגש במקום לשורת המשימות</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="181"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>מזער את התוכנה במקום לצאת ממנה כשהחלון נסגר. כשאפשרות זו פעילה, התוכנה תיסגר רק לאחר בחירת יציאה מהתפריט.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>התח&בר דרך פרוקסי SOCKS4:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation type="unfinished">התחבר לרשת הביטקוין דרך פרוקסי SOCKS4 (למשל, בעת חיבור דרך Tor)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>IP של פרוקסי:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>כתובת האינטרנט של הפרוקסי (למשל 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>&פורט: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>הפורט של הפרוקסי (למשל 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>שלם &עמלת פעולה</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation>נתק מסדי נתונים בעת סגירה</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation>נתק מסדי נתונים של בלוקים וכתובות בעת סגירה. משמעות הדבר היא שניתן להזיז אותם לתיקיית נתונים אחרת, אבל הסגירה תהיה איטית יותר. הארנק תמיד מנותק.</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>עמלת פעולה אופציונלית לכל kB תבטיח שהפעולה שלך תעובד בזריזות. רוב הפעולות הן 1 kB. מומלצת עמלה בסך 0.01.</translation> </message> @@ -899,17 +916,17 @@ Address: %4 <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>ראשי</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>תצוגה</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>אפשרויות</translation> </message> @@ -917,16 +934,6 @@ Address: %4 <context> <name>OverviewPage</name> <message> - <location filename="../overviewpage.cpp" line="103"/> - <source>Your current balance</source> - <translation>היתרה הנוכחית שלך</translation> - </message> - <message> - <location filename="../forms/overviewpage.ui" line="68"/> - <source>Unconfirmed:</source> - <translation>ממתין לאישור:</translation> - </message> - <message> <location filename="../forms/overviewpage.ui" line="14"/> <source>Form</source> <translation>טופס</translation> @@ -942,6 +949,16 @@ Address: %4 <translation>ארנק</translation> </message> <message> + <location filename="../overviewpage.cpp" line="103"/> + <source>Your current balance</source> + <translation>היתרה הנוכחית שלך</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="68"/> + <source>Unconfirmed:</source> + <translation>ממתין לאישור:</translation> + </message> + <message> <location filename="../overviewpage.cpp" line="108"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> <translation>הסכום הכולל של פעולות שטרם אושרו, ועוד אינן נספרות בחישוב היתרה הנוכחית</translation> @@ -952,16 +969,16 @@ Address: %4 <translation>מספר פעולות:</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="124"/> - <source><b>Recent transactions</b></source> - <translation><b>פעולות אחרונות</b></translation> - </message> - <message> <location filename="../overviewpage.cpp" line="111"/> <source>Total number of transactions in wallet</source> <translation>המספר הכולל של פעולות בארנק</translation> </message> <message> + <location filename="../forms/overviewpage.ui" line="124"/> + <source><b>Recent transactions</b></source> + <translation><b>פעולות אחרונות</b></translation> + </message> + <message> <location filename="../forms/overviewpage.ui" line="61"/> <source>0</source> <translation>0</translation> @@ -970,9 +987,9 @@ Address: %4 <context> <name>QRCodeDialog</name> <message> - <location filename="../forms/qrcodedialog.ui" line="186"/> - <source>&Save As...</source> - <translation>&שמור בשם...</translation> + <location filename="../forms/qrcodedialog.ui" line="55"/> + <source>Request Payment</source> + <translation>בקש תשלום</translation> </message> <message> <location filename="../forms/qrcodedialog.ui" line="14"/> @@ -985,11 +1002,6 @@ Address: %4 <translation>קוד QR</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="55"/> - <source>Request Payment</source> - <translation>בקש תשלום</translation> - </message> - <message> <location filename="../forms/qrcodedialog.ui" line="70"/> <source>Amount:</source> <translation>כמות:</translation> @@ -1005,25 +1017,35 @@ Address: %4 <translation>הודעה:</translation> </message> <message> + <location filename="../forms/qrcodedialog.ui" line="186"/> + <source>&Save As...</source> + <translation>&שמור בשם...</translation> + </message> + <message> <location filename="../forms/qrcodedialog.ui" line="105"/> <source>BTC</source> <translation>ביטקוין</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation>שגיאה בקידוד URI לקוד QR</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> - <source>Save Image...</source> - <translation>שמור תמונה...</translation> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>המזהה המתקבל ארוך מדי, נסה להפחית את הטקסט בתוית / הודעה.</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation>תמונות PNG (*.png)</translation> </message> + <message> + <location filename="../qrcodedialog.cpp" line="121"/> + <source>Save Image...</source> + <translation>שמור תמונה...</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -1045,9 +1067,9 @@ Address: %4 <translation>שלח למספר מקבלים בו-זמנית</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="67"/> - <source>&Add recipient...</source> - <translation>&הוסף מקבל...</translation> + <location filename="../forms/sendcoinsdialog.ui" line="87"/> + <source>Clear all</source> + <translation>נקה הכל</translation> </message> <message> <location filename="../forms/sendcoinsdialog.ui" line="84"/> @@ -1055,9 +1077,9 @@ Address: %4 <translation>הסר את כל השדות בפעולה</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="87"/> - <source>Clear all</source> - <translation>נקה הכל</translation> + <location filename="../forms/sendcoinsdialog.ui" line="67"/> + <source>&Add recipient...</source> + <translation>&הוסף מקבל...</translation> </message> <message> <location filename="../forms/sendcoinsdialog.ui" line="106"/> @@ -1100,26 +1122,31 @@ Address: %4 <translation> ו- </translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="124"/> - <source>The recipient address is not valid, please recheck.</source> - <translation>כתובת המקבל אינה תקינה, אנא בדוק שנית.</translation> - </message> - <message> <location filename="../sendcoinsdialog.cpp" line="129"/> <source>The amount to pay must be larger than 0.</source> <translation>הכמות לשלם חייבת להיות גדולה מ-0.</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="134"/> - <source>The amount exceeds your balance.</source> - <translation>הכמות עולה על המאזן שלך.</translation> - </message> - <message> <location filename="../sendcoinsdialog.cpp" line="139"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation>הכמות הכוללת, ובכללה עמלת פעולה בסך %1, עולה על המאזן שלך.</translation> </message> <message> + <location filename="../sendcoinsdialog.cpp" line="145"/> + <source>Duplicate address found, can only send to each address once per send operation.</source> + <translation>כתובת כפולה נמצאה, ניתן לשלוח לכל כתובת רק פעם אחת בכל פעולת שליחה.</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="124"/> + <source>The recipient address is not valid, please recheck.</source> + <translation>כתובת המקבל אינה תקינה, אנא בדוק שנית.</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="134"/> + <source>The amount exceeds your balance.</source> + <translation>הכמות עולה על המאזן שלך.</translation> + </message> + <message> <location filename="../sendcoinsdialog.cpp" line="150"/> <source>Error: Transaction creation failed.</source> <translation>שגיאה: יצירת הפעולה נכשלה.</translation> @@ -1129,11 +1156,6 @@ Address: %4 <source>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.</source> <translation>שגיאה: הפעולה נדחתה. זה עשוי לקרות עם חלק מהמטבעות בארנק שלך כבר נוצלו, למשל אם השתמשת בעותק של wallet.dat ומטבעות נוצלו בעותק אך לא סומנו כמנוצלות כאן.</translation> </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="145"/> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>כתובת כפולה נמצאה, ניתן לשלוח לכל כתובת רק פעם אחת בכל פעולת שליחה.</translation> - </message> </context> <context> <name>SendCoinsEntry</name> @@ -1202,140 +1224,140 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="92"/> <source>unknown</source> <translation>לא ידוע</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="18"/> - <source>Open for %1 blocks</source> - <translation>פתוח למשך %1 בלוקים</translation> + <location filename="../transactiondesc.cpp" line="30"/> + <source>%1/unconfirmed</source> + <translation>%1/ממתין לאישור</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> + <location filename="../transactiondesc.cpp" line="32"/> + <source>%1 confirmations</source> + <translation>%1 אישורים</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="22"/> <source>Open until %1</source> <translation>פתוח עד %1</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> - <source>%1/offline?</source> - <translation>%1/לא מחובר?</translation> + <location filename="../transactiondesc.cpp" line="20"/> + <source>Open for %1 blocks</source> + <translation>פתוח למשך %1 בלוקים</translation> </message> <message> <location filename="../transactiondesc.cpp" line="28"/> - <source>%1/unconfirmed</source> - <translation>%1/ממתין לאישור</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="30"/> - <source>%1 confirmations</source> - <translation>%1 אישורים</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="47"/> - <source><b>Status:</b> </source> - <translation><b>מצב:</b> </translation> + <source>%1/offline?</source> + <translation>%1/לא מחובר?</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>, שודר דרך צומת %1</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>, שודר דרך %1 צמתים</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation><b>תאריך:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>מקור:</b> נוצר<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>מאת:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation><b>אל:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation> (שלך, תוית: </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation>(שלך)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation><b>זיכוי:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> - <source>(%1 matures in %2 more blocks)</source> - <translation>(%1 יבגור עוד %2 בלוקים)</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="136"/> - <source>(not accepted)</source> - <translation>(לא התקבל)</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation><b<חיוב:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation><b>עמלת פעולה:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>כמות נטו:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>הודעה:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>הערה:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation>מזהה פעולה:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation>מטבעות שנוצרו חייבים לחכות 120 בלוקים לפני שניתן לנצל אותם. כשיצרת את הבלוק הזה, הוא שודר לרשת כדי להתווסף לשרשרת הבלוקים. אם הוא אינו מצליח להיכנס לשרשרת, הוא ישתנה ל"לא התקבל" ולא ניתן יהיה לנצל אותו. זה יכול לקרות מדי פעם אם צומת אחר מייצר בלוק בהפרש של מספר שניות מהבלוק שלך.</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="135"/> + <source>(%1 matures in %2 more blocks)</source> + <translation>(%1 יבגור עוד %2 בלוקים)</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="50"/> + <source><b>Status:</b> </source> + <translation><b>מצב:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="139"/> + <source>(not accepted)</source> + <translation>(לא התקבל)</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation>, טרם שודר בהצלחה</translation> </message> @@ -1356,39 +1378,40 @@ Address: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="349"/> - <source>Received with</source> - <translation>התקבל עם</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="354"/> - <source>Sent to</source> - <translation>נשלח ל</translation> + <location filename="../transactiontablemodel.cpp" line="283"/> + <source>Offline (%1 confirmations)</source> + <translation>לא מחובר (%1 אישורים)</translation> </message> - <message> - <location filename="../transactiontablemodel.cpp" line="356"/> - <source>Payment to yourself</source> - <translation>תשלום לעצמך</translation> + <message numerus="yes"> + <location filename="../transactiontablemodel.cpp" line="277"/> + <source>Open for %n block(s)</source> + <translation> + <numerusform>פתוח למשך בלוק אחד</numerusform> + <numerusform>פתוח למשך %n בלוקים</numerusform> + </translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="358"/> - <source>Mined</source> - <translation>נכרה</translation> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Address</source> + <translation>כתובת</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="396"/> - <source>(n/a)</source> - <translation>(n/a)</translation> + <location filename="../transactiontablemodel.cpp" line="286"/> + <source>Unconfirmed (%1 of %2 confirmations)</source> + <translation>ממתין לאישור (%1 מתוך %2 אישורים)</translation> </message> - <message> - <location filename="../transactiontablemodel.cpp" line="595"/> - <source>Transaction status. Hover over this field to show number of confirmations.</source> - <translation>מצב הפעולה. השהה את הסמן מעל שדה זה כדי לראות את מספר האישורים.</translation> + <message numerus="yes"> + <location filename="../transactiontablemodel.cpp" line="297"/> + <source>Mined balance will be available in %n more blocks</source> + <translation> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="601"/> - <source>Destination address of transaction.</source> - <translation>כתובת היעד של הפעולה.</translation> + <location filename="../transactiontablemodel.cpp" line="303"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>הבלוק הזה לא נקלט על ידי אף צומת אחר, וכנראה לא יתקבל!</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="280"/> @@ -1401,67 +1424,56 @@ Address: %4 <translation>מאושר (%1 אישורים)</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="283"/> - <source>Offline (%1 confirmations)</source> - <translation>לא מחובר (%1 אישורים)</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Date</source> - <translation>תאריך</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="214"/> <source>Type</source> <translation>סוג</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Address</source> - <translation>כתובת</translation> + <source>Date</source> + <translation>תאריך</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="214"/> <source>Amount</source> <translation>כמות</translation> </message> - <message numerus="yes"> - <location filename="../transactiontablemodel.cpp" line="277"/> - <source>Open for %n block(s)</source> - <translation> - <numerusform></numerusform> - <numerusform></numerusform> - </translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="286"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>ממתין לאישור (%1 מתוך %2 אישורים)</translation> - </message> - <message numerus="yes"> - <location filename="../transactiontablemodel.cpp" line="297"/> - <source>Mined balance will be available in %n more blocks</source> - <translation> - <numerusform></numerusform> - <numerusform></numerusform> - </translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="303"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>הבלוק הזה לא נקלט על ידי אף צומת אחר, וכנראה לא יתקבל!</translation> - </message> <message> <location filename="../transactiontablemodel.cpp" line="306"/> <source>Generated but not accepted</source> <translation>נוצר אך לא התקבל</translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="349"/> + <source>Received with</source> + <translation>התקבל עם</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="351"/> <source>Received from</source> <translation>התקבל מאת</translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="354"/> + <source>Sent to</source> + <translation>נשלח ל</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="356"/> + <source>Payment to yourself</source> + <translation>תשלום לעצמך</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="358"/> + <source>Mined</source> + <translation>נכרה</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="396"/> + <source>(n/a)</source> + <translation>(n/a)</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="597"/> <source>Date and time that the transaction was received.</source> <translation>התאריך והשעה בה הפעולה הזאת התקבלה.</translation> @@ -1472,6 +1484,16 @@ Address: %4 <translation>סוג הפעולה.</translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="595"/> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>מצב הפעולה. השהה את הסמן מעל שדה זה כדי לראות את מספר האישורים.</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="601"/> + <source>Destination address of transaction.</source> + <translation>כתובת היעד של הפעולה.</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="603"/> <source>Amount removed from or added to balance.</source> <translation>הכמות שהתווספה או הוסרה מהיתרה.</translation> @@ -1480,9 +1502,54 @@ Address: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="127"/> - <source>Edit label</source> - <translation>ערוך תוית</translation> + <location filename="../transactionview.cpp" line="57"/> + <source>This week</source> + <translation>השבוע</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="58"/> + <source>This month</source> + <translation>החודש</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="61"/> + <source>Range...</source> + <translation>טווח...</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="124"/> + <source>Copy address</source> + <translation>העתק כתובת</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="125"/> + <source>Copy label</source> + <translation>העתק תוית</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="126"/> + <source>Copy amount</source> + <translation>העתק כמות</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="280"/> + <source>Date</source> + <translation>תאריך</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="279"/> + <source>Confirmed</source> + <translation>מאושר</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="283"/> + <source>Address</source> + <translation>כתובת</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="60"/> + <source>This year</source> + <translation>השנה</translation> </message> <message> <location filename="../transactionview.cpp" line="289"/> @@ -1505,31 +1572,11 @@ Address: %4 <translation>סוג</translation> </message> <message> - <location filename="../transactionview.cpp" line="74"/> - <source>Sent to</source> - <translation>נשלח ל</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="77"/> - <source>Mined</source> - <translation>נכרה</translation> - </message> - <message> <location filename="../transactionview.cpp" line="59"/> <source>Last month</source> <translation>החודש שעבר</translation> </message> <message> - <location filename="../transactionview.cpp" line="60"/> - <source>This year</source> - <translation>השנה</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="72"/> - <source>Received with</source> - <translation>התקבל עם</translation> - </message> - <message> <location filename="../transactionview.cpp" line="76"/> <source>To yourself</source> <translation>לעצמך</translation> @@ -1551,19 +1598,19 @@ Address: %4 <translation>היום</translation> </message> <message> - <location filename="../transactionview.cpp" line="57"/> - <source>This week</source> - <translation>השבוע</translation> + <location filename="../transactionview.cpp" line="72"/> + <source>Received with</source> + <translation>התקבל עם</translation> </message> <message> - <location filename="../transactionview.cpp" line="58"/> - <source>This month</source> - <translation>החודש</translation> + <location filename="../transactionview.cpp" line="74"/> + <source>Sent to</source> + <translation>נשלח ל</translation> </message> <message> - <location filename="../transactionview.cpp" line="61"/> - <source>Range...</source> - <translation>טווח...</translation> + <location filename="../transactionview.cpp" line="77"/> + <source>Mined</source> + <translation>נכרה</translation> </message> <message> <location filename="../transactionview.cpp" line="84"/> @@ -1576,34 +1623,19 @@ Address: %4 <translation>כמות מזערית</translation> </message> <message> - <location filename="../transactionview.cpp" line="124"/> - <source>Copy address</source> - <translation>העתק כתובת</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="125"/> - <source>Copy label</source> - <translation>העתק תוית</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="126"/> - <source>Copy amount</source> - <translation>העתק כמות</translation> - </message> - <message> <location filename="../transactionview.cpp" line="128"/> <source>Show details...</source> <translation>הצג פרטים...</translation> </message> <message> - <location filename="../transactionview.cpp" line="280"/> - <source>Date</source> - <translation>תאריך</translation> + <location filename="../transactionview.cpp" line="127"/> + <source>Edit label</source> + <translation>ערוך תוית</translation> </message> <message> - <location filename="../transactionview.cpp" line="279"/> - <source>Confirmed</source> - <translation>מאושר</translation> + <location filename="../transactionview.cpp" line="392"/> + <source>to</source> + <translation>אל</translation> </message> <message> <location filename="../transactionview.cpp" line="282"/> @@ -1611,11 +1643,6 @@ Address: %4 <translation>תוית</translation> </message> <message> - <location filename="../transactionview.cpp" line="283"/> - <source>Address</source> - <translation>כתובת</translation> - </message> - <message> <location filename="../transactionview.cpp" line="284"/> <source>Amount</source> <translation>כמות</translation> @@ -1635,16 +1662,11 @@ Address: %4 <source>Range:</source> <translation>טווח:</translation> </message> - <message> - <location filename="../transactionview.cpp" line="392"/> - <source>to</source> - <translation>אל</translation> - </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>שולח...</translation> </message> @@ -1652,400 +1674,492 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> + <location filename="../bitcoinstrings.cpp" line="41"/> <source>Bitcoin version</source> <translation>גרסת ביטקוין</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Add a node to connect to and attempt to keep the connection open</source> - <translation>הוסף צומת להתחברות ונסה לשמור את החיבור פתוח</translation> + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>שלח פקודות לצומת ב-<ip> (ברירת מחדל: 127.0.0.1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>ציין הגבלת זמן לחיבור (במילישניות)</translation> + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation>סרוק מחדש את שרשרת הבלוקים למציאת פעולות חסרות בארנק</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Password for JSON-RPC connections</source> - <translation>סיסמה לחיבורי JSON-RPC</translation> + <location filename="../bitcoinstrings.cpp" line="101"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>השתמש ב-OpenSSL (https( עבור חיבורי JSON-RPC</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation>האזן לחיבורי JSON-RPC ב<פורט> (ברירת מחדל: 8332)</translation> + <location filename="../bitcoinstrings.cpp" line="78"/> + <source>Accept command line and JSON-RPC commands</source> + <translation>קבל פקודות משורת הפקודה ו- JSON-RPC</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> - <source>How thorough the block verification is (0-6, default: 1)</source> - <translation>מידת היסודיות של אימות הבלוקים (0-6, ברירת מחדל: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>Username for JSON-RPC connections</source> + <translation>שם משתמש לחיבורי JSON-RPC</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>שלח פקודות לצומת ב-<ip> (ברירת מחדל: 127.0.0.1)</translation> + <location filename="../bitcoinstrings.cpp" line="77"/> + <source>Fee per KB to add to transactions you send</source> + <translation>עמלה להוסיף לפעולות שאתה שולח עבור כל KB</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation>קבע את גודל המאגר ל -<n> (ברירת מחדל: 100)</translation> + <location filename="../bitcoinstrings.cpp" line="115"/> + <source>Loading block index...</source> + <translation>טוען את אינדקס הבלוקים...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> - <source>Rescan the block chain for missing wallet transactions</source> - <translation>סרוק מחדש את שרשרת הבלוקים למציאת פעולות חסרות בארנק</translation> + <location filename="../bitcoinstrings.cpp" line="113"/> + <source>Loading addresses...</source> + <translation>טוען כתובות...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> - <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>השתמש ב-OpenSSL (https( עבור חיבורי JSON-RPC</translation> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source>Rescanning...</source> + <translation>סורק מחדש...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> - <source>Loading addresses...</source> - <translation>טוען כתובות...</translation> + <location filename="../bitcoinstrings.cpp" line="120"/> + <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> + <translation>יש לכתוב מחדש את הארנק: אתחל את ביטקוין לסיום</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Threshold for disconnecting misbehaving peers (default: 100)</source> - <translation>סף להתנתקות מעמיתים הנוהגים שלא כהלכה (ברירת מחדל: 100)</translation> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Upgrade wallet to latest format</source> + <translation>שדרג את הארנק לפורמט העדכני</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation>מספר שניות למנוע מעמיתים הנוהגים שלא כהלכה מלהתחבר מחדש (ברירת מחדל: 86400)</translation> + <location filename="../bitcoinstrings.cpp" line="49"/> + <source>Generate coins</source> + <translation>צור מטבעות</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> - <source>Accept command line and JSON-RPC commands</source> - <translation>קבל פקודות משורת הפקודה ו- JSON-RPC</translation> + <location filename="../bitcoinstrings.cpp" line="50"/> + <source>Don't generate coins</source> + <translation>אל תייצר מטבעות</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> - <source>Run in the background as a daemon and accept commands</source> - <translation>רוץ ברקע כדימון וקבל פקודות</translation> + <location filename="../bitcoinstrings.cpp" line="84"/> + <source>Send trace/debug info to debugger</source> + <translation>שלח מידע דיבאג ועקבה לכלי דיבאג</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source>How many blocks to check at startup (default: 2500, 0 = all)</source> + <translation>מספר הבלוקים לבדוק בעת ההפעלה (ברירת מחדל: 2500, 0=כולם)</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="44"/> - <source>Use the test network</source> - <translation>השתמש ברשת הבדיקה</translation> + <source>List commands</source> + <translation>רשימת פקודות</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>שלח מידע דיבאג ועקבה לקונסולה במקום לקובץ debug.log</translation> + <location filename="../bitcoinstrings.cpp" line="103"/> + <source>Server private key (default: server.pem)</source> + <translation>מפתח פרטי של השרת (ברירת מחדל: server.pem)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> - <source>Username for JSON-RPC connections</source> - <translation>שם משתמש לחיבורי JSON-RPC</translation> + <location filename="../bitcoinstrings.cpp" line="59"/> + <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> + <translation>האזן לחיבורים ב<פורט> (ברירת מחדל: 8333 או ברשת הבדיקה: 18333)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Allow JSON-RPC connections from specified IP address</source> - <translation>אפשר חיבורי JSON-RPC מכתובת האינטרנט המצוינת</translation> + <location filename="../bitcoinstrings.cpp" line="60"/> + <source>Maintain at most <n> connections to peers (default: 125)</source> + <translation>החזק לכל היותר <n> חיבורים לעמיתים (ברירת מחדל: 125)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> - <source>Fee per KB to add to transactions you send</source> - <translation>עמלה להוסיף לפעולות שאתה שולח עבור כל KB</translation> + <location filename="../bitcoinstrings.cpp" line="123"/> + <source>Cannot initialize keypool</source> + <translation>לא יכול לאתחל את מאגר המפתחות</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Find peers using internet relay chat (default: 0)</source> - <translation>מצא עמיתים תוך שימוש ב-IRC (ברירת מחדל: 0)</translation> + <location filename="../bitcoinstrings.cpp" line="54"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation>קבע את גודל המטמון של מסד הנתונים במגהבייט (ברירת מחדל: 25)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> - <source>Loading block index...</source> - <translation>טוען את אינדקס הבלוקים...</translation> + <location filename="../bitcoinstrings.cpp" line="42"/> + <source>Usage:</source> + <translation>שימוש:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> - <source>Done loading</source> - <translation>טעינה הושלמה</translation> + <location filename="../bitcoinstrings.cpp" line="67"/> + <source>Threshold for disconnecting misbehaving peers (default: 100)</source> + <translation>סף להתנתקות מעמיתים הנוהגים שלא כהלכה (ברירת מחדל: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation>שגיאה בטעינת הקובץ wallet.dat: הארנק דורש גרסה חדשה יותר של ביטקוין</translation> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation>עליך לקבוע rpcpassword=yourpassword בקובץ ההגדרות: +%s +אם הקובץ אינו קיים, צור אותו עם הרשאות קריאה לבעלים בלבד.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> - <source>Error loading wallet.dat</source> - <translation>שגיאה בטעינת הקובץ wallet.dat</translation> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation>שגיאה</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>בצע פקודה זו כשהבלוק הטוב ביותר משתנה (%s בפקודה יוחלף בגיבוב הבלוק)</translation> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>אין מספיק כספים</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> - <source>Error loading blkindex.dat</source> - <translation>שגיאה בטעינת הקובץ blkindex.dat</translation> + <location filename="../bitcoinstrings.cpp" line="88"/> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation>אפשר חיבורי JSON-RPC מכתובת האינטרנט המצוינת</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>ציין קובץ pid (ברירת מחדל: bitcoind.pid)</translation> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation>להשתמש באפשרות %s</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> - <source>Cannot downgrade wallet</source> - <translation>לא יכול להוריד דרגת הארנק</translation> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation>%s, עליך לקבוע את rpcpassword בקובץ ההגדרות: +%s +מומלץ להשתמש בסיסמה האקראית הבאה: +rpcuser=bitcoinrpc +rpcpassword=%s +(אין צורך לזכור סיסמה זו) +אם הקובץ אינו קיים, צור אותו עם הרשאות קריאה לבעלים בלבד.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Use Universal Plug and Play to map the listening port (default: 1)</source> - <translation type="unfinished">השתמש ב-UPnP כדי למפות את הפורט להאזנה (ברירת מחדל: 1 בעת האזנה)</translation> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation>קבע את גודל יומן פעילות מסד הנתונים במגהבייט (ברירת מחדל: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Use Universal Plug and Play to map the listening port (default: 0)</source> - <translation type="unfinished">השתמש ב-UPnP כדי למפות את הפורט להאזנה (ברירת מחדל: 0)</translation> + <location filename="../bitcoinstrings.cpp" line="86"/> + <source>Password for JSON-RPC connections</source> + <translation>סיסמה לחיבורי JSON-RPC</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> - <source>Loading wallet...</source> - <translation>טוען ארנק...</translation> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>How thorough the block verification is (0-6, default: 1)</source> + <translation>מידת היסודיות של אימות הבלוקים (0-6, ברירת מחדל: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> - <source>This help message</source> - <translation>הודעת העזרה הזו</translation> + <location filename="../bitcoinstrings.cpp" line="90"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation>בצע פקודה זו כשהבלוק הטוב ביותר משתנה (%s בפקודה יוחלף בגיבוב הבלוק)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> - <source>Rescanning...</source> - <translation>סורק מחדש...</translation> + <location filename="../bitcoinstrings.cpp" line="61"/> + <source>Add a node to connect to and attempt to keep the connection open</source> + <translation>הוסף צומת להתחברות ונסה לשמור את החיבור פתוח</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> - <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation>יש לכתוב מחדש את הארנק: אתחל את ביטקוין לסיום</translation> + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>קבע את גודל המאגר ל -<n> (ברירת מחדל: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> - <source>Upgrade wallet to latest format</source> - <translation>שדרג את הארנק לפורמט העדכני</translation> + <location filename="../bitcoinstrings.cpp" line="63"/> + <source>Find peers using internet relay chat (default: 0)</source> + <translation>מצא עמיתים תוך שימוש ב-IRC (ברירת מחדל: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> - <source>Error loading wallet.dat: Wallet corrupted</source> - <translation>שגיאה בטעינת הקובץ wallet.dat: הארנק מושחת</translation> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>Done loading</source> + <translation>טעינה הושלמה</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Send command to -server or bitcoind</source> - <translation>שלח פקודה ל -server או bitcoind</translation> + <location filename="../bitcoinstrings.cpp" line="119"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> + <translation>שגיאה בטעינת הקובץ wallet.dat: הארנק דורש גרסה חדשה יותר של ביטקוין</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify configuration file (default: bitcoin.conf)</source> - <translation>ציין קובץ הגדרות (ברירת מחדל: bitcoin.conf)</translation> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>Error loading wallet.dat</source> + <translation>שגיאה בטעינת הקובץ wallet.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Generate coins</source> - <translation>צור מטבעות</translation> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Error loading blkindex.dat</source> + <translation>שגיאה בטעינת הקובץ blkindex.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Don't generate coins</source> - <translation>אל תייצר מטבעות</translation> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>ציין קובץ pid (ברירת מחדל: bitcoind.pid)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Start minimized</source> - <translation>התחל ממוזער</translation> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation>שימוש</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Specify data directory</source> - <translation>ציין תיקיית נתונים</translation> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>ביטקוין</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Connect through socks4 proxy</source> - <translation>התחבר דרך פרוקסי socks4</translation> + <location filename="../bitcoinstrings.cpp" line="122"/> + <source>Cannot downgrade wallet</source> + <translation>לא יכול להוריד דרגת הארנק</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Allow DNS lookups for addnode and connect</source> - <translation>אפשר עיון ב-DNS להוספת צומת וחיבור</translation> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Loading wallet...</source> + <translation>טוען ארנק...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Connect only to the specified node</source> - <translation>התחבר רק לצומת המצוין</translation> + <location filename="../bitcoinstrings.cpp" line="74"/> + <source>Use Universal Plug and Play to map the listening port (default: 0)</source> + <translation type="unfinished">השתמש ב-UPnP כדי למפות את הפורט להאזנה (ברירת מחדל: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>קבע שפה, למשל "he_il" (ברירת מחדל: שפת המערכת)</translation> + <location filename="../bitcoinstrings.cpp" line="118"/> + <source>Error loading wallet.dat: Wallet corrupted</source> + <translation>שגיאה בטעינת הקובץ wallet.dat: הארנק מושחת</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Find peers using DNS lookup (default: 1)</source> - <translation type="unfinished">מצא עמיתים ע"י חיפוש DNS (ברירת מחדל: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="47"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation>ציין קובץ הגדרות (ברירת מחדל: bitcoin.conf)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> - <translation>חוצץ מירבי לקבלה לכל חיבור, <n>*1000 בתים (ברירת מחדל: 10000)</translation> + <location filename="../bitcoinstrings.cpp" line="62"/> + <source>Connect only to the specified node</source> + <translation>התחבר רק לצומת המצוין</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> - <translation>חוצץ מירבי לשליחה לכל חיבור, <n>*1000 בתים (ברירת מחדל: 10000)</translation> + <location filename="../bitcoinstrings.cpp" line="71"/> + <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> + <translation>חוצץ מירבי לקבלה לכל חיבור, <n>*1000 בתים (ברירת מחדל: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> + <location filename="../bitcoinstrings.cpp" line="52"/> <source>Show splash screen on startup (default: 1)</source> <translation>הצג מסך פתיחה בעת הפעלה (ברירת מחדל: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> + <location filename="../bitcoinstrings.cpp" line="81"/> <source>Output extra debugging information</source> <translation>פלוט מידע דיבאג נוסף </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>אפשרויות SSL: (ראה את הויקי של ביטקוין עבור הוראות להתקנת SSL)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> + <location filename="../bitcoinstrings.cpp" line="114"/> <source>Error loading addr.dat</source> <translation>שגיאה בטעינת הקובץ addr.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation type="unfinished">קבל חיבורים מבחוץ (ברירת מחדל: 1 ללא -proxy או -connect)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="46"/> + <source>Options:</source> + <translation>אפשרויות:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="66"/> + <source>Find peers using DNS lookup (default: 1)</source> + <translation type="unfinished">מצא עמיתים ע"י חיפוש DNS (ברירת מחדל: 1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="73"/> + <source>Use Universal Plug and Play to map the listening port (default: 1)</source> + <translation type="unfinished">השתמש ב-UPnP כדי למפות את הפורט להאזנה (ברירת מחדל: 1 בעת האזנה)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation>כתובת פרוקסי לא תקינה</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> + <location filename="../bitcoinstrings.cpp" line="128"/> <source>Invalid amount for -paytxfee=<amount></source> <translation>כמות לא תקינה בפרמטר -paytxfee=<amount></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> + <location filename="../bitcoinstrings.cpp" line="129"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation>אזהרה: ערך גבוה מדי הושם בפרמטר -paytxfee. זו העמלה שתשלם אם אתה שולח פעולה.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation>שגיאה: כישלון ב- CreateThread(StartNode)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> + <location filename="../bitcoinstrings.cpp" line="133"/> <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> <translation>לא מסוגל להיקשר לפורט %d במחשב הזה. כנראה שביטקוין כבר רץ.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> + <location filename="../bitcoinstrings.cpp" line="38"/> <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> <translation>אזהרה: אנא בדוק שהתאריך והשעה של המחשב הזה נכונים. אם השעון שלך שגוי ביטקוין לא יפעל כהלכה.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> + <location filename="../bitcoinstrings.cpp" line="20"/> <source>Warning: Disk space is low</source> <translation type="unfinished">אזהרה: מעט מקום בדיסק</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> - <source>Prepend debug output with timestamp</source> - <translation>הוסף חותמת זמן לפני פלט דיבאג</translation> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>שולח...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Send trace/debug info to debugger</source> - <translation>שלח מידע דיבאג ועקבה לכלי דיבאג</translation> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>כמות לא תקינה</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="124"/> + <source>Cannot write default address</source> + <translation>לא יכול לכתוב את כתובת ברירת המחדל</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="43"/> + <source>Send command to -server or bitcoind</source> + <translation>שלח פקודה ל -server או bitcoind</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Get help for a command</source> - <translation>קבל עזרה עבור פקודה</translation> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">שגיאה: יצירת הפעולה נכשלה.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> - <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation>מספר הבלוקים לבדוק בעת ההפעלה (ברירת מחדל: 2500, 0=כולם)</translation> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">שגיאה: הפעולה נדחתה. זה עשוי לקרות עם חלק מהמטבעות בארנק שלך כבר נוצלו, למשל אם השתמשת בעותק של wallet.dat ומטבעות נוצלו בעותק אך לא סומנו כמנוצלות כאן.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> - <source>List commands</source> - <translation>רשימת פקודות</translation> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation>שגיאה אירעה במהלך קביעת פורט RPC %u להאזנה: %s</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> + <location filename="../bitcoinstrings.cpp" line="51"/> + <source>Start minimized</source> + <translation>התחל ממוזער</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Specify connection timeout (in milliseconds)</source> + <translation>ציין הגבלת זמן לחיבור (במילישניות)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="57"/> + <source>Connect through socks4 proxy</source> + <translation>התחבר דרך פרוקסי socks4</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="58"/> + <source>Allow DNS lookups for addnode and connect</source> + <translation>אפשר עיון ב-DNS להוספת צומת וחיבור</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="65"/> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>קבע שפה, למשל "he_il" (ברירת מחדל: שפת המערכת)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="68"/> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> + <translation>מספר שניות למנוע מעמיתים הנוהגים שלא כהלכה מלהתחבר מחדש (ברירת מחדל: 86400)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="72"/> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> + <translation>חוצץ מירבי לשליחה לכל חיבור, <n>*1000 בתים (ברירת מחדל: 10000)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation>נתק מסדי נתונים של בלוקים וכתובות. מגדיל את זמן הסגירה (ברירת מחדל: 0)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="102"/> <source>Server certificate file (default: server.cert)</source> <translation>קובץ תעודת שרת (ברירת מחדל: server.cert)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> - <source>Server private key (default: server.pem)</source> - <translation>מפתח פרטי של השרת (ברירת מחדל: server.pem)</translation> + <location filename="../bitcoinstrings.cpp" line="79"/> + <source>Run in the background as a daemon and accept commands</source> + <translation>רוץ ברקע כדימון וקבל פקודות</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation>האזן לחיבורים ב<פורט> (ברירת מחדל: 8333 או ברשת הבדיקה: 18333)</translation> + <location filename="../bitcoinstrings.cpp" line="80"/> + <source>Use the test network</source> + <translation>השתמש ברשת הבדיקה</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>צפנים קבילים (ברירת מחדל: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Prepend debug output with timestamp</source> + <translation>הוסף חותמת זמן לפני פלט דיבאג</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Maintain at most <n> connections to peers (default: 125)</source> - <translation>החזק לכל היותר <n> חיבורים לעמיתים (ברירת מחדל: 125)</translation> + <location filename="../bitcoinstrings.cpp" line="83"/> + <source>Send trace/debug info to console instead of debug.log file</source> + <translation>שלח מידע דיבאג ועקבה לקונסולה במקום לקובץ debug.log</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Options:</source> - <translation>אפשרויות:</translation> + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>האזן לחיבורי JSON-RPC ב<פורט> (ברירת מחדל: 8332)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> - <source>Cannot initialize keypool</source> - <translation>לא יכול לאתחל את מאגר המפתחות</translation> + <location filename="../bitcoinstrings.cpp" line="107"/> + <source>This help message</source> + <translation>הודעת העזרה הזו</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> - <source>Cannot write default address</source> - <translation>לא יכול לכתוב את כתובת ברירת המחדל</translation> + <location filename="../bitcoinstrings.cpp" line="45"/> + <source>Get help for a command</source> + <translation>קבל עזרה עבור פקודה</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>קבע את גודל המטמון של מסד הנתונים במגהבייט (ברירת מחדל: 25)</translation> + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Specify data directory</source> + <translation>ציין תיקיית נתונים</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Usage:</source> - <translation>שימוש:</translation> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>צפנים קבילים (ברירת מחדל: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>בטא</translation> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>אינו מסוגל לנעול את תיקיית הנתונים %s. כנראה שביטקוין כבר רץ.</translation> </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts index c4a78a4d34..c68f8e0579 100644 --- a/src/qt/locale/bitcoin_hr.ts +++ b/src/qt/locale/bitcoin_hr.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> verzija</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -89,42 +89,42 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Brisanje</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>Kopirati adresu</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation>Kopirati oznaku</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation>Izmjeniti</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>Brisanje</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation>Izvoz podataka adresara</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation>Datoteka vrijednosti odvojenih zarezom (*. csv)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>Pogreška kod izvoza</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation>Ne mogu pisati u datoteku %1.</translation> </message> @@ -293,102 +293,159 @@ Jeste li sigurni da želite šifrirati svoj novčanik?</translation> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="253"/> + <location filename="../bitcoingui.cpp" line="251"/> <source>Export the data in the current tab to a file</source> <translation>Izvoz podataka iz trenutnog taba u datoteku</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> + <location filename="../bitcoingui.cpp" line="235"/> <source>E&xit</source> <translation>&Izlaz</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> + <location filename="../bitcoingui.cpp" line="236"/> <source>Quit application</source> <translation>Izlazak iz programa</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="255"/> + <location filename="../bitcoingui.cpp" line="253"/> <source>Encrypt or decrypt wallet</source> <translation>Šifriranje ili dešifriranje novčanika</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> + <location filename="../bitcoingui.cpp" line="240"/> <source>Show information about Bitcoin</source> <translation>Prikaži informacije o Bitcoinu</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>Otvori &Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="216"/> + <source>Prove you control an address</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation>&Šifriraj novčanik</translation> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>&Više o %1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> - <source>Backup wallet to another location</source> - <translation>Napravite sigurnosnu kopiju novčanika na drugoj lokaciji</translation> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>Promijeni postavke konfiguracije za bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>Preuzeto %1 od %2 blokova povijesti transakcije.</translation> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> - <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="255"/> + <source>&Backup Wallet</source> + <translation type="unfinished">&Backup novčanika</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> - <source>Sending...</source> - <translation>Slanje...</translation> + <location filename="../bitcoingui.cpp" line="258"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>Promijenite lozinku za šifriranje novčanika</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Backup Wallet</source> - <translation>Backup novčanika</translation> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Wallet Data (*.dat)</source> - <translation>Podaci novčanika (*.dat)</translation> + <location filename="../bitcoingui.cpp" line="531"/> + <source>Downloaded %1 blocks of transaction history.</source> + <translation>Preuzeto %1 blokova povijesti transakcije.</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="546"/> + <source>%n second(s) ago</source> + <translation> + <numerusform>prije %n sekunde</numerusform> + <numerusform>prije %n sekunde</numerusform> + <numerusform>prije %n sekundi</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="550"/> + <source>%n minute(s) ago</source> + <translation> + <numerusform>prije %n minute</numerusform> + <numerusform>prije %n minute</numerusform> + <numerusform>prije %n minuta</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="554"/> + <source>%n hour(s) ago</source> + <translation> + <numerusform>prije %n sata</numerusform> + <numerusform>prije %n sata</numerusform> + <numerusform>prije %n sati</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> - <source>Backup Failed</source> - <translation>Backup nije uspio</translation> + <location filename="../bitcoingui.cpp" line="632"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation>Došlo je do pogreške kod spremanja podataka novčanika na novu lokaciju.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> - <source>Up to date</source> - <translation>Ažurno</translation> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Wallet Data (*.dat)</source> + <translation>Podaci novčanika (*.dat)</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="824"/> + <source>Backup Failed</source> + <translation>Backup nije uspio</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>Ažuriranje...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation>Zadnji primljeni blok je generiran %1.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> + <location filename="../bitcoingui.cpp" line="663"/> <source>Sent transaction</source> <translation>Poslana transakcija</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="664"/> + <source>Incoming transaction</source> + <translation>Dolazna transakcija</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="798"/> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation>Novčanik je <b>šifriran</b> i trenutno <b>zaključan</b></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation type="unfinished">Prikaži Bitcoin prozor</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="252"/> + <source>&Encrypt Wallet</source> + <translation>&Šifriraj novčanik</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="256"/> + <source>Backup wallet to another location</source> + <translation>Napravite sigurnosnu kopiju novčanika na drugoj lokaciji</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -400,31 +457,46 @@ Tip:%3 Adresa:%4 </translation> </message> - <message> - <location filename="../bitcoingui.cpp" line="501"/> - <source>Downloaded %1 blocks of transaction history.</source> - <translation>Preuzeto %1 blokova povijesti transakcije.</translation> - </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> - <source>%n minute(s) ago</source> + <location filename="../bitcoingui.cpp" line="482"/> + <source>%n active connection(s) to Bitcoin network</source> <translation> - <numerusform>prije %n minute</numerusform> - <numerusform>prije %n minute</numerusform> - <numerusform>prije %n minuta</numerusform> + <numerusform>%n aktivna veza na Bitcoin mrežu</numerusform> + <numerusform>%n aktivne veze na Bitcoin mrežu</numerusform> + <numerusform>%n aktivnih veza na Bitcoin mrežu</numerusform> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> - <source>%n hour(s) ago</source> - <translation> - <numerusform>prije %n sata</numerusform> - <numerusform>prije %n sata</numerusform> - <numerusform>prije %n sati</numerusform> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> + <message> + <location filename="../bitcoingui.cpp" line="636"/> + <source>Sending...</source> + <translation>Slanje...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>Preuzeto %1 od %2 blokova povijesti transakcije (%3% done).</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Backup Wallet</source> + <translation>Backup novčanika</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="564"/> + <source>Up to date</source> + <translation>Ažurno</translation> + </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>prije %n dana</numerusform> @@ -433,201 +505,137 @@ Adresa:%4 </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> - <source>&Transactions</source> - <translation>&Transakcije</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="73"/> - <source>Bitcoin Wallet</source> - <translation>Bitcoin novčanik</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="186"/> <source>Show general overview of wallet</source> <translation>Prikaži opći pregled novčanika</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="192"/> <source>Browse transaction history</source> <translation>Pretraži povijest transakcija</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> + <location filename="../bitcoingui.cpp" line="197"/> <source>&Address Book</source> <translation>&Adresar</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> + <location filename="../bitcoingui.cpp" line="198"/> <source>Edit the list of stored addresses and labels</source> <translation>Uređivanje popisa pohranjenih adresa i oznaka</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation>Prikaži popis adresa za primanje isplate</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> - <source>&Send coins</source> - <translation>&Slanje novca</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="217"/> - <source>Sign &message</source> - <translation type="unfinished">&Potpišite poruku</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="218"/> - <source>Prove you control an address</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>&Više o %1</translation> + <location filename="../bitcoingui.cpp" line="71"/> + <source>Bitcoin Wallet</source> + <translation>Bitcoin novčanik</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> + <location filename="../bitcoingui.cpp" line="243"/> <source>Show information about Qt</source> <translation>Prikaži informacije o Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> + <location filename="../bitcoingui.cpp" line="245"/> <source>&Options...</source> <translation>&Postavke</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>Promijeni postavke konfiguracije za bitcoin</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Sinkronizacija lanca blokova u tijeku</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="212"/> - <source>Send coins to a bitcoin address</source> - <translation>Slanje novca na bitcoin adresu</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="647"/> - <source>Incoming transaction</source> - <translation>Dolazna transakcija</translation> + <location filename="../bitcoingui.cpp" line="215"/> + <source>Sign &message</source> + <translation type="unfinished">&Potpišite poruku</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> + <location filename="../bitcoingui.cpp" line="281"/> <source>&File</source> <translation>&Datoteka</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Prikaži Bitcoin prozor</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="298"/> - <source>&Help</source> - <translation>&Pomoć</translation> + <location filename="../bitcoingui.cpp" line="790"/> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation>Novčanik je <b>šifriran</b> i trenutno <b>otključan</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> + <location filename="../bitcoingui.cpp" line="303"/> <source>Tabs toolbar</source> <translation>Traka kartica</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>&Promijena lozinke</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="260"/> - <source>Change the passphrase used for wallet encryption</source> - <translation>Promijenite lozinku za šifriranje novčanika</translation> - </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> - <source>%n active connection(s) to Bitcoin network</source> - <translation> - <numerusform>%n aktivna veza na Bitcoin mrežu</numerusform> - <numerusform>%n aktivne veze na Bitcoin mrežu</numerusform> - <numerusform>%n aktivnih veza na Bitcoin mrežu</numerusform> - </translation> - </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> - <source>%n second(s) ago</source> - <translation> - <numerusform>prije %n sekunde</numerusform> - <numerusform>prije %n sekunde</numerusform> - <numerusform>prije %n sekundi</numerusform> - </translation> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Send coins to a bitcoin address</source> + <translation>Slanje novca na bitcoin adresu</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> + <location filename="../bitcoingui.cpp" line="242"/> <source>About &Qt</source> <translation>Više o &Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> - <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation>Novčanik je <b>šifriran</b> i trenutno <b>otključan</b></translation> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation>&Promijena lozinke</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> - <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation>Novčanik je <b>šifriran</b> i trenutno <b>zaključan</b></translation> + <location filename="../bitcoingui.cpp" line="185"/> + <source>&Overview</source> + <translation>&Pregled</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> - <source>&Backup Wallet</source> - <translation type="unfinished">&Backup novčanika</translation> + <location filename="../bitcoingui.cpp" line="314"/> + <source>Actions toolbar</source> + <translation>Traka akcija</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> + <location filename="../bitcoingui.cpp" line="418"/> <source>bitcoin-qt</source> <translation>bitcoin-qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="187"/> - <source>&Overview</source> - <translation>&Pregled</translation> + <location filename="../bitcoingui.cpp" line="250"/> + <source>&Export...</source> + <translation>&Izvoz...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> + <location filename="../bitcoingui.cpp" line="506"/> <source>Synchronizing with network...</source> <translation>Usklađivanje s mrežom ...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> - <source>Actions toolbar</source> - <translation>Traka akcija</translation> + <location filename="../bitcoingui.cpp" line="191"/> + <source>&Transactions</source> + <translation>&Transakcije</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation>&Primanje novca</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> - <translation>&Izvoz...</translation> + <location filename="../bitcoingui.cpp" line="209"/> + <source>&Send coins</source> + <translation>&Slanje novca</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> + <location filename="../bitcoingui.cpp" line="290"/> <source>&Settings</source> <translation>&Konfiguracija</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="296"/> + <source>&Help</source> + <translation>&Pomoć</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -635,22 +643,22 @@ Adresa:%4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&Jedinica za prikazivanje iznosa:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>Izaberite željeni najmanji dio bitcoina koji će biti prikazan u sučelju i koji će se koristiti za plaćanje.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&Prikaži adrese u popisu transakcija</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished"></translation> </message> @@ -726,85 +734,95 @@ Adresa:%4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>&Pokreni Bitcoin kod pokretanja sustava</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Automatski pokreni Bitcoin kad se uključi računalo</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>&Minimiziraj u sistemsku traku umjesto u traku programa</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>Prikaži samo ikonu u sistemskoj traci nakon minimiziranja prozora</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> + <location filename="../optionsdialog.cpp" line="185"/> <source>Map port using &UPnP</source> <translation>Mapiraj port koristeći &UPnP</translation> </message> <message> <location filename="../optionsdialog.cpp" line="181"/> - <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> - <translation>Automatski otvori port Bitcoin klijenta na ruteru. To radi samo ako ruter podržava UPnP i ako je omogućen.</translation> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> + <translation>Minimizirati umjesto izaći iz aplikacije kada je prozor zatvoren. Kada je ova opcija omogućena, aplikacija će biti zatvorena tek nakon odabira Izlaz u izborniku.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="180"/> <source>M&inimize on close</source> <translation>M&inimiziraj kod zatvaranja</translation> </message> <message> <location filename="../optionsdialog.cpp" line="186"/> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimizirati umjesto izaći iz aplikacije kada je prozor zatvoren. Kada je ova opcija omogućena, aplikacija će biti zatvorena tek nakon odabira Izlaz u izborniku.</translation> + <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> + <translation>Automatski otvori port Bitcoin klijenta na ruteru. To radi samo ako ruter podržava UPnP i ako je omogućen.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>&Povezivanje putem SOCKS4 proxy-a:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Spojite se na Bitcon mrežu putem SOCKS4 proxy-a (npr. kod povezivanja kroz Tor)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>Proxy &IP:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>IP adresa proxy-a (npr. 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>&Port:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Port od proxy-a (npr. 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>Neobavezna naknada za transakciju po kB koja omogućuje da se vaša transakcija obavi brže. Većina transakcija ima 1 kB. Preporučena naknada je 0.01.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>Plati &naknadu za transakciju</translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessagePage</name> @@ -899,17 +917,17 @@ Adresa:%4 <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>Glavno</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>Prikaz</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>Postavke</translation> </message> @@ -932,11 +950,6 @@ Adresa:%4 <translation>Oblik</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="40"/> - <source>Balance:</source> - <translation>Stanje:</translation> - </message> - <message> <location filename="../forms/overviewpage.ui" line="61"/> <source>0</source> <translation>0</translation> @@ -957,6 +970,11 @@ Adresa:%4 <translation>Ukupni broj tansakcija u novčaniku</translation> </message> <message> + <location filename="../forms/overviewpage.ui" line="40"/> + <source>Balance:</source> + <translation>Stanje:</translation> + </message> + <message> <location filename="../forms/overviewpage.ui" line="88"/> <source>Wallet</source> <translation>Novčanik</translation> @@ -1010,17 +1028,22 @@ Adresa:%4 <translation>&Spremi kao...</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation>PNG slike (*.png)</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation type="unfinished"></translation> </message> @@ -1138,6 +1161,11 @@ Adresa:%4 <context> <name>SendCoinsEntry</name> <message> + <location filename="../sendcoinsentry.cpp" line="25"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Unesite Bitcoin adresu (npr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> <location filename="../forms/sendcoinsentry.ui" line="14"/> <source>Form</source> <translation>Oblik</translation> @@ -1193,149 +1221,144 @@ Adresa:%4 <source>Remove this recipient</source> <translation>Ukloni ovog primatelja</translation> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="25"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Unesite Bitcoin adresu (npr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="18"/> - <source>Open for %1 blocks</source> - <translation>Otvori za %1 blokova</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="20"/> + <location filename="../transactiondesc.cpp" line="22"/> <source>Open until %1</source> <translation>Otvoren do %1</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> - <source>%1/offline?</source> - <translation>%1 nije dostupan?</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="28"/> + <location filename="../transactiondesc.cpp" line="30"/> <source>%1/unconfirmed</source> <translation>%1/nepotvrđeno</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation>%1 potvrda</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> - <source><b>From:</b> </source> - <translation><b>Od:</b></translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="92"/> <source>unknown</source> <translation>nepoznato</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation><b>Za:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation>(tvoje, oznaka:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation>(tvoje)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> + <source><b>Credit:</b> </source> + <translation><b>Uplaćeno:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation><b>Naknada za transakciju:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>Neto iznos:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>Poruka:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>Komentar:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation>Generirani novčići moraju pričekati nastanak 120 blokova prije nego što ih je moguće potrošiti. Kad ste generirali taj blok, on je bio emitiran u mrežu kako bi bio dodan postojećim lancima blokova. Ako ne uspije biti dodan, njegov status bit će promijenjen u "nije prihvaćen" i on neće biti potrošiv. S vremena na vrijeme tako nešto se može desiti ako neki drugi nod generira blok u približno isto vrijeme.</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="28"/> + <source>%1/offline?</source> + <translation>%1 nije dostupan?</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> + <source><b>From:</b> </source> + <translation><b>Od:</b></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="20"/> + <source>Open for %1 blocks</source> + <translation>Otvori za %1 blokova</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation><b>Status:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation>, još nije bio uspješno emitiran</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>, emitiran kroz nod %1 </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>, emitiran kroz nodove %1 </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation><b>Datum:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>Izvor:</b> Generirano<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> - <source><b>Credit:</b> </source> - <translation><b>Uplaćeno:</b> </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation>(%1 stasava za %2 dodatna bloka)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation>(Nije prihvaćeno)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation><b>Potrošeno:</b> </translation> </message> @@ -1356,6 +1379,61 @@ Adresa:%4 <context> <name>TransactionTableModel</name> <message> + <location filename="../transactiontablemodel.cpp" line="303"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Generirano - Upozorenje: ovaj blok nije bio primljen od strane bilo kojeg drugog noda i vjerojatno neće biti prihvaćen!</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="603"/> + <source>Amount removed from or added to balance.</source> + <translation>Iznos odbijen od ili dodan k saldu.</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="306"/> + <source>Generated but not accepted</source> + <translation>Generirano, ali nije prihvaćeno</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="349"/> + <source>Received with</source> + <translation>Primljeno s</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="354"/> + <source>Sent to</source> + <translation>Poslano za</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="597"/> + <source>Date and time that the transaction was received.</source> + <translation>Datum i vrijeme kad je transakcija primljena</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="599"/> + <source>Type of transaction.</source> + <translation>Vrsta transakcije.</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="601"/> + <source>Destination address of transaction.</source> + <translation>Odredište transakcije</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="356"/> + <source>Payment to yourself</source> + <translation>Plaćanje samom sebi</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="358"/> + <source>Mined</source> + <translation>Rudareno</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="595"/> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Status transakcije</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="280"/> <source>Open until %1</source> <translation>Otvoren do %1</translation> @@ -1372,6 +1450,11 @@ Adresa:%4 </message> <message> <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="214"/> <source>Address</source> <translation>Adresa</translation> </message> @@ -1380,11 +1463,6 @@ Adresa:%4 <source>Amount</source> <translation>Iznos</translation> </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Date</source> - <translation>Datum</translation> - </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="277"/> <source>Open for %n block(s)</source> @@ -1419,68 +1497,58 @@ Adresa:%4 </translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="303"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Generirano - Upozorenje: ovaj blok nije bio primljen od strane bilo kojeg drugog noda i vjerojatno neće biti prihvaćen!</translation> + <location filename="../transactiontablemodel.cpp" line="396"/> + <source>(n/a)</source> + <translation>(n/d)</translation> </message> +</context> +<context> + <name>TransactionView</name> <message> - <location filename="../transactiontablemodel.cpp" line="603"/> - <source>Amount removed from or added to balance.</source> - <translation>Iznos odbijen od ili dodan k saldu.</translation> + <location filename="../transactionview.cpp" line="284"/> + <source>Amount</source> + <translation>Iznos</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="306"/> - <source>Generated but not accepted</source> - <translation>Generirano, ali nije prihvaćeno</translation> + <location filename="../transactionview.cpp" line="283"/> + <source>Address</source> + <translation>Adresa</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="349"/> - <source>Received with</source> - <translation>Primljeno s</translation> + <location filename="../transactionview.cpp" line="285"/> + <source>ID</source> + <translation>ID</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="354"/> + <location filename="../transactionview.cpp" line="74"/> <source>Sent to</source> <translation>Poslano za</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="396"/> - <source>(n/a)</source> - <translation>(n/d)</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="597"/> - <source>Date and time that the transaction was received.</source> - <translation>Datum i vrijeme kad je transakcija primljena</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="599"/> - <source>Type of transaction.</source> - <translation>Vrsta transakcije.</translation> + <location filename="../transactionview.cpp" line="77"/> + <source>Mined</source> + <translation>Rudareno</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="601"/> - <source>Destination address of transaction.</source> - <translation>Odredište transakcije</translation> + <location filename="../transactionview.cpp" line="57"/> + <source>This week</source> + <translation>Ovaj tjedan</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="356"/> - <source>Payment to yourself</source> - <translation>Plaćanje samom sebi</translation> + <location filename="../transactionview.cpp" line="126"/> + <source>Copy amount</source> + <translation>Kopiraj iznos</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="358"/> - <source>Mined</source> - <translation>Rudareno</translation> + <location filename="../transactionview.cpp" line="271"/> + <source>Comma separated file (*.csv)</source> + <translation>Datoteka podataka odvojenih zarezima (*.csv)</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="595"/> - <source>Transaction status. Hover over this field to show number of confirmations.</source> - <translation>Status transakcije</translation> + <location filename="../transactionview.cpp" line="270"/> + <source>Export Transaction Data</source> + <translation>Izvoz podataka transakcija</translation> </message> -</context> -<context> - <name>TransactionView</name> <message> <location filename="../transactionview.cpp" line="55"/> <location filename="../transactionview.cpp" line="71"/> @@ -1493,11 +1561,6 @@ Adresa:%4 <translation>Danas</translation> </message> <message> - <location filename="../transactionview.cpp" line="57"/> - <source>This week</source> - <translation>Ovaj tjedan</translation> - </message> - <message> <location filename="../transactionview.cpp" line="58"/> <source>This month</source> <translation>Ovaj mjesec</translation> @@ -1523,21 +1586,11 @@ Adresa:%4 <translation>Primljeno s</translation> </message> <message> - <location filename="../transactionview.cpp" line="74"/> - <source>Sent to</source> - <translation>Poslano za</translation> - </message> - <message> <location filename="../transactionview.cpp" line="76"/> <source>To yourself</source> <translation>Tebi</translation> </message> <message> - <location filename="../transactionview.cpp" line="77"/> - <source>Mined</source> - <translation>Rudareno</translation> - </message> - <message> <location filename="../transactionview.cpp" line="78"/> <source>Other</source> <translation>Ostalo</translation> @@ -1563,11 +1616,6 @@ Adresa:%4 <translation>Kopirati oznaku</translation> </message> <message> - <location filename="../transactionview.cpp" line="126"/> - <source>Copy amount</source> - <translation>Kopiraj iznos</translation> - </message> - <message> <location filename="../transactionview.cpp" line="127"/> <source>Edit label</source> <translation>Izmjeniti oznaku</translation> @@ -1578,16 +1626,6 @@ Adresa:%4 <translation>Prikazati detalje...</translation> </message> <message> - <location filename="../transactionview.cpp" line="271"/> - <source>Comma separated file (*.csv)</source> - <translation>Datoteka podataka odvojenih zarezima (*.csv)</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="270"/> - <source>Export Transaction Data</source> - <translation>Izvoz podataka transakcija</translation> - </message> - <message> <location filename="../transactionview.cpp" line="279"/> <source>Confirmed</source> <translation>Potvrđeno</translation> @@ -1603,39 +1641,24 @@ Adresa:%4 <translation>Oznaka</translation> </message> <message> - <location filename="../transactionview.cpp" line="384"/> - <source>Range:</source> - <translation>Raspon:</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="392"/> - <source>to</source> - <translation>za</translation> - </message> - <message> <location filename="../transactionview.cpp" line="281"/> <source>Type</source> <translation>Tip</translation> </message> <message> - <location filename="../transactionview.cpp" line="284"/> - <source>Amount</source> - <translation>Iznos</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="283"/> - <source>Address</source> - <translation>Adresa</translation> + <location filename="../transactionview.cpp" line="289"/> + <source>Error exporting</source> + <translation>Izvoz pogreške</translation> </message> <message> - <location filename="../transactionview.cpp" line="285"/> - <source>ID</source> - <translation>ID</translation> + <location filename="../transactionview.cpp" line="384"/> + <source>Range:</source> + <translation>Raspon:</translation> </message> <message> - <location filename="../transactionview.cpp" line="289"/> - <source>Error exporting</source> - <translation>Izvoz pogreške</translation> + <location filename="../transactionview.cpp" line="392"/> + <source>to</source> + <translation>za</translation> </message> <message> <location filename="../transactionview.cpp" line="289"/> @@ -1646,7 +1669,7 @@ Adresa:%4 <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>Slanje...</translation> </message> @@ -1654,400 +1677,484 @@ Adresa:%4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Password for JSON-RPC connections</source> - <translation>Lozinka za JSON-RPC veze</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="58"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation>Podesi memorijski prostor za ključeve na <n> (ugrađeni izbor: 100)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="59"/> - <source>Rescan the block chain for missing wallet transactions</source> - <translation>Ponovno pretraži lanac blokova za transakcije koje nedostaju</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="65"/> + <location filename="../bitcoinstrings.cpp" line="101"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Koristi OpenSSL (https) za JSON-RPC povezivanje</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> + <location filename="../bitcoinstrings.cpp" line="102"/> <source>Server certificate file (default: server.cert)</source> <translation>Uslužnikov SSL certifikat (ugrađeni izbor: server.cert)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> + <location filename="../bitcoinstrings.cpp" line="103"/> <source>Server private key (default: server.pem)</source> <translation>Uslužnikov privatni ključ (ugrađeni izbor: server.pem)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>Prihvaljivi načini šifriranja (ugrađeni izbor: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> + <location filename="../bitcoinstrings.cpp" line="43"/> + <source>Send command to -server or bitcoind</source> + <translation>Pošalji komandu usluzi -server ili bitcoind</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> - <source>This help message</source> - <translation>Ova poruka za pomoć</translation> + <location filename="../bitcoinstrings.cpp" line="59"/> + <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> + <translation>Slušaj na <port>u (default: 8333 ili testnet: 18333)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> - <source>Loading addresses...</source> - <translation>Učitavanje adresa...</translation> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Loading wallet...</source> + <translation>Učitavanje novčanika...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Specify data directory</source> - <translation>Odredi direktorij za datoteke</translation> + <location filename="../bitcoinstrings.cpp" line="84"/> + <source>Send trace/debug info to debugger</source> + <translation>Pošalji trace/debug informacije u debugger</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Error loading blkindex.dat</source> + <translation>Greška kod učitavanja blkindex.dat</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="44"/> + <source>List commands</source> + <translation>Prikaži komande</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Odredi vremenski prozor za spajanje na mrežu (u milisekundama)</translation> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> - <source>Accept command line and JSON-RPC commands</source> - <translation>Prihvati komande iz tekst moda i JSON-RPC</translation> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> - <source>Loading block index...</source> - <translation>Učitavanje indeksa blokova...</translation> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> - <source>Done loading</source> - <translation>Učitavanje gotovo</translation> + <location filename="../bitcoinstrings.cpp" line="45"/> + <source>Get help for a command</source> + <translation>Potraži pomoć za komandu</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> - <source>Run in the background as a daemon and accept commands</source> - <translation>Izvršavaj u pozadini kao uslužnik i prihvaćaj komande</translation> + <location filename="../bitcoinstrings.cpp" line="46"/> + <source>Options:</source> + <translation>Postavke:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> - <source>Rescanning...</source> - <translation>Rescaniranje</translation> + <location filename="../bitcoinstrings.cpp" line="47"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation>Odredi konfiguracijsku datoteku (ugrađeni izbor: bitcoin.conf)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> - <source>Use the test network</source> - <translation>Koristi test mrežu</translation> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>Odredi proces ID datoteku (ugrađeni izbor: bitcoin.pid)</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="49"/> - <source>Username for JSON-RPC connections</source> - <translation>Korisničko ime za JSON-RPC veze</translation> + <source>Generate coins</source> + <translation>Generiraj novčiće</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation>Prihvaćaj JSON-RPC povezivanje na portu broj <port> (ugrađeni izbor: 8332)</translation> + <location filename="../bitcoinstrings.cpp" line="50"/> + <source>Don't generate coins</source> + <translation>Ne generiraj novčiće</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Allow JSON-RPC connections from specified IP address</source> - <translation>Dozvoli JSON-RPC povezivanje s određene IP adrese</translation> + <source>Show splash screen on startup (default: 1)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>Pošalji komande nodu na adresi <ip> (ugrađeni izbor: 127.0.0.1)</translation> + <location filename="../bitcoinstrings.cpp" line="54"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> - <source>Error loading wallet.dat</source> - <translation>Greška kod učitavanja wallet.dat</translation> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="63"/> + <source>Find peers using internet relay chat (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="64"/> + <source>Accept connections from outside (default: 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="65"/> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="66"/> + <source>Find peers using DNS lookup (default: 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="71"/> + <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="72"/> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="81"/> + <source>Output extra debugging information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="90"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Upgrade wallet to latest format</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source>How many blocks to check at startup (default: 2500, 0 = all)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>How thorough the block verification is (0-6, default: 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="118"/> + <source>Error loading wallet.dat: Wallet corrupted</source> + <translation>Greška kod učitavanja wallet.dat: Novčanik pokvaren</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="119"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> <translation>Greška kod učitavanja wallet.dat: Novčanik zahtjeva noviju verziju Bitcoina</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> + <location filename="../bitcoinstrings.cpp" line="120"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Novčanik je trebao prepravak: ponovo pokrenite Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Bitcoin version</source> - <translation>Bitcoin verzija</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Usage:</source> - <translation>Upotreba:</translation> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Prepend debug output with timestamp</source> + <translation>Dodaj izlaz debuga na početak sa vremenskom oznakom</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Send command to -server or bitcoind</source> - <translation>Pošalji komandu usluzi -server ili bitcoind</translation> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>Error loading wallet.dat</source> + <translation>Greška kod učitavanja wallet.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation>Slušaj na <port>u (default: 8333 ili testnet: 18333)</translation> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Slanje...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation>Broj sekundi koliko se članovima koji se čudno ponašaju neće dopustiti da se opet spoje (default: 86400)</translation> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>Nedovoljna sredstva</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> - <source>Loading wallet...</source> - <translation>Učitavanje novčanika...</translation> + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Specify data directory</source> + <translation>Odredi direktorij za datoteke</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> + <location filename="../bitcoinstrings.cpp" line="77"/> <source>Fee per KB to add to transactions you send</source> <translation>Naknada posredniku po KB-u koja će biti dodana svakoj transakciji koju pošalješ</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> + <location filename="../bitcoinstrings.cpp" line="67"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Prag za odspajanje članova koji se čudno ponašaju (default: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="83"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Šalji trace/debug informacije na konzolu umjesto u debug.log datoteku</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Send trace/debug info to debugger</source> - <translation>Pošalji trace/debug informacije u debugger</translation> + <location filename="../bitcoinstrings.cpp" line="86"/> + <source>Password for JSON-RPC connections</source> + <translation>Lozinka za JSON-RPC veze</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> - <source>Error loading blkindex.dat</source> - <translation>Greška kod učitavanja blkindex.dat</translation> + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>Podesi memorijski prostor za ključeve na <n> (ugrađeni izbor: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> - <source>List commands</source> - <translation>Prikaži komande</translation> + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation>Ponovno pretraži lanac blokova za transakcije koje nedostaju</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Get help for a command</source> - <translation>Potraži pomoć za komandu</translation> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>Prihvaljivi načini šifriranja (ugrađeni izbor: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Options:</source> - <translation>Postavke:</translation> + <location filename="../bitcoinstrings.cpp" line="107"/> + <source>This help message</source> + <translation>Ova poruka za pomoć</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify configuration file (default: bitcoin.conf)</source> - <translation>Odredi konfiguracijsku datoteku (ugrađeni izbor: bitcoin.conf)</translation> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>Program ne može pristupiti direktoriju s datotekama %s. Bitcoin program je vjerojatno već pokrenut.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>Odredi proces ID datoteku (ugrađeni izbor: bitcoin.pid)</translation> + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Specify connection timeout (in milliseconds)</source> + <translation>Odredi vremenski prozor za spajanje na mrežu (u milisekundama)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Generate coins</source> - <translation>Generiraj novčiće</translation> + <location filename="../bitcoinstrings.cpp" line="78"/> + <source>Accept command line and JSON-RPC commands</source> + <translation>Prihvati komande iz tekst moda i JSON-RPC</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Don't generate coins</source> - <translation>Ne generiraj novčiće</translation> + <location filename="../bitcoinstrings.cpp" line="115"/> + <source>Loading block index...</source> + <translation>Učitavanje indeksa blokova...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Start minimized</source> - <translation>Pokreni minimiziran</translation> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>Done loading</source> + <translation>Učitavanje gotovo</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Show splash screen on startup (default: 1)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="79"/> + <source>Run in the background as a daemon and accept commands</source> + <translation>Izvršavaj u pozadini kao uslužnik i prihvaćaj komande</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source>Rescanning...</source> + <translation>Rescaniranje</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Connect through socks4 proxy</source> - <translation>Poveži se kroz socks4 proxy</translation> + <location filename="../bitcoinstrings.cpp" line="80"/> + <source>Use the test network</source> + <translation>Koristi test mrežu</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Allow DNS lookups for addnode and connect</source> - <translation>Dozvoli DNS upite za dodavanje nodova i povezivanje</translation> + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>Username for JSON-RPC connections</source> + <translation>Korisničko ime za JSON-RPC veze</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Connect only to the specified node</source> - <translation>Poveži se samo sa određenim nodom</translation> + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>Prihvaćaj JSON-RPC povezivanje na portu broj <port> (ugrađeni izbor: 8332)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Find peers using internet relay chat (default: 0)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="88"/> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation>Dozvoli JSON-RPC povezivanje s određene IP adrese</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Accept connections from outside (default: 1)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>Pošalji komande nodu na adresi <ip> (ugrađeni izbor: 127.0.0.1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="41"/> + <source>Bitcoin version</source> + <translation>Bitcoin verzija</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Find peers using DNS lookup (default: 1)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="42"/> + <source>Usage:</source> + <translation>Upotreba:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="68"/> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> + <translation>Broj sekundi koliko se članovima koji se čudno ponašaju neće dopustiti da se opet spoje (default: 86400)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="51"/> + <source>Start minimized</source> + <translation>Pokreni minimiziran</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> - <source>Output extra debugging information</source> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> - <source>Upgrade wallet to latest format</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">Greška: priprema transakcije nije uspjela.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> - <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">Generirani novčići moraju pričekati nastanak 120 blokova prije nego što ih je moguće potrošiti. Kad ste generirali taj blok, on je bio emitiran u mrežu kako bi bio dodan postojećim lancima blokova. Ako ne uspije biti dodan, njegov status bit će promijenjen u "nije prihvatljiv" i on neće biti potrošiv. S vremena na vrijeme tako nešto se može desiti ako neki drugi nod približno istovremeno generira blok.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> - <source>How thorough the block verification is (0-6, default: 1)</source> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../bitcoinstrings.cpp" line="57"/> + <source>Connect through socks4 proxy</source> + <translation>Poveži se kroz socks4 proxy</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="58"/> + <source>Allow DNS lookups for addnode and connect</source> + <translation>Dozvoli DNS upite za dodavanje nodova i povezivanje</translation> + </message> + <message> <location filename="../bitcoinstrings.cpp" line="62"/> + <source>Connect only to the specified node</source> + <translation>Poveži se samo sa određenim nodom</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>SSL postavke: (za detalje o podešavanju SSL opcija vidi Bitcoin Wiki)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="76"/> + <location filename="../bitcoinstrings.cpp" line="114"/> <source>Error loading addr.dat</source> <translation>Greška kod učitavanja addr.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> - <source>Error loading wallet.dat: Wallet corrupted</source> - <translation>Greška kod učitavanja wallet.dat: Novčanik pokvaren</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> + <location filename="../bitcoinstrings.cpp" line="123"/> <source>Cannot initialize keypool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> + <location filename="../bitcoinstrings.cpp" line="124"/> <source>Cannot write default address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation>Nevaljala -proxy adresa</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> - <source>Invalid amount for -paytxfee=<amount></source> - <translation>Nevaljali iznos za opciju -paytxfee=<amount></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="91"/> - <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> - <translation>Upozorenje: -paytxfee je podešen na preveliki iznos. To je iznos koji ćete platiti za obradu transakcije.</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="95"/> + <location filename="../bitcoinstrings.cpp" line="20"/> <source>Warning: Disk space is low</source> <translation>Upozorenje: Malo diskovnog prostora</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> + <location filename="../bitcoinstrings.cpp" line="61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Unesite nod s kojim se želite spojiti and attempt to keep the connection open</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished">Pokušaj koristiti UPnP da otvoriš port za uslugu (default: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished">Pokušaj koristiti UPnP da otvoriš port za uslugu (default: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Maintain at most <n> connections to peers (default: 125)</source> - <translation>Održavaj najviše <n> veza sa članovima (default: 125)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="46"/> - <source>Prepend debug output with timestamp</source> - <translation>Dodaj izlaz debuga na početak sa vremenskom oznakom</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation>Greška: CreateThread(StartNode) nije uspjela</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> + <location filename="../bitcoinstrings.cpp" line="133"/> <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> <translation>Program ne može koristiti port %d na ovom računalu. Bitcoin program je vjerojatno već pokrenut.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> + <location filename="../bitcoinstrings.cpp" line="38"/> <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> <translation>Upozorenje: Molimo provjerite jesu li datum i vrijeme na vašem računalu točni. Ako vaš sat ide krivo, Bitcoin neće raditi ispravno.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>beta</translation> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>Nevaljali iznos za opciju</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="128"/> + <source>Invalid amount for -paytxfee=<amount></source> + <translation>Nevaljali iznos za opciju -paytxfee=<amount></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="129"/> + <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> + <translation>Upozorenje: -paytxfee je podešen na preveliki iznos. To je iznos koji ćete platiti za obradu transakcije.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation>Upotreba</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="113"/> + <source>Loading addresses...</source> + <translation>Učitavanje adresa...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="60"/> + <source>Maintain at most <n> connections to peers (default: 125)</source> + <translation>Održavaj najviše <n> veza sa članovima (default: 125)</translation> </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts index 44625e900a..8a7621a029 100644 --- a/src/qt/locale/bitcoin_hu.ts +++ b/src/qt/locale/bitcoin_hu.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> verzió</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -59,11 +59,6 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation>A kiválasztott cím másolása a vágólapra</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="74"/> - <source>&Copy to Clipboard</source> - <translation>&Másolás a vágólapra</translation> - </message> - <message> <location filename="../forms/addressbookpage.ui" line="85"/> <source>Show &QR Code</source> <translation type="unfinished"></translation> @@ -84,55 +79,60 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation>A kiválasztott cím törlése a listáról. Csak a küldő címek törölhetőek.</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="113"/> - <source>&Delete</source> - <translation>&Törlés</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="278"/> - <source>Export Address Book Data</source> - <translation>Címjegyzék adatainak exportálása</translation> + <location filename="../addressbookpage.cpp" line="299"/> + <source>Could not write to file %1.</source> + <translation>%1 nevű fájl nem írható.</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation>Vesszővel elválasztott fájl (*. csv)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> - <source>Could not write to file %1.</source> - <translation>%1 nevű fájl nem írható.</translation> + <location filename="../addressbookpage.cpp" line="66"/> + <source>Copy label</source> + <translation>Címke másolása</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="67"/> + <source>Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="299"/> + <source>Error exporting</source> + <translation>Hiba exportálás közben</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>Cím másolása</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> - <source>Copy label</source> - <translation>Címke másolása</translation> + <location filename="../forms/addressbookpage.ui" line="113"/> + <source>&Delete</source> + <translation>&Törlés</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> - <source>Edit</source> - <translation type="unfinished"></translation> + <location filename="../addressbookpage.cpp" line="285"/> + <source>Export Address Book Data</source> + <translation>Címjegyzék adatainak exportálása</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>Törlés</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> - <source>Error exporting</source> - <translation>Hiba exportálás közben</translation> - </message> - <message> <location filename="../forms/addressbookpage.ui" line="60"/> <source>&New Address...</source> <translation>&Új cím...</translation> </message> + <message> + <location filename="../forms/addressbookpage.ui" line="74"/> + <source>&Copy to Clipboard</source> + <translation>&Másolás a vágólapra</translation> + </message> </context> <context> <name>AddressTableModel</name> @@ -155,30 +155,25 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <context> <name>AskPassphraseDialog</name> <message> + <location filename="../forms/askpassphrasedialog.ui" line="75"/> + <source>Repeat new passphrase</source> + <translation>Új jelszó újra</translation> + </message> + <message> <location filename="../forms/askpassphrasedialog.ui" line="61"/> <source>New passphrase</source> <translation>Új jelszó</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="38"/> - <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>A tárcád megnyitásához a műveletnek szüksége van a tárcád jelszavára.</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="54"/> - <source>Change passphrase</source> - <translation>Jelszó megváltoztatása</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="117"/> - <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation type="unfinished"></translation> + <location filename="../forms/askpassphrasedialog.ui" line="94"/> + <source>TextLabel</source> + <translation>SzövegCímke</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="134"/> - <location filename="../askpassphrasedialog.cpp" line="182"/> - <source>The supplied passphrases do not match.</source> - <translation>A megadott jelszavak nem egyeznek.</translation> + <location filename="../askpassphrasedialog.cpp" line="111"/> + <location filename="../askpassphrasedialog.cpp" line="169"/> + <source>Wallet encrypted</source> + <translation>Tárca kódolva</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="145"/> @@ -186,35 +181,26 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation>Tárca megnyitása sikertelen</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="217"/> - <location filename="../askpassphrasedialog.cpp" line="241"/> - <source>Warning: The Caps Lock key is on.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../forms/askpassphrasedialog.ui" line="75"/> - <source>Repeat new passphrase</source> - <translation>Új jelszó újra</translation> - </message> - <message> <location filename="../forms/askpassphrasedialog.ui" line="26"/> <source>Dialog</source> <translation>Párbeszéd</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="35"/> - <source>Encrypt wallet</source> - <translation>Tárca kódolása</translation> + <location filename="../askpassphrasedialog.cpp" line="55"/> + <source>Enter the old and new passphrase to the wallet.</source> + <translation>Írd be a tárca régi és új jelszavát.</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="94"/> - <source>TextLabel</source> - <translation>SzövegCímke</translation> + <location filename="../askpassphrasedialog.cpp" line="38"/> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>A tárcád megnyitásához a műveletnek szüksége van a tárcád jelszavára.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="43"/> - <source>Unlock wallet</source> - <translation>Tárca megnyitása</translation> + <location filename="../askpassphrasedialog.cpp" line="102"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! +Are you sure you wish to encrypt your wallet?</source> + <translation>FIGYELEM: Ha kódolod a tárcát, és elveszíted a jelszavad, akkor <b>AZ ÖSSZES BITCOINODAT IS EL FOGOD VESZÍTENI!</b> +Biztosan kódolni akarod a tárcát?</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="46"/> @@ -222,6 +208,21 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation>A tárcád dekódolásához a műveletnek szüksége van a tárcád jelszavára.</translation> </message> <message> + <location filename="../askpassphrasedialog.cpp" line="51"/> + <source>Decrypt wallet</source> + <translation>Tárca dekódolása</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="127"/> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Tárca kódolása belső hiba miatt sikertelen. A tárcád nem lett kódolva.</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="34"/> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>Írd be az új jelszót a tárcához.<br/>Használj legalább 10<br/>véletlenszerű karaktert</b> vagy <b>legalább nyolc szót</b>.</translation> + </message> + <message> <location filename="../askpassphrasedialog.cpp" line="126"/> <location filename="../askpassphrasedialog.cpp" line="133"/> <location filename="../askpassphrasedialog.cpp" line="175"/> @@ -230,29 +231,30 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation>Tárca kódolása sikertelen.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="156"/> - <source>Wallet decryption failed</source> - <translation>Dekódolás sikertelen.</translation> + <location filename="../askpassphrasedialog.cpp" line="35"/> + <source>Encrypt wallet</source> + <translation>Tárca kódolása</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="34"/> - <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>Írd be az új jelszót a tárcához.<br/>Használj legalább 10<br/>véletlenszerű karaktert</b> vagy <b>legalább nyolc szót</b>.</translation> + <location filename="../askpassphrasedialog.cpp" line="43"/> + <source>Unlock wallet</source> + <translation>Tárca megnyitása</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="101"/> - <source>Confirm wallet encryption</source> - <translation>Biztosan kódolni akarod a tárcát?</translation> + <location filename="../askpassphrasedialog.cpp" line="54"/> + <source>Change passphrase</source> + <translation>Jelszó megváltoztatása</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="127"/> - <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>Tárca kódolása belső hiba miatt sikertelen. A tárcád nem lett kódolva.</translation> + <location filename="../askpassphrasedialog.cpp" line="117"/> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="51"/> - <source>Decrypt wallet</source> - <translation>Tárca dekódolása</translation> + <location filename="../askpassphrasedialog.cpp" line="134"/> + <location filename="../askpassphrasedialog.cpp" line="182"/> + <source>The supplied passphrases do not match.</source> + <translation>A megadott jelszavak nem egyeznek.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="146"/> @@ -262,21 +264,15 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt <translation>Hibás jelszó.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="55"/> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Írd be a tárca régi és új jelszavát.</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="102"/> - <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! -Are you sure you wish to encrypt your wallet?</source> - <translation>FIGYELEM: Ha kódolod a tárcát, és elveszíted a jelszavad, akkor <b>AZ ÖSSZES BITCOINODAT IS EL FOGOD VESZÍTENI!</b> -Biztosan kódolni akarod a tárcát?</translation> + <location filename="../askpassphrasedialog.cpp" line="217"/> + <location filename="../askpassphrasedialog.cpp" line="241"/> + <source>Warning: The Caps Lock key is on.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="113"/> - <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> - <translation>Bitcoin will close now to finish the encryption process. Ne feledd, hogy a tárca titkosítása sem nyújt teljes védelmet az adathalász programok fertőzésével szemben.</translation> + <location filename="../askpassphrasedialog.cpp" line="101"/> + <source>Confirm wallet encryption</source> + <translation>Biztosan kódolni akarod a tárcát?</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="170"/> @@ -284,345 +280,355 @@ Biztosan kódolni akarod a tárcát?</translation> <translation>Jelszó megváltoztatva.</translation> </message> <message> + <location filename="../askpassphrasedialog.cpp" line="156"/> + <source>Wallet decryption failed</source> + <translation>Dekódolás sikertelen.</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="113"/> + <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>Bitcoin will close now to finish the encryption process. Ne feledd, hogy a tárca titkosítása sem nyújt teljes védelmet az adathalász programok fertőzésével szemben.</translation> + </message> + <message> <location filename="../forms/askpassphrasedialog.ui" line="47"/> <source>Enter passphrase</source> <translation>Add meg a jelszót</translation> </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="111"/> - <location filename="../askpassphrasedialog.cpp" line="169"/> - <source>Wallet encrypted</source> - <translation>Tárca kódolva</translation> - </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="238"/> - <source>Quit application</source> - <translation>Kilépés</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>&A %1-ról</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="255"/> - <source>Encrypt or decrypt wallet</source> - <translation>Tárca kódolása vagy dekódolása</translation> + <location filename="../bitcoingui.cpp" line="506"/> + <source>Synchronizing with network...</source> + <translation>Szinkronizálás a hálózattal...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> - <translation>&Exportálás...</translation> + <location filename="../bitcoingui.cpp" line="192"/> + <source>Browse transaction history</source> + <translation>Tranzakciótörténet megtekintése</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> - <source>&Settings</source> - <translation>&Beállítások</translation> + <location filename="../bitcoingui.cpp" line="203"/> + <source>&Receive coins</source> + <translation>Érmék &fogadása</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation>Tárca &kódolása</translation> + <location filename="../bitcoingui.cpp" line="235"/> + <source>E&xit</source> + <translation>&Kilépés</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> - <source>Synchronizing with network...</source> - <translation>Szinkronizálás a hálózattal...</translation> + <location filename="../bitcoingui.cpp" line="236"/> + <source>Quit application</source> + <translation>Kilépés</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> - <source>[testnet]</source> - <translation>[teszthálózat]</translation> + <location filename="../bitcoingui.cpp" line="185"/> + <source>&Overview</source> + <translation>&Áttekintés</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> - <source>&Help</source> - <translation>&Súgó</translation> + <location filename="../bitcoingui.cpp" line="252"/> + <source>&Encrypt Wallet</source> + <translation>Tárca &kódolása</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Blokklánc-szinkronizálás folyamatban</translation> + <location filename="../bitcoingui.cpp" line="290"/> + <source>&Settings</source> + <translation>&Beállítások</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> + <location filename="../bitcoingui.cpp" line="197"/> <source>&Address Book</source> <translation>Cím&jegyzék</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> - <source>Edit the list of stored addresses and labels</source> - <translation>Tárolt címek és címkék listájának szerkesztése</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="205"/> - <source>&Receive coins</source> - <translation>Érmék &fogadása</translation> + <location filename="../bitcoingui.cpp" line="281"/> + <source>&File</source> + <translation>&Fájl</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation>Kiizetést fogadó címek listája</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> - <source>Send coins to a bitcoin address</source> - <translation>Érmék küldése megadott címre</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="211"/> - <source>&Send coins</source> - <translation>Érmék &küldése</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="217"/> - <source>Sign &message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="218"/> - <source>Prove you control an address</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="237"/> - <source>E&xit</source> - <translation>&Kilépés</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="242"/> - <source>Show information about Bitcoin</source> - <translation>Információk a Bitcoinról</translation> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>&A %1-ról</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> + <location filename="../bitcoingui.cpp" line="245"/> <source>&Options...</source> <translation>&Opciók...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> + <location filename="../bitcoingui.cpp" line="246"/> <source>Modify configuration options for bitcoin</source> <translation>Bitcoin konfigurációs opciók</translation> </message> <message> + <location filename="../bitcoingui.cpp" line="253"/> + <source>Encrypt or decrypt wallet</source> + <translation>Tárca kódolása vagy dekódolása</translation> + </message> + <message> <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>A &Bitcoin megnyitása</translation> + <source>&Export...</source> + <translation>&Exportálás...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="187"/> - <source>&Overview</source> - <translation>&Áttekintés</translation> + <location filename="../bitcoingui.cpp" line="191"/> + <source>&Transactions</source> + <translation>&Tranzakciók</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> + <location filename="../bitcoingui.cpp" line="242"/> <source>About &Qt</source> <translation>A &Qt-ról</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> - <source>&Transactions</source> - <translation>&Tranzakciók</translation> + <location filename="../bitcoingui.cpp" line="243"/> + <source>Show information about Qt</source> + <translation>Információk a Qt ról</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> - <source>Show general overview of wallet</source> - <translation>Tárca általános áttekintése</translation> + <location filename="../bitcoingui.cpp" line="209"/> + <source>&Send coins</source> + <translation>Érmék &küldése</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>%1 blokk letöltve a tranzakciótörténet %2 blokkjából.</translation> + <location filename="../bitcoingui.cpp" line="303"/> + <source>Tabs toolbar</source> + <translation>Fül eszköztár</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>Jelszó &megváltoztatása</translation> + <location filename="../bitcoingui.cpp" line="531"/> + <source>Downloaded %1 blocks of transaction history.</source> + <translation>%1 blokk letöltve a tranzakciótörténetből.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="73"/> - <source>Bitcoin Wallet</source> - <translation>Bitcoin-tárca</translation> + <location filename="../bitcoingui.cpp" line="240"/> + <source>Show information about Bitcoin</source> + <translation>Információk a Bitcoinról</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> - <source>Browse transaction history</source> - <translation>Tranzakciótörténet megtekintése</translation> + <location filename="../bitcoingui.cpp" line="418"/> + <source>bitcoin-qt</source> + <translation>bitcoin-qt</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="546"/> + <source>%n second(s) ago</source> + <translation> + <numerusform>%n másodperccel ezelőtt</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>A Bitcoin-ablak mutatása</translation> + <location filename="../bitcoingui.cpp" line="71"/> + <source>Bitcoin Wallet</source> + <translation>Bitcoin-tárca</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="186"/> + <source>Show general overview of wallet</source> + <translation>Tárca általános áttekintése</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> + <location filename="../bitcoingui.cpp" line="258"/> <source>Change the passphrase used for wallet encryption</source> <translation>Tárcakódoló jelszó megváltoztatása</translation> </message> + <message> + <location filename="../bitcoingui.cpp" line="314"/> + <source>Actions toolbar</source> + <translation>Parancsok eszköztár</translation> + </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> + <location filename="../bitcoingui.cpp" line="482"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n aktív kapcsolat a Bitcoin-hálózattal</numerusform> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> - <source>Tabs toolbar</source> - <translation>Fül eszköztár</translation> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Send coins to a bitcoin address</source> + <translation>Érmék küldése megadott címre</translation> </message> - <message> - <location filename="../bitcoingui.cpp" line="501"/> - <source>Downloaded %1 blocks of transaction history.</source> - <translation>%1 blokk letöltve a tranzakciótörténetből.</translation> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> - <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation type="unfinished">A Bitcoin-ablak mutatása</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> - <source>Incoming transaction</source> - <translation>Beérkező tranzakció</translation> + <location filename="../bitcoingui.cpp" line="215"/> + <source>Sign &message</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Dátum: %1 -Összeg: %2 -Típus: %3 -Cím: %4 -</translation> + <location filename="../bitcoingui.cpp" line="216"/> + <source>Prove you control an address</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> - <source>Show information about Qt</source> - <translation>Információk a Qt ról</translation> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> + <location filename="../bitcoingui.cpp" line="251"/> <source>Export the data in the current tab to a file</source> <translation>Jelenlegi nézet exportálása fájlba</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> + <location filename="../bitcoingui.cpp" line="255"/> <source>&Backup Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> + <location filename="../bitcoingui.cpp" line="256"/> <source>Backup wallet to another location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> - <source>bitcoin-qt</source> - <translation>bitcoin-qt</translation> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation>Jelszó &megváltoztatása</translation> </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> - <source>%n second(s) ago</source> - <translation> - <numerusform>%n másodperccel ezelőtt</numerusform> - </translation> + <message> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation> <numerusform>%n perccel ezelőtt</numerusform> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation> <numerusform>%n órával ezelőtt</numerusform> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>%n nappal ezelőtt</numerusform> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation>Naprakész</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>Frissítés...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation>Az utolsóként kapott blokk generálva: %1.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Backup Wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>%1 blokk letöltve a tranzakciótörténet %2 blokkjából (%3% done).</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="632"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="663"/> <source>Sent transaction</source> <translation>Tranzakció elküldve.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="664"/> + <source>Incoming transaction</source> + <translation>Beérkező tranzakció</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="665"/> + <source>Date: %1 +Amount: %2 +Type: %3 +Address: %4 +</source> + <translation>Dátum: %1 +Összeg: %2 +Típus: %3 +Cím: %4 +</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Tárca <b>kódolva</b> és jelenleg <b>nyitva</b>.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Tárca <b>kódolva</b> és jelenleg <b>zárva</b>.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> + <location filename="../bitcoingui.cpp" line="636"/> <source>Sending...</source> <translation>Küldés...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> - <source>&File</source> - <translation>&Fájl</translation> + <location filename="../bitcoingui.cpp" line="198"/> + <source>Edit the list of stored addresses and labels</source> + <translation>Tárolt címek és címkék listájának szerkesztése</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> - <source>Actions toolbar</source> - <translation>Parancsok eszköztár</translation> + <location filename="../bitcoingui.cpp" line="296"/> + <source>&Help</source> + <translation>&Súgó</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="327"/> + <source>[testnet]</source> + <translation>[teszthálózat]</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -630,22 +636,22 @@ Cím: %4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&Mértékegység: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>Válaszd ki az interfészen és érmék küldésekor megjelenítendő alapértelmezett alegységet.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&Címek megjelenítése a tranzakciólistában</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished"></translation> </message> @@ -698,6 +704,11 @@ Cím: %4 <translation>Küldő cím szerkesztése</translation> </message> <message> + <location filename="../editaddressdialog.cpp" line="96"/> + <source>The entered address "%1" is not a valid bitcoin address.</source> + <translation>A megadott "%1" cím nem egy érvényes Bitcoin-cím.</translation> + </message> + <message> <location filename="../editaddressdialog.cpp" line="106"/> <source>New key generation failed.</source> <translation>Új kulcs generálása sikertelen</translation> @@ -712,94 +723,99 @@ Cím: %4 <source>Could not unlock wallet.</source> <translation>Tárca feloldása sikertelen</translation> </message> - <message> - <location filename="../editaddressdialog.cpp" line="96"/> - <source>The entered address "%1" is not a valid bitcoin address.</source> - <translation>A megadott "%1" cím nem egy érvényes Bitcoin-cím.</translation> - </message> </context> <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>Proxy IP címe (pl.: 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Proxy portja (pl.: 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>&Port: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>&Induljon el a számítógép bekapcsolásakor</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Induljon el a Bitcoin a számítógép bekapcsolásakor</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>&Kicsinyítés a tálcára az eszköztár helyett</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>Kicsinyítés után csak eszköztár-ikont mutass</translation> </message> <message> <location filename="../optionsdialog.cpp" line="180"/> - <source>Map port using &UPnP</source> - <translation>&UPnP port-feltérképezés</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="185"/> <source>M&inimize on close</source> <translation>K&icsinyítés záráskor</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="186"/> + <location filename="../optionsdialog.cpp" line="181"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>Az alkalmazásból való kilépés helyett az eszköztárba kicsinyíti az alkalmazást az ablak bezárásakor. Ez esetben az alkalmazás csak a Kilépés menüponttal zárható be.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="181"/> + <location filename="../optionsdialog.cpp" line="185"/> + <source>Map port using &UPnP</source> + <translation>&UPnP port-feltérképezés</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="186"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>A Bitcoin-kliens portjának automatikus megnyitása a routeren. Ez csak akkor működik, ha a routered támogatja az UPnP-t és az engedélyezve is van rajta.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>&Csatlakozás SOCKS4 proxyn keresztül:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>SOCKS4 proxyn keresztüli csatlakozás a Bitcoin hálózatához (pl. Tor-on keresztüli csatlakozás esetén)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>Proxy &IP: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>Opcionális, kB-onkénti tranzakciós díj a tranzakcióid minél gyorsabb feldolgozásának elősegítésére. A legtöbb tranzakció 1 kB-os. 0,01 BTC ajánlott.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>Tranzakciós &díj fizetése</translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessagePage</name> @@ -809,9 +825,9 @@ Cím: %4 <translation>Alt+A</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="38"/> - <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished">Adj meg egy Bitcoin-címet (pl.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L )</translation> + <location filename="../forms/messagepage.ui" line="48"/> + <source>Choose adress from address book</source> + <translation>Válassz egy címet a címjegyzékből</translation> </message> <message> <location filename="../forms/messagepage.ui" line="20"/> @@ -819,11 +835,6 @@ Cím: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/messagepage.ui" line="48"/> - <source>Choose adress from address book</source> - <translation>Válassz egy címet a címjegyzékből</translation> - </message> - <message> <location filename="../forms/messagepage.ui" line="71"/> <source>Paste address from clipboard</source> <translation>Cím beillesztése a vágólapról</translation> @@ -890,21 +901,26 @@ Cím: %4 <source>Message</source> <translation>Üzenet</translation> </message> + <message> + <location filename="../forms/messagepage.ui" line="38"/> + <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished">Adj meg egy Bitcoin-címet (pl.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L )</translation> + </message> </context> <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>Megjelenítés</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>Opciók</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>Fő</translation> </message> @@ -927,16 +943,6 @@ Cím: %4 <translation>Tranzakciók száma:</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="61"/> - <source>0</source> - <translation>0</translation> - </message> - <message> - <location filename="../forms/overviewpage.ui" line="88"/> - <source>Wallet</source> - <translation>Tárca</translation> - </message> - <message> <location filename="../forms/overviewpage.ui" line="68"/> <source>Unconfirmed:</source> <translation>Megerősítetlen:</translation> @@ -947,6 +953,16 @@ Cím: %4 <translation><b>Legutóbbi tranzakciók</b></translation> </message> <message> + <location filename="../forms/overviewpage.ui" line="61"/> + <source>0</source> + <translation>0</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="88"/> + <source>Wallet</source> + <translation>Tárca</translation> + </message> + <message> <location filename="../overviewpage.cpp" line="103"/> <source>Your current balance</source> <translation>Aktuális egyenleged</translation> @@ -1005,17 +1021,22 @@ Cím: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation type="unfinished"></translation> </message> @@ -1028,9 +1049,14 @@ Cím: %4 <translation>&Címzett hozzáadása ...</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="129"/> - <source>The amount to pay must be larger than 0.</source> - <translation>A fizetendő összegnek nagyobbnak kell lennie 0-nál.</translation> + <location filename="../forms/sendcoinsdialog.ui" line="106"/> + <source>Balance:</source> + <translation>Egyenleg:</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="87"/> + <source>Clear all</source> + <translation>Mindent töröl</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="101"/> @@ -1038,24 +1064,29 @@ Cím: %4 <translation>Valóban el akarsz küldeni %1-t?</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="95"/> - <source><b>%1</b> to %2 (%3)</source> - <translation><b>%1</b> %2-re (%3)</translation> - </message> - <message> <location filename="../sendcoinsdialog.cpp" line="100"/> <source>Confirm send coins</source> <translation>Küldés megerősítése</translation> </message> <message> + <location filename="../sendcoinsdialog.cpp" line="95"/> + <source><b>%1</b> to %2 (%3)</source> + <translation><b>%1</b> %2-re (%3)</translation> + </message> + <message> <location filename="../sendcoinsdialog.cpp" line="101"/> <source> and </source> <translation> és</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="134"/> - <source>The amount exceeds your balance.</source> - <translation>Nincs ennyi bitcoin az egyenlegeden.</translation> + <location filename="../sendcoinsdialog.cpp" line="124"/> + <source>The recipient address is not valid, please recheck.</source> + <translation>A címzett címe érvénytelen, kérlek, ellenőrizd.</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="129"/> + <source>The amount to pay must be larger than 0.</source> + <translation>A fizetendő összegnek nagyobbnak kell lennie 0-nál.</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="139"/> @@ -1095,16 +1126,6 @@ Cím: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="87"/> - <source>Clear all</source> - <translation>Mindent töröl</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="106"/> - <source>Balance:</source> - <translation>Egyenleg:</translation> - </message> - <message> <location filename="../forms/sendcoinsdialog.ui" line="113"/> <source>123.456 BTC</source> <translation>123.456 BTC</translation> @@ -1120,9 +1141,9 @@ Cím: %4 <translation>&Küldés</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="124"/> - <source>The recipient address is not valid, please recheck.</source> - <translation>A címzett címe érvénytelen, kérlek, ellenőrizd.</translation> + <location filename="../sendcoinsdialog.cpp" line="134"/> + <source>The amount exceeds your balance.</source> + <translation>Nincs ennyi bitcoin az egyenlegeden.</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="150"/> @@ -1133,23 +1154,31 @@ Cím: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="66"/> - <location filename="../sendcoinsentry.cpp" line="26"/> - <source>Enter a label for this address to add it to your address book</source> - <translation>Milyen címkével kerüljön be ez a cím a címtáradba? -</translation> - </message> - <message> <location filename="../forms/sendcoinsentry.ui" line="75"/> <source>&Label:</source> <translation>Címke:</translation> </message> <message> + <location filename="../forms/sendcoinsentry.ui" line="93"/> + <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/sendcoinsentry.ui" line="103"/> <source>Choose address from address book</source> <translation>Válassz egy címet a címjegyzékből</translation> </message> <message> + <location filename="../forms/sendcoinsentry.ui" line="113"/> + <source>Alt+A</source> + <translation>Alt+A</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="120"/> + <source>Paste address from clipboard</source> + <translation>Cím beillesztése a vágólapról</translation> + </message> + <message> <location filename="../forms/sendcoinsentry.ui" line="14"/> <source>Form</source> <translation>Űrlap</translation> @@ -1165,19 +1194,11 @@ Cím: %4 <translation>Címzett:</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="93"/> - <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../forms/sendcoinsentry.ui" line="113"/> - <source>Alt+A</source> - <translation>Alt+A</translation> - </message> - <message> - <location filename="../forms/sendcoinsentry.ui" line="120"/> - <source>Paste address from clipboard</source> - <translation>Cím beillesztése a vágólapról</translation> + <location filename="../forms/sendcoinsentry.ui" line="66"/> + <location filename="../sendcoinsentry.cpp" line="26"/> + <source>Enter a label for this address to add it to your address book</source> + <translation>Milyen címkével kerüljön be ez a cím a címtáradba? +</translation> </message> <message> <location filename="../forms/sendcoinsentry.ui" line="130"/> @@ -1199,141 +1220,141 @@ Cím: %4 <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="30"/> - <source>%1 confirmations</source> - <translation>%1 megerősítés</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="52"/> - <source>, has not been successfully broadcast yet</source> - <translation>, még nem sikerült elküldeni.</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="28"/> <source>%1/unconfirmed</source> <translation>%1/megerősítetlen</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="18"/> + <location filename="../transactiondesc.cpp" line="22"/> + <source>Open until %1</source> + <translation>Megnyitva %1-ig</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="20"/> <source>Open for %1 blocks</source> <translation>Megnyitva %1 blokkra</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation>%1/offline?</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> - <source><b>Status:</b> </source> - <translation><b>Állapot:</b> </translation> + <location filename="../transactiondesc.cpp" line="32"/> + <source>%1 confirmations</source> + <translation>%1 megerősítés</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>, %1 csomóponton keresztül elküldve.</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="92"/> + <source>unknown</source> + <translation>ismeretlen</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="50"/> + <source><b>Status:</b> </source> + <translation><b>Állapot:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>, elküldve %1 csomóponton keresztül.</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation><b>Dátum:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>Forrás:</b> Generálva<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>Űrlap:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation><b>Címzett:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation> (tiéd, címke: </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation><b>Jóváírás</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation>(%1, %2 múlva készül el)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="139"/> + <source>(not accepted)</source> + <translation>(elutasítva)</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> + <source><b>Debit:</b> </source> + <translation><b>Terhelés</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="213"/> + <source><b>Net amount:</b> </source> + <translation><b>Nettó összeg:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>Üzenet:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>Megjegyzés:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation>A frissen generált érméket csak 120 blokkal később tudod elkölteni. Ez a blokk nyomban szétküldésre került a hálózatba, amint legeneráltad, hogy hozzáadhassák a blokklánchoz. Ha nem kerül be a láncba, úgy az állapota "elutasítva"-ra módosul, és nem költheted el az érméket. Ez akkor következhet be időnként, ha egy másik csomópont mindössze néhány másodperc különbséggel generált le egy blokkot a tiédhez képest.</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation> (tiéd)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> - <source>Open until %1</source> - <translation>Megnyitva %1-ig</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="89"/> - <source>unknown</source> - <translation>ismeretlen</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="136"/> - <source>(not accepted)</source> - <translation>(elutasítva)</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> - <source><b>Debit:</b> </source> - <translation><b>Terhelés</b> </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation><b>Tranzakciós díj:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> - <source><b>Net amount:</b> </source> - <translation><b>Nettó összeg:</b> </translation> + <location filename="../transactiondesc.cpp" line="55"/> + <source>, has not been successfully broadcast yet</source> + <translation>, még nem sikerült elküldeni.</translation> </message> </context> <context> @@ -1356,6 +1377,11 @@ Cím: %4 <source>Type</source> <translation>Típus</translation> </message> + <message> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Date</source> + <translation>Dátum</translation> + </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="277"/> <source>Open for %n block(s)</source> @@ -1364,14 +1390,26 @@ Cím: %4 </translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="280"/> - <source>Open until %1</source> - <translation>%1-ig megnyitva</translation> + <location filename="../transactiontablemodel.cpp" line="283"/> + <source>Offline (%1 confirmations)</source> + <translation>Offline (%1 megerősítés)</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Date</source> - <translation>Dátum</translation> + <location filename="../transactiontablemodel.cpp" line="289"/> + <source>Confirmed (%1 confirmations)</source> + <translation>Megerősítve (%1 megerősítés)</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="303"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Ezt a blokkot egyetlen másik csomópont sem kapta meg, így valószínűleg nem lesz elfogadva!</translation> + </message> + <message numerus="yes"> + <location filename="../transactiontablemodel.cpp" line="297"/> + <source>Mined balance will be available in %n more blocks</source> + <translation> + <numerusform>%n blokk múlva lesz elérhető a bányászott egyenleg.</numerusform> + </translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="214"/> @@ -1379,14 +1417,9 @@ Cím: %4 <translation>Összeg</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="283"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline (%1 megerősítés)</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="289"/> - <source>Confirmed (%1 confirmations)</source> - <translation>Megerősítve (%1 megerősítés)</translation> + <location filename="../transactiontablemodel.cpp" line="280"/> + <source>Open until %1</source> + <translation>%1-ig megnyitva</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="286"/> @@ -1394,11 +1427,6 @@ Cím: %4 <translation>Megerősítetlen (%1 %2 megerősítésből)</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="303"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Ezt a blokkot egyetlen másik csomópont sem kapta meg, így valószínűleg nem lesz elfogadva!</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="306"/> <source>Generated but not accepted</source> <translation>Legenerálva, de még el nem fogadva.</translation> @@ -1458,13 +1486,6 @@ Cím: %4 <source>Address</source> <translation>Cím</translation> </message> - <message numerus="yes"> - <location filename="../transactiontablemodel.cpp" line="297"/> - <source>Mined balance will be available in %n more blocks</source> - <translation> - <numerusform>%n blokk múlva lesz elérhető a bányászott egyenleg.</numerusform> - </translation> - </message> <message> <location filename="../transactiontablemodel.cpp" line="351"/> <source>Received from</source> @@ -1474,11 +1495,6 @@ Cím: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="74"/> - <source>Sent to</source> - <translation>Erre a címre</translation> - </message> - <message> <location filename="../transactionview.cpp" line="61"/> <source>Range...</source> <translation>Tartomány ...</translation> @@ -1494,29 +1510,19 @@ Cím: %4 <translation>%1 fájlba való kiírás sikertelen.</translation> </message> <message> + <location filename="../transactionview.cpp" line="384"/> + <source>Range:</source> + <translation>Tartomány:</translation> + </message> + <message> <location filename="../transactionview.cpp" line="392"/> <source>to</source> <translation>meddig</translation> </message> <message> - <location filename="../transactionview.cpp" line="127"/> - <source>Edit label</source> - <translation>Címke szerkesztése</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="270"/> - <source>Export Transaction Data</source> - <translation>Tranzakció adatainak exportálása</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="271"/> - <source>Comma separated file (*.csv)</source> - <translation>Vesszővel elválasztott fájl (*.csv)</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="280"/> - <source>Date</source> - <translation>Dátum</translation> + <location filename="../transactionview.cpp" line="281"/> + <source>Type</source> + <translation>Típus</translation> </message> <message> <location filename="../transactionview.cpp" line="128"/> @@ -1540,16 +1546,16 @@ Cím: %4 <translation type="unfinished"></translation> </message> <message> + <location filename="../transactionview.cpp" line="127"/> + <source>Edit label</source> + <translation>Címke szerkesztése</translation> + </message> + <message> <location filename="../transactionview.cpp" line="279"/> <source>Confirmed</source> <translation>Megerősítve</translation> </message> <message> - <location filename="../transactionview.cpp" line="281"/> - <source>Type</source> - <translation>Típus</translation> - </message> - <message> <location filename="../transactionview.cpp" line="282"/> <source>Label</source> <translation>Címke</translation> @@ -1570,11 +1576,6 @@ Cím: %4 <translation>Azonosító</translation> </message> <message> - <location filename="../transactionview.cpp" line="77"/> - <source>Mined</source> - <translation>Kibányászva</translation> - </message> - <message> <location filename="../transactionview.cpp" line="289"/> <source>Error exporting</source> <translation>Hiba lépett fel exportálás közben</translation> @@ -1605,6 +1606,16 @@ Cím: %4 <translation>Ebben a hónapban</translation> </message> <message> + <location filename="../transactionview.cpp" line="77"/> + <source>Mined</source> + <translation>Kibányászva</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="57"/> + <source>This week</source> + <translation>Ezen a héten</translation> + </message> + <message> <location filename="../transactionview.cpp" line="59"/> <source>Last month</source> <translation>Múlt hónapban</translation> @@ -1615,30 +1626,40 @@ Cím: %4 <translation>Ebben az évben</translation> </message> <message> + <location filename="../transactionview.cpp" line="72"/> + <source>Received with</source> + <translation>Erre a címre</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="74"/> + <source>Sent to</source> + <translation>Erre a címre</translation> + </message> + <message> <location filename="../transactionview.cpp" line="76"/> <source>To yourself</source> <translation>Magadnak</translation> </message> <message> - <location filename="../transactionview.cpp" line="57"/> - <source>This week</source> - <translation>Ezen a héten</translation> + <location filename="../transactionview.cpp" line="270"/> + <source>Export Transaction Data</source> + <translation>Tranzakció adatainak exportálása</translation> </message> <message> - <location filename="../transactionview.cpp" line="72"/> - <source>Received with</source> - <translation>Erre a címre</translation> + <location filename="../transactionview.cpp" line="271"/> + <source>Comma separated file (*.csv)</source> + <translation>Vesszővel elválasztott fájl (*.csv)</translation> </message> <message> - <location filename="../transactionview.cpp" line="384"/> - <source>Range:</source> - <translation>Tartomány:</translation> + <location filename="../transactionview.cpp" line="280"/> + <source>Date</source> + <translation>Dátum</translation> </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>Küldés ...</translation> </message> @@ -1646,431 +1667,515 @@ Cím: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> + <location filename="../bitcoinstrings.cpp" line="41"/> <source>Bitcoin version</source> <translation>Bitcoin verzió</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> + <location filename="../bitcoinstrings.cpp" line="42"/> <source>Usage:</source> <translation>Használat:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> + <location filename="../bitcoinstrings.cpp" line="113"/> <source>Loading addresses...</source> <translation>Címek betöltése...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> + <location filename="../bitcoinstrings.cpp" line="115"/> <source>Loading block index...</source> <translation>Blokkindex betöltése...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> - <source>Done loading</source> - <translation>Betöltés befejezve.</translation> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> - <source>Rescanning...</source> - <translation>Újraszkennelés...</translation> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">Hiba: nem sikerült létrehozni a tranzakciót.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>Az %s adatkönyvtár nem zárható. A Bitcoin valószínűleg fut már.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Loading wallet...</source> + <translation>Tárca betöltése...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> + <location filename="../bitcoinstrings.cpp" line="123"/> <source>Cannot initialize keypool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> + <location filename="../bitcoinstrings.cpp" line="124"/> <source>Cannot write default address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>Done loading</source> + <translation>Betöltés befejezve.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source>Rescanning...</source> + <translation>Újraszkennelés...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="129"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation>Figyelem: a -paytxfee nagyon magas. Ennyi tranzakciós díjat fogsz fizetni, ha elküldöd a tranzakciót.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation>Hiba: CreateThread(StartNode) sikertelen</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> + <location filename="../bitcoinstrings.cpp" line="128"/> <source>Invalid amount for -paytxfee=<amount></source> <translation>Étvénytelen -paytxfee=<összeg> összeg</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> + <location filename="../bitcoinstrings.cpp" line="20"/> <source>Warning: Disk space is low</source> <translation>Figyelem: kevés a hely a lemezen</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> + <location filename="../bitcoinstrings.cpp" line="133"/> <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> <translation>A %d port nem elérhető ezen a gépen. A Bitcoin valószínűleg fut már.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> - <source>Loading wallet...</source> - <translation>Tárca betöltése...</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="99"/> + <location filename="../bitcoinstrings.cpp" line="38"/> <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> <translation>Figyelem: Ellenőrizd, hogy helyesen van-e beállítva a gépeden a dátum és az idő. A Bitcoin nem fog megfelelően működni, ha rosszul van beállítvaaz órád.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation>Érvénytelen -proxy cím</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> + <location filename="../bitcoinstrings.cpp" line="43"/> <source>Send command to -server or bitcoind</source> <translation>Parancs küldése a -serverhez vagy a bitcoindhez </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>Étvénytelen összeg</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation>Hiba</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="44"/> <source>List commands</source> <translation>Parancsok kilistázása </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> + <location filename="../bitcoinstrings.cpp" line="45"/> <source>Get help for a command</source> <translation>Segítség egy parancsról </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> + <location filename="../bitcoinstrings.cpp" line="46"/> <source>Options:</source> <translation>Opciók </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> + <location filename="../bitcoinstrings.cpp" line="47"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Konfigurációs fájl (alapértelmezett: bitcoin.conf) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> + <location filename="../bitcoinstrings.cpp" line="48"/> <source>Specify pid file (default: bitcoind.pid)</source> <translation>pid-fájl (alapértelmezett: bitcoind.pid) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> + <location filename="../bitcoinstrings.cpp" line="49"/> <source>Generate coins</source> <translation>Érmék generálása </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> + <location filename="../bitcoinstrings.cpp" line="50"/> <source>Don't generate coins</source> <translation>Bitcoin-generálás leállítása </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> + <location filename="../bitcoinstrings.cpp" line="52"/> <source>Show splash screen on startup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> + <location filename="../bitcoinstrings.cpp" line="53"/> <source>Specify data directory</source> <translation>Adatkönyvtár </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> + <location filename="../bitcoinstrings.cpp" line="54"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="56"/> <source>Specify connection timeout (in milliseconds)</source> <translation>Csatlakozás időkerete (milliszekundumban) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> + <location filename="../bitcoinstrings.cpp" line="60"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> + <location filename="../bitcoinstrings.cpp" line="63"/> <source>Find peers using internet relay chat (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> + <location filename="../bitcoinstrings.cpp" line="65"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> + <location filename="../bitcoinstrings.cpp" line="66"/> <source>Find peers using DNS lookup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> + <location filename="../bitcoinstrings.cpp" line="67"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> + <location filename="../bitcoinstrings.cpp" line="68"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="81"/> <source>Output extra debugging information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> + <location filename="../bitcoinstrings.cpp" line="82"/> <source>Prepend debug output with timestamp</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> + <location filename="../bitcoinstrings.cpp" line="83"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> + <location filename="../bitcoinstrings.cpp" line="84"/> <source>Send trace/debug info to debugger</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> + <location filename="../bitcoinstrings.cpp" line="90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> + <location filename="../bitcoinstrings.cpp" line="93"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> + <location filename="../bitcoinstrings.cpp" line="96"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> + <location filename="../bitcoinstrings.cpp" line="97"/> <source>How thorough the block verification is (0-6, default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="76"/> + <location filename="../bitcoinstrings.cpp" line="114"/> <source>Error loading addr.dat</source> <translation>Hiba az addr.dat betöltése közben</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> + <location filename="../bitcoinstrings.cpp" line="116"/> <source>Error loading blkindex.dat</source> <translation>Hiba az blkindex.dat betöltése közben</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> + <location filename="../bitcoinstrings.cpp" line="118"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Hiba a wallet.dat betöltése közben: meghibásodott tárca</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> + <location filename="../bitcoinstrings.cpp" line="120"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> + <location filename="../bitcoinstrings.cpp" line="121"/> <source>Error loading wallet.dat</source> <translation>Hiba az wallet.dat betöltése közben</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> + <location filename="../bitcoinstrings.cpp" line="80"/> + <source>Use the test network</source> + <translation>Teszthálózat használata +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="85"/> <source>Username for JSON-RPC connections</source> <translation>Felhasználói név JSON-RPC csatlakozásokhoz </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> + <location filename="../bitcoinstrings.cpp" line="86"/> <source>Password for JSON-RPC connections</source> <translation>Jelszó JSON-RPC csatlakozásokhoz </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> - <source>Run in the background as a daemon and accept commands</source> - <translation>Háttérben futtatás daemonként és parancsok elfogadása -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>Parancsok küldése <ip> címen működő csomóponthoz (alapértelmezett: 127.0.0.1) + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>Kulcskarika mérete <n> (alapértelmezett: 100) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> + <location filename="../bitcoinstrings.cpp" line="103"/> <source>Server private key (default: server.pem)</source> <translation>Szerver titkos kulcsa (alapértelmezett: server.pem) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> - <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>OpenSSL (https) használata JSON-RPC csatalkozásokhoz -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="44"/> - <source>Use the test network</source> - <translation>Teszthálózat használata -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="58"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation>Kulcskarika mérete <n> (alapértelmezett: 100) + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>JSON-RPC csatlakozásokhoz figyelendő <port> (alapértelmezett: 8332) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> - <source>Rescan the block chain for missing wallet transactions</source> - <translation>Blokklánc újraszkennelése hiányzó tárca-tranzakciók után + <location filename="../bitcoinstrings.cpp" line="102"/> + <source>Server certificate file (default: server.cert)</source> + <translation>Szervertanúsítvány-fájl (alapértelmezett: server.cert) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> - <source>Server certificate file (default: server.cert)</source> - <translation>Szervertanúsítvány-fájl (alapértelmezett: server.cert) + <location filename="../bitcoinstrings.cpp" line="88"/> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation>JSON-RPC csatlakozások engedélyezése meghatározott IP-címről </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> + <location filename="../bitcoinstrings.cpp" line="51"/> <source>Start minimized</source> <translation>Indítás lekicsinyítve </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Allow DNS lookups for addnode and connect</source> - <translation>DNS-kikeresés engedélyezése az addnode-nál és a connect-nél + <location filename="../bitcoinstrings.cpp" line="107"/> + <source>This help message</source> + <translation>Ez a súgó-üzenet </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation>Csatlakozásokhoz figyelendő <port> (alapértelmezett: 8333 or testnet: 18333)</translation> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>Elfogadható rejtjelkulcsok (alapértelmezett: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH ) +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> + <location filename="../bitcoinstrings.cpp" line="57"/> <source>Connect through socks4 proxy</source> <translation>Csatlakozás SOCKS4 proxyn keresztül </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> - <source>This help message</source> - <translation>Ez a súgó-üzenet + <location filename="../bitcoinstrings.cpp" line="98"/> + <source> +SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation> +SSL-opciók: (lásd a Bitcoin Wiki SSL-beállítási instrukcióit) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Connect only to the specified node</source> - <translation>Csatlakozás csak a megadott csomóponthoz -</translation> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>Nincs elég bitcoinod.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Use Universal Plug and Play to map the listening port (default: 1)</source> - <translation type="unfinished">UPnP-használat engedélyezése a figyelő port feltérképezésénél (default: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="119"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> + <translation>Hiba a wallet.dat betöltése közben: ehhez a tárcához újabb verziójú Bitcoin-kliens szükséges</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Use Universal Plug and Play to map the listening port (default: 0)</source> - <translation type="unfinished">UPnP-használat engedélyezése a figyelő port feltérképezésénél (default: 0)</translation> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Küldés...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> - <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation> -SSL-opciók: (lásd a Bitcoin Wiki SSL-beállítási instrukcióit) -</translation> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">Hiba: a tranzakciót elutasították. Ezt az okozhatja, ha már elköltöttél valamennyi érmét a tárcádból például ha a wallet.dat-od egy másolatát használtad, és így az elköltés csak abban lett jelölve, de itt nem.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>béta</translation> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation>Hiba a wallet.dat betöltése közben: ehhez a tárcához újabb verziójú Bitcoin-kliens szükséges</translation> + <location filename="../bitcoinstrings.cpp" line="58"/> + <source>Allow DNS lookups for addnode and connect</source> + <translation>DNS-kikeresés engedélyezése az addnode-nál és a connect-nél +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> + <location filename="../bitcoinstrings.cpp" line="59"/> + <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> + <translation>Csatlakozásokhoz figyelendő <port> (alapértelmezett: 8333 or testnet: 18333)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Elérendő csomópont megadása and attempt to keep the connection open</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> + <location filename="../bitcoinstrings.cpp" line="62"/> + <source>Connect only to the specified node</source> + <translation>Csatlakozás csak a megadott csomóponthoz +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="73"/> + <source>Use Universal Plug and Play to map the listening port (default: 1)</source> + <translation type="unfinished">UPnP-használat engedélyezése a figyelő port feltérképezésénél (default: 1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="74"/> + <source>Use Universal Plug and Play to map the listening port (default: 0)</source> + <translation type="unfinished">UPnP-használat engedélyezése a figyelő port feltérképezésénél (default: 0)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> <source>Fee per KB to add to transactions you send</source> <translation>kB-onként felajánlandó díj az általad küldött tranzakciókhoz</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> + <location filename="../bitcoinstrings.cpp" line="78"/> <source>Accept command line and JSON-RPC commands</source> <translation>Parancssoros és JSON-RPC parancsok elfogadása </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation>JSON-RPC csatlakozásokhoz figyelendő <port> (alapértelmezett: 8332) + <location filename="../bitcoinstrings.cpp" line="79"/> + <source>Run in the background as a daemon and accept commands</source> + <translation>Háttérben futtatás daemonként és parancsok elfogadása </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Allow JSON-RPC connections from specified IP address</source> - <translation>JSON-RPC csatlakozások engedélyezése meghatározott IP-címről + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>Parancsok küldése <ip> címen működő csomóponthoz (alapértelmezett: 127.0.0.1) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>Elfogadható rejtjelkulcsok (alapértelmezett: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH ) + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation>Blokklánc újraszkennelése hiányzó tárca-tranzakciók után +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="101"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>OpenSSL (https) használata JSON-RPC csatalkozásokhoz </translation> </message> + <message> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation>Használat</translation> + </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts index d9510a729f..f0c529c937 100644 --- a/src/qt/locale/bitcoin_it.ts +++ b/src/qt/locale/bitcoin_it.ts @@ -15,7 +15,7 @@ <translation>Versione di <b>Bitcoin</b></translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -55,32 +55,17 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Crea un nuovo indirizzo</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> - <source>Copy address</source> - <translation>Copia l'indirizzo</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="62"/> - <source>Copy label</source> - <translation>Copia l'etichetta</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="64"/> - <source>Delete</source> - <translation>Cancella</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation>Testo CSV (*.csv)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>Errore nell'esportazione</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation>Impossibile scrivere sul file %1.</translation> </message> @@ -110,6 +95,11 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Firma il &messaggio</translation> </message> <message> + <location filename="../forms/addressbookpage.ui" line="110"/> + <source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source> + <translation>Cancella l'indirizzo attualmente selezionato dalla lista. Solo indirizzi d'invio possono essere cancellati.</translation> + </message> + <message> <location filename="../forms/addressbookpage.ui" line="113"/> <source>&Delete</source> <translation>&Cancella</translation> @@ -120,25 +110,40 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Firma un messaggio per dimostrare di possedere questo indirizzo</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="110"/> - <source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source> - <translation>Cancella l'indirizzo attualmente selezionato dalla lista. Solo indirizzi d'invio possono essere cancellati.</translation> + <location filename="../addressbookpage.cpp" line="65"/> + <source>Copy address</source> + <translation>Copia l'indirizzo</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> - <source>Export Address Book Data</source> - <translation>Esporta gli indirizzi della rubrica</translation> + <location filename="../addressbookpage.cpp" line="66"/> + <source>Copy label</source> + <translation>Copia l'etichetta</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation>Modifica</translation> </message> + <message> + <location filename="../addressbookpage.cpp" line="68"/> + <source>Delete</source> + <translation>Cancella</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="285"/> + <source>Export Address Book Data</source> + <translation>Esporta gli indirizzi della rubrica</translation> + </message> </context> <context> <name>AddressTableModel</name> <message> <location filename="../addresstablemodel.cpp" line="78"/> + <source>Label</source> + <translation>Etichetta</translation> + </message> + <message> + <location filename="../addresstablemodel.cpp" line="78"/> <source>Address</source> <translation>Indirizzo</translation> </message> @@ -147,11 +152,6 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <source>(no label)</source> <translation>(nessuna etichetta)</translation> </message> - <message> - <location filename="../addresstablemodel.cpp" line="78"/> - <source>Label</source> - <translation>Etichetta</translation> - </message> </context> <context> <name>AskPassphraseDialog</name> @@ -161,9 +161,9 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Quest'operazione necessita della passphrase per sbloccare il portamonete.</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="75"/> - <source>Repeat new passphrase</source> - <translation>Ripeti la passphrase</translation> + <location filename="../forms/askpassphrasedialog.ui" line="47"/> + <source>Enter passphrase</source> + <translation>Inserisci la passphrase</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="126"/> @@ -174,24 +174,25 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Cifratura del portamonete fallita</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="34"/> - <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>Inserisci la passphrase per il portamonete.<br/>Per piacere usare unapassphrase di <b>10 o più caratteri casuali</b>, o <b>otto o più parole</b>.</translation> + <location filename="../forms/askpassphrasedialog.ui" line="61"/> + <source>New passphrase</source> + <translation>Nuova passphrase</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="26"/> - <source>Dialog</source> - <translation>Dialogo</translation> + <location filename="../forms/askpassphrasedialog.ui" line="75"/> + <source>Repeat new passphrase</source> + <translation>Ripeti la passphrase</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="47"/> - <source>Enter passphrase</source> - <translation>Inserisci la passphrase</translation> + <location filename="../askpassphrasedialog.cpp" line="111"/> + <location filename="../askpassphrasedialog.cpp" line="169"/> + <source>Wallet encrypted</source> + <translation>Portamonete cifrato</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="61"/> - <source>New passphrase</source> - <translation>Nuova passphrase</translation> + <location filename="../forms/askpassphrasedialog.ui" line="26"/> + <source>Dialog</source> + <translation>Dialogo</translation> </message> <message> <location filename="../forms/askpassphrasedialog.ui" line="94"/> @@ -199,12 +200,27 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Etichetta</translation> </message> <message> + <location filename="../askpassphrasedialog.cpp" line="127"/> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Cifratura del portamonete fallita a causa di un errore interno. Il portamonete non è stato cifrato.</translation> + </message> + <message> <location filename="../askpassphrasedialog.cpp" line="134"/> <location filename="../askpassphrasedialog.cpp" line="182"/> <source>The supplied passphrases do not match.</source> <translation>Le passphrase inserite non corrispondono.</translation> </message> <message> + <location filename="../askpassphrasedialog.cpp" line="51"/> + <source>Decrypt wallet</source> + <translation>Decifra il portamonete</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="54"/> + <source>Change passphrase</source> + <translation>Cambia la passphrase</translation> + </message> + <message> <location filename="../askpassphrasedialog.cpp" line="35"/> <source>Encrypt wallet</source> <translation>Cifra il portamonete</translation> @@ -215,19 +231,11 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Sblocca il portamonete</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="54"/> - <source>Change passphrase</source> - <translation>Cambia la passphrase</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="55"/> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Inserisci la vecchia e la nuova passphrase per il portamonete.</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="113"/> - <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> - <translation>Bitcoin verrà ora chiuso per finire il processo di crittazione. Ricorda che criptare il tuo portamonete non può fornire una protezione totale contro furti causati da malware che dovessero infettare il tuo computer.</translation> + <location filename="../askpassphrasedialog.cpp" line="146"/> + <location filename="../askpassphrasedialog.cpp" line="157"/> + <location filename="../askpassphrasedialog.cpp" line="176"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>La passphrase inserita per la decifrazione del portamonete è errata.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="46"/> @@ -235,20 +243,16 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Quest'operazione necessita della passphrase per decifrare il portamonete,</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="51"/> - <source>Decrypt wallet</source> - <translation>Decifra il portamonete</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="111"/> - <location filename="../askpassphrasedialog.cpp" line="169"/> - <source>Wallet encrypted</source> - <translation>Portamonete cifrato</translation> + <location filename="../askpassphrasedialog.cpp" line="55"/> + <source>Enter the old and new passphrase to the wallet.</source> + <translation>Inserisci la vecchia e la nuova passphrase per il portamonete.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="101"/> - <source>Confirm wallet encryption</source> - <translation>Conferma la cifratura del portamonete</translation> + <location filename="../askpassphrasedialog.cpp" line="102"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! +Are you sure you wish to encrypt your wallet?</source> + <translation>ATTENZIONE: se si cifra il portamonete e si perde la frase d'ordine, <b>SI PERDERANNO TUTTI I PROPRI BITCOIN</b>! +Si è sicuri di voler cifrare il portamonete?</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="117"/> @@ -261,11 +265,9 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Sblocco del portamonete fallito</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="146"/> - <location filename="../askpassphrasedialog.cpp" line="157"/> - <location filename="../askpassphrasedialog.cpp" line="176"/> - <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation>La passphrase inserita per la decifrazione del portamonete è errata.</translation> + <location filename="../askpassphrasedialog.cpp" line="113"/> + <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>Bitcoin verrà ora chiuso per finire il processo di crittazione. Ricorda che criptare il tuo portamonete non può fornire una protezione totale contro furti causati da malware che dovessero infettare il tuo computer.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="156"/> @@ -273,6 +275,16 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <translation>Decifrazione del portamonete fallita</translation> </message> <message> + <location filename="../askpassphrasedialog.cpp" line="34"/> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>Inserisci la passphrase per il portamonete.<br/>Per piacere usare unapassphrase di <b>10 o più caratteri casuali</b>, o <b>otto o più parole</b>.</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="101"/> + <source>Confirm wallet encryption</source> + <translation>Conferma la cifratura del portamonete</translation> + </message> + <message> <location filename="../askpassphrasedialog.cpp" line="170"/> <source>Wallet passphrase was successfully changed.</source> <translation>Passphrase del portamonete modificata con successo.</translation> @@ -283,260 +295,265 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso <source>Warning: The Caps Lock key is on.</source> <translation>Attenzione: tasto Blocco maiuscole attivo.</translation> </message> +</context> +<context> + <name>BitcoinGUI</name> <message> - <location filename="../askpassphrasedialog.cpp" line="102"/> - <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! -Are you sure you wish to encrypt your wallet?</source> - <translation>ATTENZIONE: se si cifra il portamonete e si perde la frase d'ordine, <b>SI PERDERANNO TUTTI I PROPRI BITCOIN</b>! -Si è sicuri di voler cifrare il portamonete?</translation> + <location filename="../bitcoingui.cpp" line="191"/> + <source>&Transactions</source> + <translation>&Transazioni</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="127"/> - <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>Cifratura del portamonete fallita a causa di un errore interno. Il portamonete non è stato cifrato.</translation> + <location filename="../bitcoingui.cpp" line="236"/> + <source>Quit application</source> + <translation>Chiudi applicazione</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="303"/> + <source>Tabs toolbar</source> + <translation>Barra degli strumenti "Tabs"</translation> </message> -</context> -<context> - <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="203"/> + <source>&Receive coins</source> + <translation>&Ricevi monete</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation>Mostra la lista di indirizzi su cui ricevere pagamenti</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="187"/> - <source>&Overview</source> - <translation>&Sintesi</translation> + <location filename="../bitcoingui.cpp" line="258"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>Cambia la passphrase per la cifratura del portamonete</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> - <source>&Transactions</source> - <translation>&Transazioni</translation> + <location filename="../bitcoingui.cpp" line="71"/> + <source>Bitcoin Wallet</source> + <translation>Portamonete di bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> + <location filename="../bitcoingui.cpp" line="185"/> + <source>&Overview</source> + <translation>&Sintesi</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="197"/> <source>&Address Book</source> <translation>&Rubrica</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> + <location filename="../bitcoingui.cpp" line="198"/> <source>Edit the list of stored addresses and labels</source> <translation>Modifica la lista degli indirizzi salvati e delle etichette</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> + <location filename="../bitcoingui.cpp" line="209"/> <source>&Send coins</source> <translation>&Invia monete</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="255"/> + <location filename="../bitcoingui.cpp" line="253"/> <source>Encrypt or decrypt wallet</source> <translation>Cifra o decifra il portamonete</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="73"/> - <source>Bitcoin Wallet</source> - <translation>Portamonete di bitcoin</translation> + <location filename="../bitcoingui.cpp" line="252"/> + <source>&Encrypt Wallet</source> + <translation>&Cifra il portamonete</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> + <location filename="../bitcoingui.cpp" line="240"/> <source>Show information about Bitcoin</source> <translation>Mostra informazioni su Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> - <source>Tabs toolbar</source> - <translation>Barra degli strumenti "Tabs"</translation> + <location filename="../bitcoingui.cpp" line="243"/> + <source>Show information about Qt</source> + <translation>Mostra informazioni su Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> - <source>&Receive coins</source> - <translation>&Ricevi monete</translation> + <location filename="../bitcoingui.cpp" line="250"/> + <source>&Export...</source> + <translation>&Esporta...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> - <source>Change the passphrase used for wallet encryption</source> - <translation>Cambia la passphrase per la cifratura del portamonete</translation> + <location filename="../bitcoingui.cpp" line="327"/> + <source>[testnet]</source> + <translation>[testnet]</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> - <source>E&xit</source> - <translation>&Esci</translation> + <location filename="../bitcoingui.cpp" line="242"/> + <source>About &Qt</source> + <translation>Informazioni su &Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> - <source>Quit application</source> - <translation>Chiudi applicazione</translation> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation>Mostra o nascondi la finestra Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation>&Cifra il portamonete</translation> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation>Bitcoin client</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> - <source>About &Qt</source> - <translation>Informazioni su &Qt</translation> + <location filename="../bitcoingui.cpp" line="251"/> + <source>Export the data in the current tab to a file</source> + <translation>Esporta i dati nella tabella corrente su un file</translation> </message> - <message> - <location filename="../bitcoingui.cpp" line="329"/> - <source>[testnet]</source> - <translation>[testnet]</translation> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="482"/> + <source>%n active connection(s) to Bitcoin network</source> + <translation> + <numerusform>%n connessione attiva alla rete Bitcoin</numerusform> + <numerusform>%n connessioni attive alla rete Bitcoin</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> - <source>Export the data in the current tab to a file</source> - <translation>Esporta i dati nella tabella corrente su un file</translation> + <location filename="../bitcoingui.cpp" line="256"/> + <source>Backup wallet to another location</source> + <translation>Backup portamonete in un'altra locazione</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> + <location filename="../bitcoingui.cpp" line="245"/> <source>&Options...</source> <translation>&Opzioni...</translation> </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation> + <numerusform>~%n blocco rimanente</numerusform> + <numerusform>~%n blocchi rimanenti</numerusform> + </translation> + </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> - <source>Backup wallet to another location</source> - <translation>Backup portamonete in un'altra locazione</translation> + <location filename="../bitcoingui.cpp" line="186"/> + <source>Show general overview of wallet</source> + <translation>Mostra lo stato generale del portamonete</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>&Cambia la passphrase</translation> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>Scaricati %1 di %2 blocchi dello storico delle transazioni ( il %3% )</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> + <location filename="../bitcoingui.cpp" line="506"/> <source>Synchronizing with network...</source> <translation>Sto sincronizzando con la rete...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> - <translation>&Esporta...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="194"/> - <source>Browse transaction history</source> - <translation>Cerca nelle transazioni</translation> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation>Mostra/Nascondi &Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> + <location filename="../bitcoingui.cpp" line="210"/> <source>Send coins to a bitcoin address</source> <translation>Invia monete ad un indirizzo bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> + <location filename="../bitcoingui.cpp" line="215"/> <source>Sign &message</source> <translation>Firma il &messaggio</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> + <location filename="../bitcoingui.cpp" line="216"/> <source>Prove you control an address</source> <translation>Dimostra di controllare un indirizzo</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> - <source>&File</source> - <translation>&File</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="292"/> - <source>&Settings</source> - <translation>&Impostazioni</translation> + <location filename="../bitcoingui.cpp" line="235"/> + <source>E&xit</source> + <translation>&Esci</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> - <source>&Help</source> - <translation>&Aiuto</translation> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>&Informazioni su %1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> - <source>Show information about Qt</source> - <translation>Mostra informazioni su Qt</translation> + <location filename="../bitcoingui.cpp" line="281"/> + <source>&File</source> + <translation>&File</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> + <location filename="../bitcoingui.cpp" line="632"/> <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Backup Wallet</source> <translation>Backup Portamonete</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation>Dati Portamonete (*.dat)</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation>Backup fallito</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation>C'è stato un errore tentanto di salvare i dati del portamonete in un'altra locazione</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>Apri &Bitcoin</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>sincronizzazione della catena di blocchi in corso</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>&Informazioni su %1</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>Modifica configurazione opzioni per bitcoin</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Mostra la finestra Bitcoin</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="257"/> + <location filename="../bitcoingui.cpp" line="255"/> <source>&Backup Wallet</source> <translation type="unfinished">Backup Portamonete</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> - <source>bitcoin-qt</source> - <translation>bitcoin-qt</translation> - </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> - <source>%n active connection(s) to Bitcoin network</source> - <translation> - <numerusform></numerusform> - <numerusform></numerusform> - </translation> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation>&Cambia la passphrase</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> + <location filename="../bitcoingui.cpp" line="531"/> <source>Downloaded %1 blocks of transaction history.</source> <translation>Scaricati %1 blocchi dello storico transazioni.</translation> </message> + <message> + <location filename="../bitcoingui.cpp" line="290"/> + <source>&Settings</source> + <translation>&Impostazioni</translation> + </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation> <numerusform>%n secondo fa</numerusform> <numerusform>%n secondi fa</numerusform> </translation> </message> + <message> + <location filename="../bitcoingui.cpp" line="314"/> + <source>Actions toolbar</source> + <translation>Barra degli strumenti "Azioni"</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="192"/> + <source>Browse transaction history</source> + <translation>Cerca nelle transazioni</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>Modifica configurazione opzioni per bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="418"/> + <source>bitcoin-qt</source> + <translation>bitcoin-qt</translation> + </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation> <numerusform>%n minuto fa</numerusform> @@ -544,7 +561,7 @@ Si è sicuri di voler cifrare il portamonete?</translation> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation> <numerusform>%n ora fa</numerusform> @@ -552,7 +569,7 @@ Si è sicuri di voler cifrare il portamonete?</translation> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>%n giorno fa</numerusform> @@ -560,32 +577,32 @@ Si è sicuri di voler cifrare il portamonete?</translation> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation>Aggiornato</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>In aggiornamento...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation>L'ultimo blocco ricevuto è stato generato %1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> + <location filename="../bitcoingui.cpp" line="663"/> <source>Sent transaction</source> <translation>Transazione inviata</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> + <location filename="../bitcoingui.cpp" line="664"/> <source>Incoming transaction</source> <translation>Transazione ricevuta</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -599,37 +616,27 @@ Indirizzo: %4 </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Il portamonete è <b>cifrato</b> e attualmente <b>sbloccato</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Il portamonete è <b>cifrato</b> e attualmente <b>bloccato</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> + <location filename="../bitcoingui.cpp" line="636"/> <source>Sending...</source> <translation>Invio...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>Scaricati %1 dei %2 blocchi dello storico transazioni.</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="188"/> - <source>Show general overview of wallet</source> - <translation>Mostra lo stato generale del portamonete</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="316"/> - <source>Actions toolbar</source> - <translation>Barra degli strumenti "Azioni"</translation> + <location filename="../bitcoingui.cpp" line="296"/> + <source>&Help</source> + <translation>&Aiuto</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -637,22 +644,22 @@ Indirizzo: %4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&Unità di misura degli importi in: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>Scegli l'unità di suddivisione di default per l'interfaccia e per l'invio di monete</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&Mostra gli indirizzi nella lista delle transazioni</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished"></translation> </message> @@ -728,122 +735,137 @@ Indirizzo: %4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>&Fai partire Bitcoin all'avvio del sistema</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Avvia automaticamente Bitcoin all'accensione del computer</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>&Minimizza sul tray invece che sulla barra delle applicazioni</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>Mostra solo un'icona nel tray quando si minimizza la finestra</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> + <location filename="../optionsdialog.cpp" line="185"/> <source>Map port using &UPnP</source> <translation>Mappa le porte tramite l'&UPnP</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="180"/> <source>M&inimize on close</source> <translation>M&inimizza alla chiusura</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="181"/> + <location filename="../optionsdialog.cpp" line="186"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Apri automaticamente la porta del client Bitcoin sul router. Questo funziona solo se il router supporta UPnP ed è abilitato.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="186"/> + <location filename="../optionsdialog.cpp" line="181"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>Riduci ad icona, invece di uscire dall'applicazione quando la finestra viene chiusa. Quando questa opzione è attivata, l'applicazione verrà chiusa solo dopo aver selezionato Esci nel menu.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>&Collegati tramite SOCKS4 proxy:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Connettiti alla rete Bitcon attraverso un proxy SOCKS4 (ad esempio quando ci si collega via Tor)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>&IP del proxy: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>Indirizzo IP del proxy (ad esempio 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>&Porta: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Porta del proxy (es. 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>Commissione di transazione per kB; è opzionale e contribuisce ad assicurare che le transazioni siano elaborate velocemente. Le transazioni sono per la maggior parte da 1 kB. Commissione raccomandata 0,01.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>Paga la &commissione</translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessagePage</name> <message> - <location filename="../messagepage.cpp" line="101"/> - <source>Sign failed</source> - <translation>Firma non riuscita</translation> - </message> - <message> <location filename="../forms/messagepage.ui" line="105"/> <source>Click "Sign Message" to get signature</source> <translation>Clicca "Firma il messaggio" per ottenere la firma</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="38"/> - <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished">Inserisci un indirizzo Bitcoin (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> <location filename="../forms/messagepage.ui" line="48"/> <source>Choose adress from address book</source> <translation>Scegli l'indirizzo dalla rubrica</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="71"/> - <source>Paste address from clipboard</source> - <translation>Incollare l'indirizzo dagli appunti</translation> + <location filename="../forms/messagepage.ui" line="93"/> + <source>Enter the message you want to sign here</source> + <translation>Inserisci qui il messaggio che vuoi firmare</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="81"/> - <source>Alt+P</source> - <translation>Alt+P</translation> + <location filename="../forms/messagepage.ui" line="58"/> + <source>Alt+A</source> + <translation>Alt+A</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="93"/> - <source>Enter the message you want to sign here</source> - <translation>Inserisci qui il messaggio che vuoi firmare</translation> + <location filename="../forms/messagepage.ui" line="117"/> + <source>Sign a message to prove you own this address</source> + <translation>Firma un messaggio per dimostrare di possedere questo indirizzo</translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="120"/> + <source>&Sign Message</source> + <translation>&Firma il messaggio</translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="131"/> + <source>Copy the current signature to the system clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="134"/> + <source>&Copy to Clipboard</source> + <translation>&Copia nella clipboard</translation> </message> <message> <location filename="../messagepage.cpp" line="74"/> @@ -863,6 +885,11 @@ Indirizzo: %4 <translation>La chiave privata per %1 non è disponibile.</translation> </message> <message> + <location filename="../messagepage.cpp" line="101"/> + <source>Sign failed</source> + <translation>Firma non riuscita</translation> + </message> + <message> <location filename="../forms/messagepage.ui" line="14"/> <source>Message</source> <translation>Messaggio</translation> @@ -873,45 +900,35 @@ Indirizzo: %4 <translation>Puoi firmare messeggi con i tuoi indirizzi per dimostrare che sono tuoi. Fai attenzione a non firmare niente di vago, visto che gli attacchi di phishing potrebbero cercare di spingerti a mettere la tua firma su di loro. Firma solo dichiarazioni completamente dettagliate con cui sei d'accordo.</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="58"/> - <source>Alt+A</source> - <translation>Alt+A</translation> - </message> - <message> - <location filename="../forms/messagepage.ui" line="117"/> - <source>Sign a message to prove you own this address</source> - <translation>Firma un messaggio per dimostrare di possedere questo indirizzo</translation> - </message> - <message> - <location filename="../forms/messagepage.ui" line="120"/> - <source>&Sign Message</source> - <translation>&Firma il messaggio</translation> + <location filename="../forms/messagepage.ui" line="38"/> + <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished">Inserisci un indirizzo Bitcoin (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="131"/> - <source>Copy the current signature to the system clipboard</source> - <translation type="unfinished"></translation> + <location filename="../forms/messagepage.ui" line="71"/> + <source>Paste address from clipboard</source> + <translation>Incollare l'indirizzo dagli appunti</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="134"/> - <source>&Copy to Clipboard</source> - <translation>&Copia nella clipboard</translation> + <location filename="../forms/messagepage.ui" line="81"/> + <source>Alt+P</source> + <translation>Alt+P</translation> </message> </context> <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>Principale</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>Mostra</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>Opzioni</translation> </message> @@ -919,14 +936,19 @@ Indirizzo: %4 <context> <name>OverviewPage</name> <message> - <location filename="../overviewpage.cpp" line="108"/> - <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> - <translation>Totale delle transazioni in corso di conferma, che non sono ancora incluse nel saldo attuale</translation> + <location filename="../forms/overviewpage.ui" line="61"/> + <source>0</source> + <translation>0</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="14"/> - <source>Form</source> - <translation>Modulo</translation> + <location filename="../forms/overviewpage.ui" line="88"/> + <source>Wallet</source> + <translation>Portamonete</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="124"/> + <source><b>Recent transactions</b></source> + <translation><b>Transazioni recenti</b></translation> </message> <message> <location filename="../forms/overviewpage.ui" line="40"/> @@ -934,34 +956,29 @@ Indirizzo: %4 <translation>Saldo</translation> </message> <message> + <location filename="../forms/overviewpage.ui" line="14"/> + <source>Form</source> + <translation>Modulo</translation> + </message> + <message> <location filename="../forms/overviewpage.ui" line="54"/> <source>Number of transactions:</source> <translation>Numero di transazioni:</translation> </message> <message> - <location filename="../overviewpage.cpp" line="103"/> - <source>Your current balance</source> - <translation>Saldo attuale</translation> - </message> - <message> - <location filename="../forms/overviewpage.ui" line="61"/> - <source>0</source> - <translation>0</translation> - </message> - <message> <location filename="../forms/overviewpage.ui" line="68"/> <source>Unconfirmed:</source> <translation>Non confermato:</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="88"/> - <source>Wallet</source> - <translation>Portamonete</translation> + <location filename="../overviewpage.cpp" line="103"/> + <source>Your current balance</source> + <translation>Saldo attuale</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="124"/> - <source><b>Recent transactions</b></source> - <translation><b>Transazioni recenti</b></translation> + <location filename="../overviewpage.cpp" line="108"/> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> + <translation>Totale delle transazioni in corso di conferma, che non sono ancora incluse nel saldo attuale</translation> </message> <message> <location filename="../overviewpage.cpp" line="111"/> @@ -977,29 +994,39 @@ Indirizzo: %4 <translation>Importo:</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> - <source>Error encoding URI into QR Code.</source> - <translation type="unfinished"></translation> + <location filename="../forms/qrcodedialog.ui" line="144"/> + <source>Message:</source> + <translation>Messaggio:</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> - <source>PNG Images (*.png)</source> - <translation>Immagini PNG (*.png)</translation> + <location filename="../forms/qrcodedialog.ui" line="186"/> + <source>&Save As...</source> + <translation>&Salva come...</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> - <source>Save Image...</source> + <location filename="../forms/qrcodedialog.ui" line="32"/> + <source>QR Code</source> + <translation>Codice QR</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="105"/> + <source>BTC</source> + <translation>BTC</translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="46"/> + <source>Error encoding URI into QR Code.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="121"/> - <source>Label:</source> - <translation>Etichetta:</translation> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>L'URI risulta troppo lungo, prova a ridurre il testo nell'etichetta / messaggio.</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="55"/> - <source>Request Payment</source> - <translation>Richiedi pagamento</translation> + <location filename="../qrcodedialog.cpp" line="121"/> + <source>Save Image...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../forms/qrcodedialog.ui" line="14"/> @@ -1007,39 +1034,24 @@ Indirizzo: %4 <translation>Dialogo</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="32"/> - <source>QR Code</source> - <translation>Codice QR</translation> - </message> - <message> - <location filename="../forms/qrcodedialog.ui" line="105"/> - <source>BTC</source> - <translation>BTC</translation> + <location filename="../forms/qrcodedialog.ui" line="55"/> + <source>Request Payment</source> + <translation>Richiedi pagamento</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="144"/> - <source>Message:</source> - <translation>Messaggio:</translation> + <location filename="../forms/qrcodedialog.ui" line="121"/> + <source>Label:</source> + <translation>Etichetta:</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="186"/> - <source>&Save As...</source> - <translation>&Salva come...</translation> + <location filename="../qrcodedialog.cpp" line="121"/> + <source>PNG Images (*.png)</source> + <translation>Immagini PNG (*.png)</translation> </message> </context> <context> <name>SendCoinsDialog</name> <message> - <location filename="../forms/sendcoinsdialog.ui" line="64"/> - <source>Send to multiple recipients at once</source> - <translation>Spedisci a diversi beneficiari in una volta sola</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="144"/> - <source>Confirm the send action</source> - <translation>Conferma la spedizione</translation> - </message> - <message> <location filename="../forms/sendcoinsdialog.ui" line="14"/> <location filename="../sendcoinsdialog.cpp" line="123"/> <location filename="../sendcoinsdialog.cpp" line="128"/> @@ -1052,14 +1064,44 @@ Indirizzo: %4 <translation>Spedisci Bitcoin</translation> </message> <message> + <location filename="../forms/sendcoinsdialog.ui" line="64"/> + <source>Send to multiple recipients at once</source> + <translation>Spedisci a diversi beneficiari in una volta sola</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="67"/> + <source>&Add recipient...</source> + <translation>&Aggiungi beneficiario...</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="84"/> + <source>Remove all transaction fields</source> + <translation>Rimuovi tutti i campi della transazione</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="106"/> + <source>Balance:</source> + <translation>Saldo:</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="147"/> + <source>S&end</source> + <translation>&Spedisci</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="144"/> + <source>Confirm the send action</source> + <translation>Conferma la spedizione</translation> + </message> + <message> <location filename="../sendcoinsdialog.cpp" line="95"/> <source><b>%1</b> to %2 (%3)</source> <translation><b>%1</b> to %2 (%3)</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="100"/> - <source>Confirm send coins</source> - <translation>Conferma la spedizione di bitcoin</translation> + <location filename="../forms/sendcoinsdialog.ui" line="87"/> + <source>Clear all</source> + <translation>Cancella tutto</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="101"/> @@ -1067,6 +1109,16 @@ Indirizzo: %4 <translation>Si è sicuri di voler spedire %1?</translation> </message> <message> + <location filename="../forms/sendcoinsdialog.ui" line="113"/> + <source>123.456 BTC</source> + <translation>123,456 BTC</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="100"/> + <source>Confirm send coins</source> + <translation>Conferma la spedizione di bitcoin</translation> + </message> + <message> <location filename="../sendcoinsdialog.cpp" line="101"/> <source> and </source> <translation> e </translation> @@ -1077,46 +1129,11 @@ Indirizzo: %4 <translation>L'indirizzo del beneficiario non è valido, per cortesia controlla.</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="155"/> - <source>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.</source> - <translation>Errore: la transazione è stata rifiutata. Ciò accade se alcuni bitcoin nel portamonete sono stati già spesi, ad esempio se è stata usata una copia del file wallet.dat e i bitcoin sono stati spesi dalla copia ma non segnati come spesi qui.</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="113"/> - <source>123.456 BTC</source> - <translation>123,456 BTC</translation> - </message> - <message> <location filename="../sendcoinsdialog.cpp" line="129"/> <source>The amount to pay must be larger than 0.</source> <translation>L'importo da pagare dev'essere maggiore di 0.</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="84"/> - <source>Remove all transaction fields</source> - <translation>Rimuovi tutti i campi della transazione</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="106"/> - <source>Balance:</source> - <translation>Saldo:</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="147"/> - <source>S&end</source> - <translation>&Spedisci</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="67"/> - <source>&Add recipient...</source> - <translation>&Aggiungi beneficiario...</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="87"/> - <source>Clear all</source> - <translation>Cancella tutto</translation> - </message> - <message> <location filename="../sendcoinsdialog.cpp" line="134"/> <source>The amount exceeds your balance.</source> <translation>Nincs ennyi bitcoin az egyenlegeden.</translation> @@ -1134,27 +1151,47 @@ Indirizzo: %4 <message> <location filename="../sendcoinsdialog.cpp" line="150"/> <source>Error: Transaction creation failed.</source> - <translation>Hiba: nem sikerült létrehozni a tranzakciót.</translation> + <translation>Errore: creazione della transazione fallita.</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="155"/> + <source>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.</source> + <translation>Errore: la transazione è stata rifiutata. Ciò accade se alcuni bitcoin nel portamonete sono stati già spesi, ad esempio se è stata usata una copia del file wallet.dat e i bitcoin sono stati spesi dalla copia ma non segnati come spesi qui.</translation> </message> </context> <context> <name>SendCoinsEntry</name> <message> + <location filename="../forms/sendcoinsentry.ui" line="103"/> + <source>Choose address from address book</source> + <translation>Scegli l'indirizzo dalla rubrica</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="130"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="137"/> + <source>Remove this recipient</source> + <translation>Rimuovere questo beneficiario</translation> + </message> + <message> <location filename="../forms/sendcoinsentry.ui" line="120"/> <source>Paste address from clipboard</source> <translation>Incollare l'indirizzo dagli appunti</translation> </message> <message> + <location filename="../sendcoinsentry.cpp" line="25"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Inserisci un indirizzo Bitcoin (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> <location filename="../forms/sendcoinsentry.ui" line="14"/> <source>Form</source> <translation>Modulo</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="130"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> <location filename="../forms/sendcoinsentry.ui" line="29"/> <source>A&mount:</source> <translation>&Importo:</translation> @@ -1181,163 +1218,148 @@ Indirizzo: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="103"/> - <source>Choose address from address book</source> - <translation>Scegli l'indirizzo dalla rubrica</translation> - </message> - <message> - <location filename="../forms/sendcoinsentry.ui" line="137"/> - <source>Remove this recipient</source> - <translation>Rimuovere questo beneficiario</translation> - </message> - <message> <location filename="../forms/sendcoinsentry.ui" line="113"/> <source>Alt+A</source> <translation>Alt+A</translation> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="25"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Inserisci un indirizzo Bitcoin (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="28"/> - <source>%1/unconfirmed</source> - <translation>%1/non confermato</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="47"/> - <source><b>Status:</b> </source> - <translation><b>Stato:</b> </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="92"/> <source>unknown</source> <translation>sconosciuto</translation> </message> <message> <location filename="../transactiondesc.cpp" line="20"/> - <source>Open until %1</source> - <translation>Aperto fino a %1</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="18"/> <source>Open for %1 blocks</source> <translation>Megnyitva %1 blokkra</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation>%1/offline?</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="30"/> + <source>%1/unconfirmed</source> + <translation>%1/non confermato</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="50"/> + <source><b>Status:</b> </source> + <translation><b>Stato:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation>, non è stato ancora trasmesso con successo</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>, trasmesso attraverso %1 nodo</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>, trasmesso attraverso %1 nodi</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation><b>Data:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>Fonte:</b> Generato<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>Da:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation><b>Per:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation> (vostro, etichetta: </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation> (vostro)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation><b>Credito:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation>(%1 matura in altri %2 blocchi)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation>(non accettate)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation><b>Debito:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation><b>Tranzakciós díj:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>Importo netto:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>Messaggio:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>Commento:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation>ID della transazione:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation>Bisogna attendere 120 blocchi prima di spendere I bitcoin generati. Quando è stato generato questo blocco, è stato trasmesso alla rete per aggiungerlo alla catena di blocchi. Se non riesce a entrare nella catena, verrà modificato in "non accettato" e non sarà spendibile. Questo può accadere a volte, se un altro nodo genera un blocco entro pochi secondi del tuo.</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="22"/> + <source>Open until %1</source> + <translation>Aperto fino a %1</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation>%1 conferme</translation> </message> @@ -1359,8 +1381,8 @@ Indirizzo: %4 <name>TransactionTableModel</name> <message> <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Date</source> - <translation>Data</translation> + <source>Type</source> + <translation>Tipo</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="214"/> @@ -1372,20 +1394,17 @@ Indirizzo: %4 <source>Amount</source> <translation>Importo</translation> </message> - <message numerus="yes"> - <location filename="../transactiontablemodel.cpp" line="277"/> - <source>Open for %n block(s)</source> - <translation> - <numerusform>Aperto per %n blocco</numerusform> - <numerusform>Aperto per %n blocchi</numerusform> - </translation> - </message> <message> <location filename="../transactiontablemodel.cpp" line="280"/> <source>Open until %1</source> <translation>Aperto fino a %1</translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="283"/> + <source>Offline (%1 confirmations)</source> + <translation>Offline (%1 conferme)</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="286"/> <source>Unconfirmed (%1 of %2 confirmations)</source> <translation>Non confermati (%1 su %2 conferme)</translation> @@ -1396,6 +1415,11 @@ Indirizzo: %4 <translation>Confermato (%1 conferme)</translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="303"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Questo blocco non è stato ricevuto da altri nodi e probabilmente non sarà accettato!</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="306"/> <source>Generated but not accepted</source> <translation>Generati, ma non accettati</translation> @@ -1457,13 +1481,16 @@ Indirizzo: %4 </message> <message> <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Type</source> - <translation>Tipo</translation> + <source>Date</source> + <translation>Data</translation> </message> - <message> - <location filename="../transactiontablemodel.cpp" line="283"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline (%1 conferme)</translation> + <message numerus="yes"> + <location filename="../transactiontablemodel.cpp" line="277"/> + <source>Open for %n block(s)</source> + <translation> + <numerusform>Aperto per %n blocco</numerusform> + <numerusform>Aperto per %n blocchi</numerusform> + </translation> </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="297"/> @@ -1473,59 +1500,43 @@ Indirizzo: %4 <numerusform>Il saldo generato sarà disponibile tra %n altri blocchi</numerusform> </translation> </message> - <message> - <location filename="../transactiontablemodel.cpp" line="303"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Questo blocco non è stato ricevuto da altri nodi e probabilmente non sarà accettato!</translation> - </message> </context> <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="56"/> - <source>Today</source> - <translation>Oggi</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="58"/> - <source>This month</source> - <translation>Questo mese</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="59"/> - <source>Last month</source> - <translation>Il mese scorso</translation> + <location filename="../transactionview.cpp" line="77"/> + <source>Mined</source> + <translation>Ottenuto dal mining</translation> </message> <message> - <location filename="../transactionview.cpp" line="60"/> - <source>This year</source> - <translation>Quest'anno</translation> + <location filename="../transactionview.cpp" line="84"/> + <source>Enter address or label to search</source> + <translation>Inserisci un indirizzo o un'etichetta da cercare</translation> </message> <message> - <location filename="../transactionview.cpp" line="72"/> - <source>Received with</source> - <translation>Ricevuto tramite</translation> + <location filename="../transactionview.cpp" line="90"/> + <source>Min amount</source> + <translation>Importo minimo</translation> </message> <message> - <location filename="../transactionview.cpp" line="76"/> - <source>To yourself</source> - <translation>A te</translation> + <location filename="../transactionview.cpp" line="124"/> + <source>Copy address</source> + <translation>Copia l'indirizzo</translation> </message> <message> - <location filename="../transactionview.cpp" line="77"/> - <source>Mined</source> - <translation>Ottenuto dal mining</translation> + <location filename="../transactionview.cpp" line="61"/> + <source>Range...</source> + <translation>Intervallo...</translation> </message> <message> - <location filename="../transactionview.cpp" line="55"/> - <location filename="../transactionview.cpp" line="71"/> - <source>All</source> - <translation>Tutti</translation> + <location filename="../transactionview.cpp" line="74"/> + <source>Sent to</source> + <translation>Spedito a</translation> </message> <message> - <location filename="../transactionview.cpp" line="57"/> - <source>This week</source> - <translation>Questa settimana</translation> + <location filename="../transactionview.cpp" line="126"/> + <source>Copy amount</source> + <translation>Copia l'importo</translation> </message> <message> <location filename="../transactionview.cpp" line="125"/> @@ -1538,84 +1549,90 @@ Indirizzo: %4 <translation>Modifica l'etichetta</translation> </message> <message> + <location filename="../transactionview.cpp" line="280"/> + <source>Date</source> + <translation>Data</translation> + </message> + <message> <location filename="../transactionview.cpp" line="270"/> <source>Export Transaction Data</source> <translation>Esporta i dati della transazione</translation> </message> <message> + <location filename="../transactionview.cpp" line="282"/> + <source>Label</source> + <translation>Etichetta</translation> + </message> + <message> <location filename="../transactionview.cpp" line="271"/> <source>Comma separated file (*.csv)</source> <translation>Testo CSV (*.csv)</translation> </message> <message> - <location filename="../transactionview.cpp" line="279"/> - <source>Confirmed</source> - <translation>Confermato</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="283"/> - <source>Address</source> - <translation>Indirizzo</translation> + <location filename="../transactionview.cpp" line="284"/> + <source>Amount</source> + <translation>Importo</translation> </message> <message> - <location filename="../transactionview.cpp" line="285"/> - <source>ID</source> - <translation>ID</translation> + <location filename="../transactionview.cpp" line="55"/> + <location filename="../transactionview.cpp" line="71"/> + <source>All</source> + <translation>Tutti</translation> </message> <message> - <location filename="../transactionview.cpp" line="128"/> - <source>Show details...</source> - <translation>Mostra i dettagli...</translation> + <location filename="../transactionview.cpp" line="56"/> + <source>Today</source> + <translation>Oggi</translation> </message> <message> - <location filename="../transactionview.cpp" line="282"/> - <source>Label</source> - <translation>Etichetta</translation> + <location filename="../transactionview.cpp" line="57"/> + <source>This week</source> + <translation>Questa settimana</translation> </message> <message> - <location filename="../transactionview.cpp" line="61"/> - <source>Range...</source> - <translation>Intervallo...</translation> + <location filename="../transactionview.cpp" line="58"/> + <source>This month</source> + <translation>Questo mese</translation> </message> <message> - <location filename="../transactionview.cpp" line="281"/> - <source>Type</source> - <translation>Tipo</translation> + <location filename="../transactionview.cpp" line="283"/> + <source>Address</source> + <translation>Indirizzo</translation> </message> <message> - <location filename="../transactionview.cpp" line="280"/> - <source>Date</source> - <translation>Data</translation> + <location filename="../transactionview.cpp" line="60"/> + <source>This year</source> + <translation>Quest'anno</translation> </message> <message> - <location filename="../transactionview.cpp" line="289"/> - <source>Could not write to file %1.</source> - <translation>Impossibile scrivere sul file %1.</translation> + <location filename="../transactionview.cpp" line="72"/> + <source>Received with</source> + <translation>Ricevuto tramite</translation> </message> <message> - <location filename="../transactionview.cpp" line="84"/> - <source>Enter address or label to search</source> - <translation>Inserisci un indirizzo o un'etichetta da cercare</translation> + <location filename="../transactionview.cpp" line="76"/> + <source>To yourself</source> + <translation>A te</translation> </message> <message> - <location filename="../transactionview.cpp" line="90"/> - <source>Min amount</source> - <translation>Importo minimo</translation> + <location filename="../transactionview.cpp" line="78"/> + <source>Other</source> + <translation>Altro</translation> </message> <message> - <location filename="../transactionview.cpp" line="124"/> - <source>Copy address</source> - <translation>Copia l'indirizzo</translation> + <location filename="../transactionview.cpp" line="128"/> + <source>Show details...</source> + <translation>Mostra i dettagli...</translation> </message> <message> - <location filename="../transactionview.cpp" line="126"/> - <source>Copy amount</source> - <translation>Copia l'importo</translation> + <location filename="../transactionview.cpp" line="285"/> + <source>ID</source> + <translation>ID</translation> </message> <message> - <location filename="../transactionview.cpp" line="392"/> - <source>to</source> - <translation>a</translation> + <location filename="../transactionview.cpp" line="279"/> + <source>Confirmed</source> + <translation>Confermato</translation> </message> <message> <location filename="../transactionview.cpp" line="289"/> @@ -1623,30 +1640,35 @@ Indirizzo: %4 <translation>Errore nell'esportazione</translation> </message> <message> - <location filename="../transactionview.cpp" line="74"/> - <source>Sent to</source> - <translation>Spedito a</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="78"/> - <source>Other</source> - <translation>Altro</translation> + <location filename="../transactionview.cpp" line="281"/> + <source>Type</source> + <translation>Tipo</translation> </message> <message> - <location filename="../transactionview.cpp" line="284"/> - <source>Amount</source> - <translation>Importo</translation> + <location filename="../transactionview.cpp" line="289"/> + <source>Could not write to file %1.</source> + <translation>Impossibile scrivere sul file %1.</translation> </message> <message> <location filename="../transactionview.cpp" line="384"/> <source>Range:</source> <translation>Intervallo:</translation> </message> + <message> + <location filename="../transactionview.cpp" line="59"/> + <source>Last month</source> + <translation>Il mese scorso</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="392"/> + <source>to</source> + <translation>a</translation> + </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>Invio...</translation> </message> @@ -1654,430 +1676,514 @@ Indirizzo: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> - <source>Loading block index...</source> - <translation>Caricamento dell'indice del blocco...</translation> + <location filename="../bitcoinstrings.cpp" line="41"/> + <source>Bitcoin version</source> + <translation>Versione di Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> - <source>Done loading</source> - <translation>Caricamento completato</translation> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>Non è possibile ottenere i dati sulla directory %s. Probabilmente Bitcoin è già in esecuzione.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Usage:</source> - <translation>Utilizzo:</translation> + <location filename="../bitcoinstrings.cpp" line="113"/> + <source>Loading addresses...</source> + <translation>Caricamento indirizzi...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> + <location filename="../bitcoinstrings.cpp" line="117"/> <source>Loading wallet...</source> <translation>Caricamento portamonete...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Send command to -server or bitcoind</source> - <translation>Manda il comando a -server o bitcoind -</translation> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source>Rescanning...</source> + <translation>Ripetere la scansione...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> - <source>Invalid -proxy address</source> - <translation>Indirizzo -proxy non valido</translation> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation>Errore: CreateThread(StartNode) non riuscito</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> - <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> - <translation>Impossibile collegarsi alla porta %d su questo computer. Probabilmente Bitcoin è già in esecuzione.</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="95"/> + <location filename="../bitcoinstrings.cpp" line="20"/> <source>Warning: Disk space is low</source> <translation>Attenzione: lo spazio su disco è scarso</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> + <location filename="../bitcoinstrings.cpp" line="128"/> + <source>Invalid amount for -paytxfee=<amount></source> + <translation>Importo non valido per -paytxfee=<amount></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="129"/> + <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> + <translation>Attenzione: -paytxfee è molto alta. Questa è la commissione che si paga quando si invia una transazione.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <translation>Attenzione: si prega di controllare che la data del computer e l'ora siano corrette. Se il vostro orologio è sbagliato Bitcoin non funziona correttamente.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Error loading blkindex.dat</source> + <translation>Errore caricamento blkindex.dat</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="119"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> <translation>Errore caricamento wallet.dat: il wallet richiede una versione nuova di Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> - <source>Error loading wallet.dat</source> - <translation>Errore caricamento wallet.dat</translation> + <location filename="../bitcoinstrings.cpp" line="43"/> + <source>Send command to -server or bitcoind</source> + <translation>Manda il comando a -server o bitcoind +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> + <location filename="../bitcoinstrings.cpp" line="46"/> <source>Options:</source> <translation>Opzioni: </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> + <location filename="../bitcoinstrings.cpp" line="47"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Specifica il file di configurazione (di default: bitcoin.conf) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> - <source>List commands</source> - <translation>Lista comandi + <location filename="../bitcoinstrings.cpp" line="45"/> + <source>Get help for a command</source> + <translation>Aiuto su un comando </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> + <location filename="../bitcoinstrings.cpp" line="49"/> <source>Generate coins</source> <translation>Genera Bitcoin </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> + <location filename="../bitcoinstrings.cpp" line="50"/> <source>Don't generate coins</source> <translation>Non generare Bitcoin </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> - <source>Error loading addr.dat</source> - <translation>Errore caricamento addr.dat</translation> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>Specifica il file pid (default: bitcoind.pid) +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> + <location filename="../bitcoinstrings.cpp" line="54"/> <source>Set database cache size in megabytes (default: 25)</source> <translation>Imposta la dimensione cache del database in megabyte (default: 25)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> + <location filename="../bitcoinstrings.cpp" line="56"/> <source>Specify connection timeout (in milliseconds)</source> <translation>Specifica il timeout di connessione (in millisecondi) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation>Ascolta le connessioni JSON-RPC su <porta> (default: 8333 o testnet: 18333)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="41"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Commissione per KB da aggiungere alle transazioni in uscita</translation> + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Specify data directory</source> + <translation>Specifica la cartella dati +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> + <location filename="../bitcoinstrings.cpp" line="67"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Soglia di disconnessione dei peer di cattiva qualità (default: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Start minimized</source> - <translation>Parti in icona -</translation> + <location filename="../bitcoinstrings.cpp" line="60"/> + <source>Maintain at most <n> connections to peers (default: 125)</source> + <translation>Mantieni al massimo <n> connessioni ai peer (default: 125)</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="51"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation>Attendi le connessioni JSON-RPC su <porta> (default: 8332) -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>Inviare comandi al nodo in esecuzione su <ip> (default: 127.0.0.1) + <source>Start minimized</source> + <translation>Parti in icona </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Send trace/debug info to debugger</source> - <translation>Invia le informazioni di trace/debug al debugger</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="19"/> + <location filename="../bitcoinstrings.cpp" line="52"/> <source>Show splash screen on startup (default: 1)</source> <translation>Mostra finestra di presentazione all'avvio (default: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation>Impostare la quantità di chiavi di riserva a <n> (default: 100) + <location filename="../bitcoinstrings.cpp" line="79"/> + <source>Run in the background as a daemon and accept commands</source> + <translation>Esegui in background come demone e accetta i comandi </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> - <source>Upgrade wallet to latest format</source> - <translation>Aggiorna il wallet all'ultimo formato</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="59"/> - <source>Rescan the block chain for missing wallet transactions</source> - <translation>Ripeti analisi della catena dei blocchi per cercare le transazioni mancanti dal portamonete + <location filename="../bitcoinstrings.cpp" line="80"/> + <source>Use the test network</source> + <translation>Utilizza la rete di prova </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> - <source>Run in the background as a daemon and accept commands</source> - <translation>Esegui in background come demone e accetta i comandi -</translation> + <location filename="../bitcoinstrings.cpp" line="68"/> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> + <translation>Numero di secondi di sospensione che i peer di cattiva qualità devono trascorrere prima di riconnettersi (default: 86400)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> - <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation>Quanti blocchi da controllare all'avvio (default: 2500, 0 = tutti)</translation> + <location filename="../bitcoinstrings.cpp" line="57"/> + <source>Connect through socks4 proxy</source> + <translation>Connessione tramite socks4 proxy +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> - <source>Use the test network</source> - <translation>Utilizza la rete di prova + <location filename="../bitcoinstrings.cpp" line="58"/> + <source>Allow DNS lookups for addnode and connect</source> + <translation>Consenti ricerche DNS per aggiungere nodi e collegare </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> + <location filename="../bitcoinstrings.cpp" line="82"/> <source>Prepend debug output with timestamp</source> <translation>Anteponi all'output di debug una marca temporale</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Connect through socks4 proxy</source> - <translation>Connessione tramite socks4 proxy + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>Attendi le connessioni JSON-RPC su <porta> (default: 8332) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> + <location filename="../bitcoinstrings.cpp" line="83"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Invia le informazioni di trace/debug alla console invece che al file debug.log</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Allow DNS lookups for addnode and connect</source> - <translation>Consenti ricerche DNS per aggiungere nodi e collegare -</translation> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> - <source>Username for JSON-RPC connections</source> - <translation>Nome utente per connessioni JSON-RPC -</translation> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Allow JSON-RPC connections from specified IP address</source> - <translation>Consenti connessioni JSON-RPC dall'indirizzo IP specificato -</translation> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> - <translation>Buffer di invio massimo per connessione, <n>*1000 byte (default: 10000)</translation> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> + <location filename="../bitcoinstrings.cpp" line="63"/> <source>Find peers using internet relay chat (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> + <location filename="../bitcoinstrings.cpp" line="65"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation>Imposta lingua, ad esempio "it_IT" (predefinita: lingua di sistema)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> + <location filename="../bitcoinstrings.cpp" line="66"/> <source>Find peers using DNS lookup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> - <source>How thorough the block verification is (0-6, default: 1)</source> + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>Username for JSON-RPC connections</source> + <translation>Nome utente per connessioni JSON-RPC +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="90"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Upgrade wallet to latest format</source> + <translation>Aggiorna il wallet all'ultimo formato</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>Impostare la quantità di chiavi di riserva a <n> (default: 100) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation>Ripeti analisi della catena dei blocchi per cercare le transazioni mancanti dal portamonete +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source>How many blocks to check at startup (default: 2500, 0 = all)</source> + <translation>Quanti blocchi da controllare all'avvio (default: 2500, 0 = tutti)</translation> + </message> + <message> <location filename="../bitcoinstrings.cpp" line="62"/> - <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation> -Opzioni SSL: (vedi il wiki di Bitcoin per le istruzioni di configurazione SSL) + <source>Connect only to the specified node</source> + <translation>Connetti solo al nodo specificato </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> + <translation>Buffer di invio massimo per connessione, <n>*1000 byte (default: 10000)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="86"/> + <source>Password for JSON-RPC connections</source> + <translation>Password per connessioni JSON-RPC +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="81"/> + <source>Output extra debugging information</source> + <translation>Produci informazioni extra utili al debug</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">Errore: creazione della transazione fallita.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">Errore: la transazione è stata rifiutata. Ciò accade se alcuni bitcoin nel portamonete sono stati già spesi, ad esempio se è stata usata una copia del file wallet.dat e i bitcoin sono stati spesi dalla copia ma non segnati come spesi qui.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>How thorough the block verification is (0-6, default: 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>Cifrari accettabili (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="115"/> + <source>Loading block index...</source> + <translation>Caricamento dell'indice del blocco...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> + <location filename="../bitcoinstrings.cpp" line="123"/> <source>Cannot initialize keypool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> + <location filename="../bitcoinstrings.cpp" line="124"/> <source>Cannot write default address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> - <source>Rescanning...</source> - <translation>Ripetere la scansione...</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="90"/> - <source>Invalid amount for -paytxfee=<amount></source> - <translation>Importo non valido per -paytxfee=<amount></translation> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>Done loading</source> + <translation>Caricamento completato</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> - <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> - <translation>Attenzione: -paytxfee è molto alta. Questa è la commissione che si paga quando si invia una transazione.</translation> + <location filename="../bitcoinstrings.cpp" line="127"/> + <source>Invalid -proxy address</source> + <translation>Indirizzo -proxy non valido</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> - <translation>Attenzione: si prega di controllare che la data del computer e l'ora siano corrette. Se il vostro orologio è sbagliato Bitcoin non funziona correttamente.</translation> + <location filename="../bitcoinstrings.cpp" line="133"/> + <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> + <translation>Impossibile collegarsi alla porta %d su questo computer. Probabilmente Bitcoin è già in esecuzione.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>beta</translation> + <location filename="../bitcoinstrings.cpp" line="42"/> + <source>Usage:</source> + <translation>Utilizzo:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Bitcoin version</source> - <translation>Versione di Bitcoin</translation> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Invio...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> - <source>Loading addresses...</source> - <translation>Caricamento indirizzi...</translation> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>Fondi insufficienti</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> - <source>Error loading blkindex.dat</source> - <translation>Errore caricamento blkindex.dat</translation> + <location filename="../bitcoinstrings.cpp" line="114"/> + <source>Error loading addr.dat</source> + <translation>Errore caricamento addr.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> + <location filename="../bitcoinstrings.cpp" line="118"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Errore caricamento wallet.dat: Wallet corrotto</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> + <location filename="../bitcoinstrings.cpp" line="120"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Il portamonete deve essere riscritto: riavviare Bitcoin per completare</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>Specifica il file pid (default: bitcoind.pid) -</translation> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation>Errore</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Specify data directory</source> - <translation>Specifica la cartella dati + <location filename="../bitcoinstrings.cpp" line="44"/> + <source>List commands</source> + <translation>Lista comandi </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Maintain at most <n> connections to peers (default: 125)</source> - <translation>Mantieni al massimo <n> connessioni ai peer (default: 125)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Add a node to connect to and attempt to keep the connection open</source> - <translation>Elérendő csomópont megadása and attempt to keep the connection open</translation> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>Importo non valido</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Connect only to the specified node</source> - <translation>Connetti solo al nodo specificato -</translation> + <location filename="../bitcoinstrings.cpp" line="59"/> + <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> + <translation>Ascolta le connessioni JSON-RPC su <porta> (default: 8333 o testnet: 18333)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation>Numero di secondi di sospensione che i peer di cattiva qualità devono trascorrere prima di riconnettersi (default: 86400)</translation> + <location filename="../bitcoinstrings.cpp" line="61"/> + <source>Add a node to connect to and attempt to keep the connection open</source> + <translation>Elérendő csomópont megadása and attempt to keep the connection open</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation>Buffer di ricezione massimo per connessione, <n>*1000 byte (default: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished">UPnP-használat engedélyezése a figyelő port feltérképezésénél (default: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished">UPnP-használat engedélyezése a figyelő port feltérképezésénél (default: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> + <location filename="../bitcoinstrings.cpp" line="77"/> + <source>Fee per KB to add to transactions you send</source> + <translation>Commissione per KB da aggiungere alle transazioni in uscita</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="78"/> <source>Accept command line and JSON-RPC commands</source> <translation>Accetta da linea di comando e da comandi JSON-RPC </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> - <source>Output extra debugging information</source> - <translation>Produci informazioni extra utili al debug</translation> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation>Utilizzo</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Get help for a command</source> - <translation>Aiuto su un comando + <location filename="../bitcoinstrings.cpp" line="88"/> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation>Consenti connessioni JSON-RPC dall'indirizzo IP specificato </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>Cifrari accettabili (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>Inviare comandi al nodo in esecuzione su <ip> (default: 127.0.0.1) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> + <location filename="../bitcoinstrings.cpp" line="84"/> + <source>Send trace/debug info to debugger</source> + <translation>Invia le informazioni di trace/debug al debugger</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>Error loading wallet.dat</source> + <translation>Errore caricamento wallet.dat</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="102"/> <source>Server certificate file (default: server.cert)</source> <translation>File certificato del server (default: server.cert) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> + <location filename="../bitcoinstrings.cpp" line="103"/> <source>Server private key (default: server.pem)</source> <translation>Chiave privata del server (default: server.pem) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> + <location filename="../bitcoinstrings.cpp" line="107"/> <source>This help message</source> <translation>Questo messaggio di aiuto </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> + <location filename="../bitcoinstrings.cpp" line="101"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Utilizzare OpenSSL (https) per le connessioni JSON-RPC </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Password for JSON-RPC connections</source> - <translation>Password per connessioni JSON-RPC + <location filename="../bitcoinstrings.cpp" line="98"/> + <source> +SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation> +Opzioni SSL: (vedi il wiki di Bitcoin per le istruzioni di configurazione SSL) </translation> </message> </context> diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts index 8ccf9ed646..b924fe93f8 100644 --- a/src/qt/locale/bitcoin_lt.ts +++ b/src/qt/locale/bitcoin_lt.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> versija</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -96,42 +96,42 @@ Platinama pagal licenziją MIT/X11, papildomą informaciją rasite faile license <translation>&D Pašalinti</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>Copijuoti adresą</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation>Kopijuoti žymę</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation>Redaguoti</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>Pašalinti</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation>Eksportuoti adresų knygelės duomenis</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation>Kableliais išskirtas failas (*.csv)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>Eksportavimo klaida</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation>Nepavyko įrašyti į failą %1.</translation> </message> @@ -300,183 +300,186 @@ Ar jūs tikrai norite užšifruoti savo piniginę?</translation> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="73"/> + <location filename="../bitcoingui.cpp" line="71"/> <source>Bitcoin Wallet</source> <translation>Bitkoinų piniginė</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> + <location filename="../bitcoingui.cpp" line="506"/> <source>Synchronizing with network...</source> <translation>Sinchronizavimas su tinklu ...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Vyksta blokų grandinės sinchronizavimas</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="187"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>&Overview</source> <translation>&O Apžvalga</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="186"/> <source>Show general overview of wallet</source> <translation>Rodyti piniginės bendrą apžvalgą</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> + <location filename="../bitcoingui.cpp" line="191"/> <source>&Transactions</source> <translation>&T Sandoriai</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="192"/> <source>Browse transaction history</source> <translation>Apžvelgti sandorių istoriją</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> + <location filename="../bitcoingui.cpp" line="197"/> <source>&Address Book</source> <translation>&Adresų knygelė</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> + <location filename="../bitcoingui.cpp" line="198"/> <source>Edit the list of stored addresses and labels</source> <translation>Redaguoti išsaugotus adresus bei žymes</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation>&R Gautos monetos</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation>Parodyti adresų sąraša mokėjimams gauti</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> + <location filename="../bitcoingui.cpp" line="209"/> <source>&Send coins</source> <translation>&Siųsti monetas</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> + <location filename="../bitcoingui.cpp" line="210"/> <source>Send coins to a bitcoin address</source> <translation>Siųsti monetas bitkoinų adresu</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> + <location filename="../bitcoingui.cpp" line="215"/> <source>Sign &message</source> <translation>Registruoti praneši&mą</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> + <location filename="../bitcoingui.cpp" line="216"/> <source>Prove you control an address</source> <translation>Įrodyti, kad jūs valdyti adresą</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> + <location filename="../bitcoingui.cpp" line="235"/> <source>E&xit</source> <translation>&x išėjimas</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> + <location filename="../bitcoingui.cpp" line="236"/> <source>Quit application</source> <translation>Išjungti programą</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> + <location filename="../bitcoingui.cpp" line="239"/> <source>&About %1</source> <translation>&Apie %1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="255"/> + <location filename="../bitcoingui.cpp" line="253"/> <source>Encrypt or decrypt wallet</source> <translation>Užšifruoti ar iššifruoti piniginę</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> + <location filename="../bitcoingui.cpp" line="258"/> <source>Change the passphrase used for wallet encryption</source> <translation>Pakeisti slaptažodį naudojamą piniginės užšifravimui</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> + <location filename="../bitcoingui.cpp" line="240"/> <source>Show information about Bitcoin</source> <translation>Rodyti informaciją apie Bitkoiną</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> + <location filename="../bitcoingui.cpp" line="242"/> <source>About &Qt</source> <translation>Apie &Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> + <location filename="../bitcoingui.cpp" line="243"/> <source>Show information about Qt</source> <translation>Rodyti informaciją apie Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> + <location filename="../bitcoingui.cpp" line="245"/> <source>&Options...</source> <translation>&Opcijos...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Rodyti Bitcoin langą</translation> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> + <location filename="../bitcoingui.cpp" line="251"/> <source>Export the data in the current tab to a file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> + <location filename="../bitcoingui.cpp" line="256"/> <source>Backup wallet to another location</source> <translation>Daryti piniginės atsarginę kopiją</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> + <location filename="../bitcoingui.cpp" line="281"/> <source>&File</source> <translation>&Failas</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> + <location filename="../bitcoingui.cpp" line="290"/> <source>&Settings</source> <translation>Nu&Statymai</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> + <location filename="../bitcoingui.cpp" line="296"/> <source>&Help</source> <translation>&H Pagelba</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> + <location filename="../bitcoingui.cpp" line="303"/> <source>Tabs toolbar</source> <translation>Tabs įrankių juosta</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> + <location filename="../bitcoingui.cpp" line="314"/> <source>Actions toolbar</source> <translation>Veiksmų įrankių juosta</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> - <source>[testnet]</source> - <translation>[testavimotinklas]</translation> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation>Bitcoin klientas</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>Atsisiuntė %1 iš %2 sandorių istorijos blokų</translation> + <location filename="../bitcoingui.cpp" line="418"/> + <source>bitcoin-qt</source> + <translation>bitcoin-qt</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="482"/> + <source>%n active connection(s) to Bitcoin network</source> + <translation> + <numerusform>%n Bitcoin tinklo aktyvus ryšys</numerusform> + <numerusform>%n Bitcoin tinklo aktyvūs ryšiai</numerusform> + <numerusform>%n Bitcoin tinklo aktyvūs ryšiai</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> + <location filename="../bitcoingui.cpp" line="531"/> <source>Downloaded %1 blocks of transaction history.</source> <translation>Atsisiuntė %1 iš %2 sandorių istorijos blokų</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation> <numerusform>Prieš %n sekundę</numerusform> @@ -485,7 +488,7 @@ Ar jūs tikrai norite užšifruoti savo piniginę?</translation> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation> <numerusform>Prieš %n minutę</numerusform> @@ -494,7 +497,7 @@ Ar jūs tikrai norite užšifruoti savo piniginę?</translation> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation> <numerusform>Prieš %n valandą</numerusform> @@ -503,7 +506,7 @@ Ar jūs tikrai norite užšifruoti savo piniginę?</translation> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>Prieš %n dieną</numerusform> @@ -512,128 +515,133 @@ Ar jūs tikrai norite užšifruoti savo piniginę?</translation> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation>Iki šiol</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>Gaudo...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation>Paskutinis gautas blokas buvo sukurtas %1.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> - <source>Sent transaction</source> - <translation>Sandoris nusiųstas</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="773"/> - <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation>Piniginė <b>užšifruota</b> ir šiuo metu <b>atrakinta</b></translation> + <location filename="../bitcoingui.cpp" line="636"/> + <source>Sending...</source> + <translation>Siunčiama...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> - <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation>Piniginė <b>užšifruota</b> ir šiuo metu <b>užrakinta</b></translation> + <location filename="../bitcoingui.cpp" line="663"/> + <source>Sent transaction</source> + <translation>Sandoris nusiųstas</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Backup Wallet</source> - <translation>Backup piniginę</translation> + <location filename="../bitcoingui.cpp" line="664"/> + <source>Incoming transaction</source> + <translation>Ateinantis sandoris</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation>Piniginės duomenys (*.dat)</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation>Nepavyko padaryti atsarginės kopijos</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>Keisti bitcoin konfigūracijos galimybes</translation> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation type="unfinished">Rodyti Bitcoin langą</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>Atidaryti &Bitcoin</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> - <translation>&Eksportas...</translation> + <location filename="../bitcoingui.cpp" line="790"/> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation>Piniginė <b>užšifruota</b> ir šiuo metu <b>atrakinta</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation>&E Užšifruoti piniginę</translation> + <location filename="../bitcoingui.cpp" line="798"/> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation>Piniginė <b>užšifruota</b> ir šiuo metu <b>užrakinta</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> - <source>&Backup Wallet</source> - <translation type="unfinished">&Backup piniginę</translation> + <location filename="../bitcoingui.cpp" line="665"/> + <source>Date: %1 +Amount: %2 +Type: %3 +Address: %4 +</source> + <translation>Data: %1 +Suma: %2 +Tipas: %3 +Adresas: %4</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>&C Pakeisti slaptažodį</translation> + <location filename="../bitcoingui.cpp" line="327"/> + <source>[testnet]</source> + <translation>[testavimotinklas]</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> - <source>%n active connection(s) to Bitcoin network</source> - <translation> - <numerusform>%n Bitcoin tinklo aktyvus ryšys</numerusform> - <numerusform>%n Bitcoin tinklo aktyvūs ryšiai</numerusform> - <numerusform>%n Bitcoin tinklo aktyvūs ryšiai</numerusform> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>Atsisiuntė %1 iš %2 sandorių istorijos blokų (%3% done).</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="632"/> <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> - <source>Incoming transaction</source> - <translation>Ateinantis sandoris</translation> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Backup Wallet</source> + <translation>Backup piniginę</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Data: %1 -Suma: %2 -Tipas: %3 -Adresas: %4</translation> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>Keisti bitcoin konfigūracijos galimybes</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> - <source>bitcoin-qt</source> - <translation>bitcoin-qt</translation> + <location filename="../bitcoingui.cpp" line="250"/> + <source>&Export...</source> + <translation>&Eksportas...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> - <source>Sending...</source> - <translation>Siunčiama...</translation> + <location filename="../bitcoingui.cpp" line="252"/> + <source>&Encrypt Wallet</source> + <translation>&E Užšifruoti piniginę</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoingui.cpp" line="255"/> + <source>&Backup Wallet</source> + <translation type="unfinished">&Backup piniginę</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation>&C Pakeisti slaptažodį</translation> + </message> + <message> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -641,22 +649,22 @@ Adresas: %4</translation> <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&U vienetų rodyti sumas:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>Rodomų ir siunčiamų monetų kiekio matavimo vienetai</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&Rodyti adresus sandorių sąraše</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished"></translation> </message> @@ -732,82 +740,92 @@ Adresas: %4</translation> <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>&S Paleisti Bitcoin programą su window sistemos paleidimu</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Automatiškai paleisti Bitkoin programą kai yra įjungiamas kompiuteris</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>&M sumažinti langą bet ne užduočių juostą</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>Po programos lango sumažinimo rodyti tik programos ikoną.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> + <location filename="../optionsdialog.cpp" line="185"/> <source>Map port using &UPnP</source> - <translation>Prievado struktūra naudojant &UPnP</translation> + <translation>Prievado struktūra naudojant &UPnP</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="181"/> + <location filename="../optionsdialog.cpp" line="186"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Automatiškai atidaryti Bitcoin kliento maršrutizatoriaus prievadą. Tai veikia tik tada, kai jūsų maršrutizatorius palaiko UPnP ir ji įjungta.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="180"/> <source>M&inimize on close</source> <translation>&i Sumažinti uždarant</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="186"/> + <location filename="../optionsdialog.cpp" line="181"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>Uždarant langą neuždaryti programos. Kai ši parinktis įjungta, programa bus uždaryta tik pasirinkus meniu komandą Baigti.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>&C Jungtis per socks4 proxy:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Jungtis į Bitkoin tinklą per socks4 proxy (pvz. jungiantis per Tor)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>Proxy &IP: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>IP adresas proxy (pvz. 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>&Prievadas: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Proxy prievadas (pvz. 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>&f Mokėti sandorio mokestį</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation>Atjungti duombazes išsijungiant</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>Neprivaloma sandorio mokestis už KB, kuris padeda įsitikinti, kad jūsų sandoriai tvarkomi greitai. Daugelis sandorių yra tik 1KB dydžio. Rekomenduojamas 0,01 mokestis.</translation> </message> @@ -881,17 +899,17 @@ Adresas: %4</translation> </message> <message> <location filename="../messagepage.cpp" line="74"/> + <source>%1 is not a valid address.</source> + <translation>%1 tai negaliojantis adresas</translation> + </message> + <message> + <location filename="../messagepage.cpp" line="74"/> <location filename="../messagepage.cpp" line="89"/> <location filename="../messagepage.cpp" line="101"/> <source>Error signing</source> <translation>Klaida pasirašant</translation> </message> <message> - <location filename="../messagepage.cpp" line="74"/> - <source>%1 is not a valid address.</source> - <translation>%1 tai negaliojantis adresas</translation> - </message> - <message> <location filename="../messagepage.cpp" line="89"/> <source>Private key for %1 is not available.</source> <translation>Privataus rakto %1 nėra</translation> @@ -905,17 +923,17 @@ Adresas: %4</translation> <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>Pagrindinis</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>Opcijos</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>Ekranas</translation> </message> @@ -928,11 +946,6 @@ Adresas: %4</translation> <translation>Iš viso sandorių, įskaitant tuos kurie dar turi būti patvirtinti, ir jie dar nėra įskaičiuotii į einamosios sąskaitos balansą</translation> </message> <message> - <location filename="../overviewpage.cpp" line="111"/> - <source>Total number of transactions in wallet</source> - <translation>Bandras sandorių kiekis piniginėje</translation> - </message> - <message> <location filename="../forms/overviewpage.ui" line="14"/> <source>Form</source> <translation>Forma</translation> @@ -972,10 +985,20 @@ Adresas: %4</translation> <source>Your current balance</source> <translation>Jūsų einamasis balansas</translation> </message> + <message> + <location filename="../overviewpage.cpp" line="111"/> + <source>Total number of transactions in wallet</source> + <translation>Bandras sandorių kiekis piniginėje</translation> + </message> </context> <context> <name>QRCodeDialog</name> <message> + <location filename="../forms/qrcodedialog.ui" line="186"/> + <source>&Save As...</source> + <translation>&S išsaugoti kaip...</translation> + </message> + <message> <location filename="../forms/qrcodedialog.ui" line="32"/> <source>QR Code</source> <translation>QR kodas</translation> @@ -1001,11 +1024,6 @@ Adresas: %4</translation> <translation>Žinutė:</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="186"/> - <source>&Save As...</source> - <translation>&S išsaugoti kaip...</translation> - </message> - <message> <location filename="../forms/qrcodedialog.ui" line="14"/> <source>Dialog</source> <translation>Dialogas</translation> @@ -1016,17 +1034,22 @@ Adresas: %4</translation> <translation>Prašau išmokėti</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation>Klaida, koduojant URI į QR kodą.</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation>PNG paveikslėliai (*.png)</translation> </message> @@ -1034,24 +1057,24 @@ Adresas: %4</translation> <context> <name>SendCoinsDialog</name> <message> - <location filename="../forms/sendcoinsdialog.ui" line="113"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> - </message> - <message> <location filename="../sendcoinsdialog.cpp" line="95"/> <source><b>%1</b> to %2 (%3)</source> <translation><b>%1</b> to %2 (%3)</translation> </message> <message> + <location filename="../forms/sendcoinsdialog.ui" line="144"/> + <source>Confirm the send action</source> + <translation>Patvirtinti siuntimo veiksmą</translation> + </message> + <message> <location filename="../forms/sendcoinsdialog.ui" line="106"/> <source>Balance:</source> <translation>Balansas:</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="144"/> - <source>Confirm the send action</source> - <translation>Patvirtinti siuntimo veiksmą</translation> + <location filename="../forms/sendcoinsdialog.ui" line="113"/> + <source>123.456 BTC</source> + <translation>123.456 BTC</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="100"/> @@ -1106,11 +1129,21 @@ Adresas: %4</translation> <translation>ir</translation> </message> <message> + <location filename="../sendcoinsdialog.cpp" line="124"/> + <source>The recipient address is not valid, please recheck.</source> + <translation>Negaliojantis gavėjo adresas. Patikrinkite.</translation> + </message> + <message> <location filename="../sendcoinsdialog.cpp" line="129"/> <source>The amount to pay must be larger than 0.</source> <translation>Apmokėjimo suma turi būti didesnė negu 0.</translation> </message> <message> + <location filename="../sendcoinsdialog.cpp" line="134"/> + <source>The amount exceeds your balance.</source> + <translation>Suma viršija jūsų balansą.</translation> + </message> + <message> <location filename="../sendcoinsdialog.cpp" line="139"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation>Jei pridedame sandorio mokestį %1 bendra suma viršija jūsų balansą.</translation> @@ -1130,16 +1163,6 @@ Adresas: %4</translation> <source>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.</source> <translation>Klaida: sandoris buvo atmestas.Tai gali įvykti, jei kai kurios monetos iš jūsų piniginėje jau buvo panaudotos, pvz. jei naudojote wallet.dat kopiją ir monetos buvo išleistos kopijoje, bet nepažymėtos kaip skirtos išleisti čia.</translation> </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="124"/> - <source>The recipient address is not valid, please recheck.</source> - <translation>Negaliojantis gavėjo adresas. Patikrinkite.</translation> - </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="134"/> - <source>The amount exceeds your balance.</source> - <translation>Suma viršija jūsų balansą.</translation> - </message> </context> <context> <name>SendCoinsEntry</name> @@ -1208,143 +1231,143 @@ Adresas: %4</translation> <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation>%1/atjungtas?</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> - <source>Open until %1</source> - <translation>Atidaryta iki %1</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="28"/> + <location filename="../transactiondesc.cpp" line="30"/> <source>%1/unconfirmed</source> <translation>%1/nepatvirtintas</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation>%1 patvirtinimai</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="18"/> - <source>Open for %1 blocks</source> - <translation>Atidaryta %1 blokams</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation><b>Būsena:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation>, transliavimas dar nebuvo sėkmingas</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>, transliuota per %1 mazgą</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>, transliuota per %1 mazgus</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation><b>Data:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>Šaltinis:</b> Sukurta<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>Nuo:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation><b>Skirta:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation> (jūsų, žymė: </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation> (jūsų)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation><b>Kreditas:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation>(%1 apmokėtinas %2 daugiau blokais)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> - <source>(not accepted)</source> - <translation>(nepriimta)</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> - <source><b>Debit:</b> </source> - <translation><b>Debitas:</b> </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation><b>Sandorio mokestis:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>Neto suma:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>Žinutė:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>Komentaras:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation>Sandorio ID:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation>Išgautos monetos turi sulaukti 120 blokų, kol jos gali būti naudojamos. Kai sukūrėte šį bloką, jis buvo transliuojamas tinkle ir turėjo būti įtrauktas į blokų grandinę. Jei nepavyksta patekti į grandinę, bus pakeista į "nepriėmė", o ne "vartojamas". Tai kartais gali atsitikti, jei kitas mazgas per keletą sekundžių sukuria bloką po jūsų bloko.</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="92"/> <source>unknown</source> <translation>nežinomas</translation> </message> + <message> + <location filename="../transactiondesc.cpp" line="20"/> + <source>Open for %1 blocks</source> + <translation>Atidaryta %1 blokams</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="22"/> + <source>Open until %1</source> + <translation>Atidaryta iki %1</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="139"/> + <source>(not accepted)</source> + <translation>(nepriimta)</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> + <source><b>Debit:</b> </source> + <translation><b>Debitas:</b> </translation> + </message> </context> <context> <name>TransactionDescDialog</name> @@ -1362,6 +1385,36 @@ Adresas: %4</translation> <context> <name>TransactionTableModel</name> <message> + <location filename="../transactiontablemodel.cpp" line="283"/> + <source>Offline (%1 confirmations)</source> + <translation>Atjungta (%1 patvirtinimai)</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="289"/> + <source>Confirmed (%1 confirmations)</source> + <translation>Patvirtinta (%1 patvirtinimai)</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="306"/> + <source>Generated but not accepted</source> + <translation>Išgauta bet nepriimta</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="349"/> + <source>Received with</source> + <translation>Gauta su</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="351"/> + <source>Received from</source> + <translation>Gauta iš</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="354"/> + <source>Sent to</source> + <translation>Siųsta </translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="396"/> <source>(n/a)</source> <translation>nepasiekiama</translation> @@ -1372,11 +1425,6 @@ Adresas: %4</translation> <translation>Sandorio būklė. Užvedus pelės žymeklį ant šios srities matysite patvirtinimų skaičių.</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="597"/> - <source>Date and time that the transaction was received.</source> - <translation>Sandorio gavimo data ir laikas</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="599"/> <source>Type of transaction.</source> <translation>Sandorio tipas</translation> @@ -1393,11 +1441,6 @@ Adresas: %4</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Date</source> - <translation>Data</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> <source>Type</source> <translation>Tipas</translation> </message> @@ -1407,9 +1450,9 @@ Adresas: %4</translation> <translation>Adresas</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Amount</source> - <translation>Suma</translation> + <location filename="../transactiontablemodel.cpp" line="280"/> + <source>Open until %1</source> + <translation>Atidaryta kol %n</translation> </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="277"/> @@ -1421,25 +1464,20 @@ Adresas: %4</translation> </translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="280"/> - <source>Open until %1</source> - <translation>Atidaryta kol %n</translation> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Date</source> + <translation>Data</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="283"/> - <source>Offline (%1 confirmations)</source> - <translation>Atjungta (%1 patvirtinimai)</translation> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Amount</source> + <translation>Suma</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="286"/> <source>Unconfirmed (%1 of %2 confirmations)</source> <translation>Nepatvirtintos (%1 iš %2 patvirtinimų)</translation> </message> - <message> - <location filename="../transactiontablemodel.cpp" line="289"/> - <source>Confirmed (%1 confirmations)</source> - <translation>Patvirtinta (%1 patvirtinimai)</translation> - </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="297"/> <source>Mined balance will be available in %n more blocks</source> @@ -1455,26 +1493,6 @@ Adresas: %4</translation> <translation>Šis blokas negautas nė vienu iš mazgų ir matomai nepriimtas</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="306"/> - <source>Generated but not accepted</source> - <translation>Išgauta bet nepriimta</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="349"/> - <source>Received with</source> - <translation>Gauta su</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="351"/> - <source>Received from</source> - <translation>Gauta iš</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="354"/> - <source>Sent to</source> - <translation>Siųsta </translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="356"/> <source>Payment to yourself</source> <translation>Mokėjimas sau</translation> @@ -1484,10 +1502,80 @@ Adresas: %4</translation> <source>Mined</source> <translation>Išgauta</translation> </message> + <message> + <location filename="../transactiontablemodel.cpp" line="597"/> + <source>Date and time that the transaction was received.</source> + <translation>Sandorio gavimo data ir laikas</translation> + </message> </context> <context> <name>TransactionView</name> <message> + <location filename="../transactionview.cpp" line="74"/> + <source>Sent to</source> + <translation>Išsiųsta</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="280"/> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="281"/> + <source>Type</source> + <translation>Tipas</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="282"/> + <source>Label</source> + <translation>Žymė</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="76"/> + <source>To yourself</source> + <translation>Skirta sau</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="84"/> + <source>Enter address or label to search</source> + <translation>Įveskite adresą ar žymę į paiešką</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="90"/> + <source>Min amount</source> + <translation>Minimali suma</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="57"/> + <source>This week</source> + <translation>Šią savaitę</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="279"/> + <source>Confirmed</source> + <translation>Patvirtintas</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="78"/> + <source>Other</source> + <translation>Kita</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="72"/> + <source>Received with</source> + <translation>Gauta su</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="126"/> + <source>Copy amount</source> + <translation>Kopijuoti sumą</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="127"/> + <source>Edit label</source> + <translation>Taisyti žymę</translation> + </message> + <message> <location filename="../transactionview.cpp" line="55"/> <location filename="../transactionview.cpp" line="71"/> <source>All</source> @@ -1499,11 +1587,6 @@ Adresas: %4</translation> <translation>Šiandien</translation> </message> <message> - <location filename="../transactionview.cpp" line="57"/> - <source>This week</source> - <translation>Šią savaitę</translation> - </message> - <message> <location filename="../transactionview.cpp" line="58"/> <source>This month</source> <translation>Šį mėnesį</translation> @@ -1524,36 +1607,11 @@ Adresas: %4</translation> <translation>Grupė</translation> </message> <message> - <location filename="../transactionview.cpp" line="279"/> - <source>Confirmed</source> - <translation>Patvirtintas</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="76"/> - <source>To yourself</source> - <translation>Skirta sau</translation> - </message> - <message> <location filename="../transactionview.cpp" line="77"/> <source>Mined</source> <translation>Išgauta</translation> </message> <message> - <location filename="../transactionview.cpp" line="78"/> - <source>Other</source> - <translation>Kita</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="84"/> - <source>Enter address or label to search</source> - <translation>Įveskite adresą ar žymę į paiešką</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="90"/> - <source>Min amount</source> - <translation>Minimali suma</translation> - </message> - <message> <location filename="../transactionview.cpp" line="124"/> <source>Copy address</source> <translation>Kopijuoti adresą</translation> @@ -1564,26 +1622,6 @@ Adresas: %4</translation> <translation>Kopijuoti žymę</translation> </message> <message> - <location filename="../transactionview.cpp" line="72"/> - <source>Received with</source> - <translation>Gauta su</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="126"/> - <source>Copy amount</source> - <translation>Kopijuoti sumą</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="127"/> - <source>Edit label</source> - <translation>Taisyti žymę</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="74"/> - <source>Sent to</source> - <translation>Išsiųsta</translation> - </message> - <message> <location filename="../transactionview.cpp" line="128"/> <source>Show details...</source> <translation>Parodyti išsamiai</translation> @@ -1599,21 +1637,6 @@ Adresas: %4</translation> <translation>Kableliais atskirtų duomenų failas (*.csv)</translation> </message> <message> - <location filename="../transactionview.cpp" line="280"/> - <source>Date</source> - <translation>Data</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="281"/> - <source>Type</source> - <translation>Tipas</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="282"/> - <source>Label</source> - <translation>Žymė</translation> - </message> - <message> <location filename="../transactionview.cpp" line="283"/> <source>Address</source> <translation>Adresas</translation> @@ -1652,7 +1675,7 @@ Adresas: %4</translation> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>Siunčiama</translation> </message> @@ -1660,400 +1683,484 @@ Adresas: %4</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>Nurodyti pid failą (pagal nutylėjimą: bitcoind.pid)</translation> + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>Username for JSON-RPC connections</source> + <translation>Vartotojo vardas JSON-RPC jungimuisi</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Generate coins</source> - <translation>Sukurti monetas</translation> + <location filename="../bitcoinstrings.cpp" line="113"/> + <source>Loading addresses...</source> + <translation>Užkraunami adresai...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Don't generate coins</source> - <translation>Neišgavinėti monetų</translation> + <location filename="../bitcoinstrings.cpp" line="79"/> + <source>Run in the background as a daemon and accept commands</source> + <translation>Dirbti fone kaip šešėlyje ir priimti komandas</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> - <source>Done loading</source> - <translation>Pakrovimas baigtas</translation> + <location filename="../bitcoinstrings.cpp" line="83"/> + <source>Send trace/debug info to console instead of debug.log file</source> + <translation>Siųsti atsekimo/derinimo info į konsolę vietoj debug.log failo</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> - <source>Username for JSON-RPC connections</source> - <translation>Vartotojo vardas JSON-RPC jungimuisi</translation> + <location filename="../bitcoinstrings.cpp" line="84"/> + <source>Send trace/debug info to debugger</source> + <translation>Siųsti sekimo/derinimo info derintojui</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> - <source>This help message</source> - <translation>Pagelbos žinutė</translation> + <location filename="../bitcoinstrings.cpp" line="43"/> + <source>Send command to -server or bitcoind</source> + <translation>Siųsti komandą serveriui arba bitcoind</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> - <source>Loading addresses...</source> - <translation>Užkraunami adresai...</translation> + <location filename="../bitcoinstrings.cpp" line="67"/> + <source>Threshold for disconnecting misbehaving peers (default: 100)</source> + <translation>Atjungimo dėl netinkamo kolegų elgesio riba (pagal nutylėjimą: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> - <source>Error loading blkindex.dat</source> - <translation>blkindex.dat pakrovimo klaida</translation> + <location filename="../bitcoinstrings.cpp" line="118"/> + <source>Error loading wallet.dat: Wallet corrupted</source> + <translation> wallet.dat pakrovimo klaida, wallet.dat sugadintas</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> - <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation>Piniginė turi būti prrašyta: įvykdymui perkraukite Bitcoin</translation> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>Error loading wallet.dat</source> + <translation> wallet.dat pakrovimo klaida</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> + <location filename="../bitcoinstrings.cpp" line="115"/> <source>Loading block index...</source> <translation>Užkraunami blokų indeksai...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Usage:</source> - <translation>Naudojimas:</translation> + <location filename="../bitcoinstrings.cpp" line="45"/> + <source>Get help for a command</source> + <translation>Suteikti pagalba komandai</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> - <source>Run in the background as a daemon and accept commands</source> - <translation>Dirbti fone kaip šešėlyje ir priimti komandas</translation> + <location filename="../bitcoinstrings.cpp" line="60"/> + <source>Maintain at most <n> connections to peers (default: 125)</source> + <translation>Palaikyti ne daugiau <n> jungčių kolegoms (pagal nutylėjimą: 125)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> - <source>Use the test network</source> - <translation>Naudoti testavimo tinklą</translation> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Error loading blkindex.dat</source> + <translation>blkindex.dat pakrovimo klaida</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> - <source>Prepend debug output with timestamp</source> - <translation>Prideėti laiko žymę derinimo rezultatams</translation> + <location filename="../bitcoinstrings.cpp" line="41"/> + <source>Bitcoin version</source> + <translation>Bitcoin versija</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Siųsti atsekimo/derinimo info į konsolę vietoj debug.log failo</translation> + <location filename="../bitcoinstrings.cpp" line="119"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> + <translation> wallet.dat pakrovimo klaida, wallet.dat reikalauja naujasnės Bitcoin versijos</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Send trace/debug info to debugger</source> - <translation>Siųsti sekimo/derinimo info derintojui</translation> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Siunčiama</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> + <location filename="../bitcoinstrings.cpp" line="42"/> + <source>Usage:</source> + <translation>Naudojimas:</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Prepend debug output with timestamp</source> + <translation>Prideėti laiko žymę derinimo rezultatams</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="86"/> <source>Password for JSON-RPC connections</source> <translation>Slaptažodis JSON-RPC sujungimams</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> + <location filename="../bitcoinstrings.cpp" line="87"/> <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation>Klausymas JSON-RPC sujungimui prijungčiai <port> (pagal nutylėjimą: 8332)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> + <location filename="../bitcoinstrings.cpp" line="88"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Leisti JSON-RPC tik iš nurodytų IP adresų</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>Siųsti komandą mazgui dirbančiam <ip> (pagal nutylėjimą: 127.0.0.1)</translation> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>Nurodyti pid failą (pagal nutylėjimą: bitcoind.pid)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation>Nustatyti rakto apimties dydį <n> (pagal nutylėjimą: 100)</translation> + <location filename="../bitcoinstrings.cpp" line="49"/> + <source>Generate coins</source> + <translation>Sukurti monetas</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> - <source>Rescan the block chain for missing wallet transactions</source> - <translation>Ieškoti prarastų piniginės sandorių blokų grandinėje</translation> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>Done loading</source> + <translation>Pakrovimas baigtas</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> - <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>Naudoti OpenSSL (https) jungimuisi JSON-RPC </translation> + <location filename="../bitcoinstrings.cpp" line="107"/> + <source>This help message</source> + <translation>Pagelbos žinutė</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> - <source>Server certificate file (default: server.cert)</source> - <translation>Serverio sertifikato failas (pagal nutylėjimą: server.cert)</translation> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>Negali gauti duomenų katalogo %s rakto. Bitcoin tikriausiai jau veikia.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> - <source>Server private key (default: server.pem)</source> - <translation>Serverio privatus raktas (pagal nutylėjimą: server.pem)</translation> + <location filename="../bitcoinstrings.cpp" line="120"/> + <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> + <translation>Piniginė turi būti prrašyta: įvykdymui perkraukite Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>Priimtini šifrai (pagal nutylėjimą: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> + <location filename="../bitcoinstrings.cpp" line="80"/> + <source>Use the test network</source> + <translation>Naudoti testavimo tinklą</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Send command to -server or bitcoind</source> - <translation>Siųsti komandą serveriui arba bitcoind</translation> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Options:</source> - <translation>Opcijos:</translation> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify configuration file (default: bitcoin.conf)</source> - <translation>Nurodyti konfigūracijos failą (pagal nutylėjimąt: bitcoin.conf)</translation> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Specify data directory</source> - <translation>Nustatyti duomenų direktoriją</translation> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation>Klaida</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Nustatyti sujungimo trukmę (milisekundėmis)</translation> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation>Sujungimo klausymas prijungčiai <port> (pagal nutylėjimą: 8333 arba testnet: 18333)</translation> + <location filename="../bitcoinstrings.cpp" line="52"/> + <source>Show splash screen on startup (default: 1)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> - <source>Rescanning...</source> - <translation>Peržiūra</translation> + <location filename="../bitcoinstrings.cpp" line="54"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Threshold for disconnecting misbehaving peers (default: 100)</source> - <translation>Atjungimo dėl netinkamo kolegų elgesio riba (pagal nutylėjimą: 100)</translation> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation>Sekundžių kiekis eikiamas palaikyti ryšį dėl lygiarangių nestabilumo (pagal nutylėjimą: 86.400)</translation> + <location filename="../bitcoinstrings.cpp" line="63"/> + <source>Find peers using internet relay chat (default: 0)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> - <source>Error loading wallet.dat: Wallet corrupted</source> - <translation> wallet.dat pakrovimo klaida, wallet.dat sugadintas</translation> + <location filename="../bitcoinstrings.cpp" line="64"/> + <source>Accept connections from outside (default: 1)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> - <source>Error loading wallet.dat</source> - <translation> wallet.dat pakrovimo klaida</translation> + <location filename="../bitcoinstrings.cpp" line="65"/> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Nustatyti kalbą, pavyzdžiui "lt_LT" (numatyta: sistemos kalba)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> - <source>Loading wallet...</source> - <translation>Užkraunama piniginė...</translation> + <location filename="../bitcoinstrings.cpp" line="66"/> + <source>Find peers using DNS lookup (default: 1)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> - <source>List commands</source> - <translation>Komandų sąrašas</translation> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Get help for a command</source> - <translation>Suteikti pagalba komandai</translation> + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>Siųsti komandą mazgui dirbančiam <ip> (pagal nutylėjimą: 127.0.0.1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Show splash screen on startup (default: 1)</source> + <location filename="../bitcoinstrings.cpp" line="90"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Set database cache size in megabytes (default: 25)</source> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Upgrade wallet to latest format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Maintain at most <n> connections to peers (default: 125)</source> - <translation>Palaikyti ne daugiau <n> jungčių kolegoms (pagal nutylėjimą: 125)</translation> + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>Nustatyti rakto apimties dydį <n> (pagal nutylėjimą: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Add a node to connect to and attempt to keep the connection open</source> - <translation>Pridėti mazgą prie sujungti su and attempt to keep the connection open</translation> + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation>Ieškoti prarastų piniginės sandorių blokų grandinėje</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Find peers using internet relay chat (default: 0)</source> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Accept connections from outside (default: 1)</source> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>How thorough the block verification is (0-6, default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Nustatyti kalbą, pavyzdžiui "lt_LT" (numatyta: sistemos kalba)</translation> + <location filename="../bitcoinstrings.cpp" line="101"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>Naudoti OpenSSL (https) jungimuisi JSON-RPC </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Find peers using DNS lookup (default: 1)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="102"/> + <source>Server certificate file (default: server.cert)</source> + <translation>Serverio sertifikato failas (pagal nutylėjimą: server.cert)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="103"/> + <source>Server private key (default: server.pem)</source> + <translation>Serverio privatus raktas (pagal nutylėjimą: server.pem)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>Priimtini šifrai (pagal nutylėjimą: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="46"/> + <source>Options:</source> + <translation>Opcijos:</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="47"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation>Nurodyti konfigūracijos failą (pagal nutylėjimąt: bitcoin.conf)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Specify data directory</source> + <translation>Nustatyti duomenų direktoriją</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Specify connection timeout (in milliseconds)</source> + <translation>Nustatyti sujungimo trukmę (milisekundėmis)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source>Rescanning...</source> + <translation>Peržiūra</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation>Naudojimas</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation>Maksimalus buferis priėmimo sujungimui <n>*1000 bitų (pagal nutylėjimą: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation>Maksimalus buferis siuntimo sujungimui <n>*1000 bitų (pagal nutylėjimą: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished">Bandymas naudoti UPnP struktūra klausymosi prievadui (default: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Use Universal Plug and Play to map the listening port (default: 0)</source> - <translation type="unfinished">Bandymas naudoti UPnP struktūra klausymosi prievadui (default: 0)</translation> + <location filename="../bitcoinstrings.cpp" line="81"/> + <source>Output extra debugging information</source> + <translation>Išėjimo papildomas derinimo informacija</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> - <source>Accept command line and JSON-RPC commands</source> - <translation>Priimti komandinę eilutę ir JSON-RPC komandas</translation> + <location filename="../bitcoinstrings.cpp" line="98"/> + <source> +SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation>SSL opcijos (žr.e Bitcoin Wiki for SSL setup instructions)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> - <source>Output extra debugging information</source> - <translation>Išėjimo papildomas derinimo informacija</translation> + <location filename="../bitcoinstrings.cpp" line="44"/> + <source>List commands</source> + <translation>Komandų sąrašas</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> - <source>Upgrade wallet to latest format</source> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> - <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">KLAIDA:nepavyko sudaryti sandorio.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> - <source>How thorough the block verification is (0-6, default: 1)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">Klaida: sandoris buvo atmestas.Tai gali įvykti, jei kai kurios monetos iš jūsų piniginėje jau buvo panaudotos, pvz. jei naudojote wallet.dat kopiją ir monetos buvo išleistos kopijoje, bet nepažymėtos kaip skirtos išleisti čia.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> - <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation>SSL opcijos (žr.e Bitcoin Wiki for SSL setup instructions)</translation> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> + <location filename="../bitcoinstrings.cpp" line="114"/> <source>Error loading addr.dat</source> <translation>addr.dat pakrovimo klaida</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> + <location filename="../bitcoinstrings.cpp" line="123"/> <source>Cannot initialize keypool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> + <location filename="../bitcoinstrings.cpp" line="124"/> <source>Cannot write default address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation>Neteisingas proxy adresas</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> + <location filename="../bitcoinstrings.cpp" line="128"/> <source>Invalid amount for -paytxfee=<amount></source> <translation>Neteisinga suma -paytxfee=<amount></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> + <location filename="../bitcoinstrings.cpp" line="129"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation>Įspėjimas: -paytxfee yra nustatytas per didelis. Tai sandorio mokestis, kurį turėsite mokėti, jei siųsite sandorį.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation>Klaida: nepasileidžia CreateThread(StartNode) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> + <location filename="../bitcoinstrings.cpp" line="133"/> <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> <translation>Nepavyko susieti šiame kompiuteryje prievado %d. Bitcoin tikriausiai jau veikia.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> - <translation>Įspėjimas: Patikrinkite, kad kompiuterio data ir laikas yra teisingi.Jei Jūsų laikrodis neteisingai nustatytas Bitcoin, veiks netinkamai.</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="95"/> + <location filename="../bitcoinstrings.cpp" line="20"/> <source>Warning: Disk space is low</source> <translation>Įspėjimas: nepakanka vietos diske</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> + <location filename="../bitcoinstrings.cpp" line="51"/> <source>Start minimized</source> <translation>Pradžia sumažinta</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> + <location filename="../bitcoinstrings.cpp" line="57"/> <source>Connect through socks4 proxy</source> <translation>Prisijungti per socks4 proxy</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> + <location filename="../bitcoinstrings.cpp" line="58"/> <source>Allow DNS lookups for addnode and connect</source> <translation>Leisti DNS paiešką sujungimui ir mazgo pridėjimui</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> + <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation>Prisijungti tik prie nurodyto mazgo</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Bitcoin version</source> - <translation>Bitcoin versija</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="41"/> + <location filename="../bitcoinstrings.cpp" line="77"/> <source>Fee per KB to add to transactions you send</source> <translation>Įtraukti mokestį už kB siunčiamiems sandoriams</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>beta</translation> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Loading wallet...</source> + <translation>Užkraunama piniginė...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation> wallet.dat pakrovimo klaida, wallet.dat reikalauja naujasnės Bitcoin versijos</translation> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>Neteisinga suma</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="61"/> + <source>Add a node to connect to and attempt to keep the connection open</source> + <translation>Pridėti mazgą prie sujungti su and attempt to keep the connection open</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="74"/> + <source>Use Universal Plug and Play to map the listening port (default: 0)</source> + <translation type="unfinished">Bandymas naudoti UPnP struktūra klausymosi prievadui (default: 0)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="78"/> + <source>Accept command line and JSON-RPC commands</source> + <translation>Priimti komandinę eilutę ir JSON-RPC komandas</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="50"/> + <source>Don't generate coins</source> + <translation>Neišgavinėti monetų</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="59"/> + <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> + <translation>Sujungimo klausymas prijungčiai <port> (pagal nutylėjimą: 8333 arba testnet: 18333)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="68"/> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> + <translation>Sekundžių kiekis eikiamas palaikyti ryšį dėl lygiarangių nestabilumo (pagal nutylėjimą: 86.400)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <translation>Įspėjimas: Patikrinkite, kad kompiuterio data ir laikas yra teisingi.Jei Jūsų laikrodis neteisingai nustatytas Bitcoin, veiks netinkamai.</translation> </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts index 853d2c4eb0..fbe417c11d 100644 --- a/src/qt/locale/bitcoin_nb.ts +++ b/src/qt/locale/bitcoin_nb.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> versjon</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -70,6 +70,11 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>&Kopier til utklippstavle</translation> </message> <message> + <location filename="../forms/addressbookpage.ui" line="85"/> + <source>Show &QR Code</source> + <translation>Vis &QR Kode</translation> + </message> + <message> <location filename="../forms/addressbookpage.ui" line="99"/> <source>Sign &Message</source> <translation>Signér &melding</translation> @@ -85,52 +90,47 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>&Slett</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="85"/> - <source>Show &QR Code</source> - <translation>Vis &QR Kode</translation> - </message> - <message> <location filename="../forms/addressbookpage.ui" line="96"/> <source>Sign a message to prove you own this address</source> <translation>Signér en melding for å bevise at du eier denne adressen</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation>Kommaseparert fil (*.csv)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> - <source>Copy label</source> - <translation>Kopier merkelapp</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>Kopier adresse</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> - <source>Edit</source> - <translation>Rediger</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>Slett</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation>Kunne ikke skrive til filen %1.</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="66"/> + <source>Copy label</source> + <translation>Kopier merkelapp</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="67"/> + <source>Edit</source> + <translation>Rediger</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation>Eksporter adressebok</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>Feil ved eksportering</translation> </message> @@ -139,13 +139,13 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <name>AddressTableModel</name> <message> <location filename="../addresstablemodel.cpp" line="78"/> - <source>Label</source> - <translation>Merkelapp</translation> + <source>Address</source> + <translation>Adresse</translation> </message> <message> <location filename="../addresstablemodel.cpp" line="78"/> - <source>Address</source> - <translation>Adresse</translation> + <source>Label</source> + <translation>Merkelapp</translation> </message> <message> <location filename="../addresstablemodel.cpp" line="114"/> @@ -156,14 +156,9 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <context> <name>AskPassphraseDialog</name> <message> - <location filename="../forms/askpassphrasedialog.ui" line="61"/> - <source>New passphrase</source> - <translation>Ny adgangsfrase</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="46"/> - <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>Denne operasjonen krever adgangsfrasen til lommeboken for å dekryptere den.</translation> + <location filename="../forms/askpassphrasedialog.ui" line="47"/> + <source>Enter passphrase</source> + <translation>Angi adgangsfrase</translation> </message> <message> <location filename="../forms/askpassphrasedialog.ui" line="94"/> @@ -171,9 +166,19 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Merkelapp</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="38"/> - <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>Denne operasjonen krever adgangsfrasen til lommeboken for å låse den opp.</translation> + <location filename="../askpassphrasedialog.cpp" line="113"/> + <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>Bitcoin vil nå lukkes for å fullføre krypteringsprosessen. Husk at kryptering av lommeboken ikke fullt ut kan beskytte dine bitcoins fra å bli stjålet om skadevare infiserer datamaskinen.</translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="26"/> + <source>Dialog</source> + <translation>Dialog</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="43"/> + <source>Unlock wallet</source> + <translation>Lås opp lommebok</translation> </message> <message> <location filename="../forms/askpassphrasedialog.ui" line="75"/> @@ -181,24 +186,32 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Gjenta ny adgangsfrase</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="26"/> - <source>Dialog</source> - <translation>Dialog</translation> + <location filename="../forms/askpassphrasedialog.ui" line="61"/> + <source>New passphrase</source> + <translation>Ny adgangsfrase</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="47"/> - <source>Enter passphrase</source> - <translation>Angi adgangsfrase</translation> + <location filename="../askpassphrasedialog.cpp" line="134"/> + <location filename="../askpassphrasedialog.cpp" line="182"/> + <source>The supplied passphrases do not match.</source> + <translation>De angitte adgangsfrasene er ulike.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="51"/> - <source>Decrypt wallet</source> - <translation>Dekrypter lommebok</translation> + <location filename="../askpassphrasedialog.cpp" line="38"/> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Denne operasjonen krever adgangsfrasen til lommeboken for å låse den opp.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="35"/> - <source>Encrypt wallet</source> - <translation>Krypter lommebok</translation> + <location filename="../askpassphrasedialog.cpp" line="46"/> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Denne operasjonen krever adgangsfrasen til lommeboken for å dekryptere den.</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="102"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! +Are you sure you wish to encrypt your wallet?</source> + <translation>ADVARSEL: Hvis du krypterer lommeboken og mister adgangsfrasen vil du <b>MISTE ALLE DINE BITCOINS</b>! +Er du sikker på at du vil kryptere lommeboken?</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="54"/> @@ -206,16 +219,6 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Endre adgangsfrase</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="55"/> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Skriv inn gammel og ny adgangsfrase for lommeboken.</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="101"/> - <source>Confirm wallet encryption</source> - <translation>Bekreft kryptering av lommebok</translation> - </message> - <message> <location filename="../askpassphrasedialog.cpp" line="126"/> <location filename="../askpassphrasedialog.cpp" line="133"/> <location filename="../askpassphrasedialog.cpp" line="175"/> @@ -224,41 +227,39 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Kryptering av lommebok feilet</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="111"/> - <location filename="../askpassphrasedialog.cpp" line="169"/> - <source>Wallet encrypted</source> - <translation>Lommebok kryptert</translation> + <location filename="../askpassphrasedialog.cpp" line="101"/> + <source>Confirm wallet encryption</source> + <translation>Bekreft kryptering av lommebok</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="113"/> - <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> - <translation>Bitcoin vil nå lukkes for å fullføre krypteringsprosessen. Husk at kryptering av lommeboken ikke fullt ut kan beskytte dine bitcoins fra å bli stjålet om skadevare infiserer datamaskinen.</translation> + <location filename="../askpassphrasedialog.cpp" line="127"/> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Kryptering av lommebok feilet på grunn av en intern feil. Din lommebok ble ikke kryptert.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="117"/> - <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation type="unfinished"></translation> + <location filename="../askpassphrasedialog.cpp" line="51"/> + <source>Decrypt wallet</source> + <translation>Dekrypter lommebok</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="127"/> - <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>Kryptering av lommebok feilet på grunn av en intern feil. Din lommebok ble ikke kryptert.</translation> + <location filename="../askpassphrasedialog.cpp" line="34"/> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>Skriv inn den nye adgangsfrasen for lommeboken.<br/>Vennligst bruk en adgangsfrase med <b>10 eller flere tilfeldige tegn</b>, eller <b>åtte eller flere ord</b>.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="134"/> - <location filename="../askpassphrasedialog.cpp" line="182"/> - <source>The supplied passphrases do not match.</source> - <translation>De angitte adgangsfrasene er ulike.</translation> + <location filename="../askpassphrasedialog.cpp" line="35"/> + <source>Encrypt wallet</source> + <translation>Krypter lommebok</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="156"/> - <source>Wallet decryption failed</source> - <translation>Dekryptering av lommebok feilet</translation> + <location filename="../askpassphrasedialog.cpp" line="55"/> + <source>Enter the old and new passphrase to the wallet.</source> + <translation>Skriv inn gammel og ny adgangsfrase for lommeboken.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="170"/> - <source>Wallet passphrase was successfully changed.</source> - <translation>Adgangsfrase for lommebok endret.</translation> + <location filename="../askpassphrasedialog.cpp" line="117"/> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="217"/> @@ -267,21 +268,15 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Advarsel: Caps lock tasten er på.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="34"/> - <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>Skriv inn den nye adgangsfrasen for lommeboken.<br/>Vennligst bruk en adgangsfrase med <b>10 eller flere tilfeldige tegn</b>, eller <b>åtte eller flere ord</b>.</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="43"/> - <source>Unlock wallet</source> - <translation>Lås opp lommebok</translation> + <location filename="../askpassphrasedialog.cpp" line="111"/> + <location filename="../askpassphrasedialog.cpp" line="169"/> + <source>Wallet encrypted</source> + <translation>Lommebok kryptert</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="102"/> - <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! -Are you sure you wish to encrypt your wallet?</source> - <translation>ADVARSEL: Hvis du krypterer lommeboken og mister adgangsfrasen vil du <b>MISTE ALLE DINE BITCOINS</b>! -Er du sikker på at du vil kryptere lommeboken?</translation> + <location filename="../askpassphrasedialog.cpp" line="170"/> + <source>Wallet passphrase was successfully changed.</source> + <translation>Adgangsfrase for lommebok endret.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="145"/> @@ -295,125 +290,146 @@ Er du sikker på at du vil kryptere lommeboken?</translation> <source>The passphrase entered for the wallet decryption was incorrect.</source> <translation>Adgangsfrasen angitt for dekryptering av lommeboken var feil.</translation> </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="156"/> + <source>Wallet decryption failed</source> + <translation>Dekryptering av lommebok feilet</translation> + </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="206"/> - <source>Show the list of addresses for receiving payments</source> - <translation>Vis listen over adresser for mottak av betalinger</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> - <translation>&Eksporter...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="238"/> - <source>Quit application</source> - <translation>Avslutt applikasjonen</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="242"/> - <source>Show information about Bitcoin</source> - <translation>Vis informasjon om Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="506"/> + <source>Synchronizing with network...</source> + <translation>Synkroniserer med nettverk...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> - <source>&Send coins</source> - <translation>&Send bitcoins</translation> + <location filename="../bitcoingui.cpp" line="186"/> + <source>Show general overview of wallet</source> + <translation>Vis generell oversikt over lommeboken</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> - <source>&Address Book</source> - <translation>&Adressebok</translation> + <location filename="../bitcoingui.cpp" line="191"/> + <source>&Transactions</source> + <translation>&Transaksjoner</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> - <source>Sending...</source> - <translation>Sender...</translation> + <location filename="../bitcoingui.cpp" line="71"/> + <source>Bitcoin Wallet</source> + <translation>Bitcoin Lommebok</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> + <location filename="../bitcoingui.cpp" line="258"/> <source>Change the passphrase used for wallet encryption</source> <translation>Endre adgangsfrasen brukt for kryptering av lommebok</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> + <location filename="../bitcoingui.cpp" line="242"/> + <source>About &Qt</source> + <translation>Om &Qt</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="198"/> <source>Edit the list of stored addresses and labels</source> <translation>Rediger listen over adresser og deres merkelapper</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation>&Motta bitcoins</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> - <source>Show general overview of wallet</source> - <translation>Vis generell oversikt over lommeboken</translation> + <location filename="../bitcoingui.cpp" line="281"/> + <source>&File</source> + <translation>&Fil</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="187"/> - <source>&Overview</source> - <translation>&Oversikt</translation> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation>Gjem/vis &Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> - <source>&Transactions</source> - <translation>&Transaksjoner</translation> + <location filename="../bitcoingui.cpp" line="192"/> + <source>Browse transaction history</source> + <translation>Vis transaksjonshistorikk</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> - <source>&File</source> - <translation>&Fil</translation> + <location filename="../bitcoingui.cpp" line="197"/> + <source>&Address Book</source> + <translation>&Adressebok</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> - <source>Synchronizing with network...</source> - <translation>Synkroniserer med nettverk...</translation> + <location filename="../bitcoingui.cpp" line="204"/> + <source>Show the list of addresses for receiving payments</source> + <translation>Vis listen over adresser for mottak av betalinger</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> + <location filename="../bitcoingui.cpp" line="210"/> <source>Send coins to a bitcoin address</source> <translation>Send bitcoins til en adresse</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> + <location filename="../bitcoingui.cpp" line="215"/> + <source>Sign &message</source> + <translation>Signér &melding</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="216"/> + <source>Prove you control an address</source> + <translation>Bevis at du kontrollerer en adresse</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation>Vis eller gjem Bitcoinvinduet</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="250"/> + <source>&Export...</source> + <translation>&Eksporter...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="251"/> <source>Export the data in the current tab to a file</source> <translation>Eksporter data fra nåværende fane til fil</translation> </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> - <source>%n hour(s) ago</source> - <translation> - <numerusform>for %n time siden</numerusform> - <numerusform>for %n timer siden</numerusform> - </translation> + <message> + <location filename="../bitcoingui.cpp" line="252"/> + <source>&Encrypt Wallet</source> + <translation>&Krypter Lommebok</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="256"/> + <source>Backup wallet to another location</source> + <translation>Sikkerhetskopiér lommebok til annet sted</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> + <location filename="../bitcoingui.cpp" line="296"/> <source>&Help</source> <translation>&Hjelp</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> - <source>Browse transaction history</source> - <translation>Vis transaksjonshistorikk</translation> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation>Bitcoinklient</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> - <source>&Options...</source> - <translation>&Innstillinger...</translation> + <location filename="../bitcoingui.cpp" line="632"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="255"/> - <source>Encrypt or decrypt wallet</source> - <translation>Krypter eller dekrypter lommebok</translation> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Backup Wallet</source> + <translation>Sikkerhetskopiér Lommebok</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Wallet Data (*.dat)</source> + <translation>Lommeboksdata (*.dat)</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> + <location filename="../bitcoingui.cpp" line="482"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n aktiv forbindelse til Bitcoin-nettverket</numerusform> @@ -421,32 +437,17 @@ Er du sikker på at du vil kryptere lommeboken?</translation> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> - <source>Tabs toolbar</source> - <translation>Verktøylinje for faner</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Backup Wallet</source> - <translation>Sikkerhetskopiér Lommebok</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Wallet Data (*.dat)</source> - <translation>Lommeboksdata (*.dat)</translation> + <location filename="../bitcoingui.cpp" line="209"/> + <source>&Send coins</source> + <translation>&Send bitcoins</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> + <location filename="../bitcoingui.cpp" line="531"/> <source>Downloaded %1 blocks of transaction history.</source> <translation>Lastet ned %1 blokker med transaksjonshistorikk.</translation> </message> - <message> - <location filename="../bitcoingui.cpp" line="73"/> - <source>Bitcoin Wallet</source> - <translation>Bitcoin Lommebok</translation> - </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation> <numerusform>for %n minutt siden</numerusform> @@ -454,17 +455,22 @@ Er du sikker på at du vil kryptere lommeboken?</translation> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="185"/> + <source>&Overview</source> + <translation>&Oversikt</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation>[testnett]</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation>Siste mottatte blokk ble generert %1.</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>for %n dag siden</numerusform> @@ -472,22 +478,30 @@ Er du sikker på at du vil kryptere lommeboken?</translation> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation>Ajour</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>Kommer ajour...</translation> </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation> + <numerusform>~%n blokk gjenstår</numerusform> + <numerusform>~%n blokker gjenstår</numerusform> + </translation> + </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> - <source>Prove you control an address</source> - <translation>Bevis at du kontrollerer en adresse</translation> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>Lastet ned %1 av %2 blokker med transaksjonshistorikk (%3% ferdig).</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation> <numerusform>for %n sekund siden</numerusform> @@ -495,17 +509,17 @@ Er du sikker på at du vil kryptere lommeboken?</translation> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> + <location filename="../bitcoingui.cpp" line="663"/> <source>Sent transaction</source> <translation>Sendt transaksjon</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> + <location filename="../bitcoingui.cpp" line="664"/> <source>Incoming transaction</source> <translation>Innkommende transaksjon</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -518,143 +532,136 @@ Adresse: %4 </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> - <source>E&xit</source> - <translation>&Avslutt</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Lommeboken er <b>kryptert</b> og for tiden <b>ulåst</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Lommeboken er <b>kryptert</b> og for tiden <b>låst</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> - <source>Show information about Qt</source> - <translation>Vis informasjon om Qt</translation> + <location filename="../bitcoingui.cpp" line="235"/> + <source>E&xit</source> + <translation>&Avslutt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Synkronisering av blokk-kjede igang</translation> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation> &Om %1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> - <source>Sign &message</source> - <translation>Signér &melding</translation> + <location filename="../bitcoingui.cpp" line="243"/> + <source>Show information about Qt</source> + <translation>Vis informasjon om Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> - <source>About &Qt</source> - <translation>Om &Qt</translation> + <location filename="../bitcoingui.cpp" line="245"/> + <source>&Options...</source> + <translation>&Innstillinger...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> + <location filename="../bitcoingui.cpp" line="246"/> <source>Modify configuration options for bitcoin</source> <translation>Endre innstillinger for bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation>&Krypter Lommebok</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="257"/> - <source>&Backup Wallet</source> - <translation>Lag &Sikkerhetskopi av Lommebok</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>Lastet ned %1 av %2 blokker med transaksjonshistorikk.</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="615"/> - <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation>Sikkerhetskopiering feilet</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation>En feil oppstod ved lagring av lommebok til nytt sted</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> - <source>Backup wallet to another location</source> - <translation>Sikkerhetskopiér lommebok til annet sted</translation> + <location filename="../bitcoingui.cpp" line="255"/> + <source>&Backup Wallet</source> + <translation>Lag &Sikkerhetskopi av Lommebok</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> - <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> - <translation>En fatal feil har inntruffet. Det er ikke trygt å fortsette og Bitcoin må derfor avslutte.</translation> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation>&Endre Adgangsfrase</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="240"/> + <source>Show information about Bitcoin</source> + <translation>Vis informasjon om Bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="253"/> + <source>Encrypt or decrypt wallet</source> + <translation>Krypter eller dekrypter lommebok</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> + <location filename="../bitcoingui.cpp" line="290"/> <source>&Settings</source> <translation>&Innstillinger</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> + <location filename="../bitcoingui.cpp" line="303"/> + <source>Tabs toolbar</source> + <translation>Verktøylinje for faner</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="314"/> <source>Actions toolbar</source> <translation>Verktøylinje for handlinger</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> + <location filename="../bitcoingui.cpp" line="418"/> <source>bitcoin-qt</source> <translation>bitcoin-qt</translation> </message> - <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation> &Om %1</translation> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="554"/> + <source>%n hour(s) ago</source> + <translation> + <numerusform>for %n time siden</numerusform> + <numerusform>for %n timer siden</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>&Endre Adgangsfrase</translation> + <location filename="../bitcoin.cpp" line="127"/> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>En fatal feil har inntruffet. Det er ikke trygt å fortsette og Bitcoin må derfor avslutte.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>Åpne &Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="636"/> + <source>Sending...</source> + <translation>Sender...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Vis Bitcoin-vinduet</translation> + <location filename="../bitcoingui.cpp" line="236"/> + <source>Quit application</source> + <translation>Avslutt applikasjonen</translation> </message> </context> <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&Enhet for å vise beløp i: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>Velg standard underenhet som skal vises i grensesnittet og ved sending av mynter</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> - <source>&Display addresses in transaction list</source> - <translation>&Vis adresser i transaksjonslisten</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished">Om Bitcoin-adresser skal vises i transaksjonslisten eller ikke</translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="284"/> + <source>&Display addresses in transaction list</source> + <translation>&Vis adresser i transaksjonslisten</translation> + </message> </context> <context> <name>EditAddressDialog</name> @@ -727,84 +734,94 @@ Adresse: %4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Start Bitcoin automatisk når datamaskinen blir slått på</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>&Start Bitcoin ved oppstart</translation> </message> <message> <location filename="../optionsdialog.cpp" line="176"/> + <source>&Minimize to the tray instead of the taskbar</source> + <translation>&Minimer til systemkurv istedenfor oppgavelinjen</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>Vis kun ikon i systemkurv etter minimering av vinduet</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="180"/> <source>M&inimize on close</source> <translation>M&inimér ved lukking</translation> </message> <message> <location filename="../optionsdialog.cpp" line="186"/> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimerer vinduet istedenfor å avslutte applikasjonen når vinduet lukkes. Når dette er slått på avsluttes applikasjonen kun ved å velge avslutt i menyen.</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="181"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Åpne automatisk Bitcoin klientporten på ruteren. Dette virker kun om din ruter støtter UPnP og dette er påslått.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> - <source>&Minimize to the tray instead of the taskbar</source> - <translation>&Minimer til systemkurv istedenfor oppgavelinjen</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="180"/> + <location filename="../optionsdialog.cpp" line="185"/> <source>Map port using &UPnP</source> <translation>Sett opp port vha. &UPnP</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="181"/> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> + <translation>Minimerer vinduet istedenfor å avslutte applikasjonen når vinduet lukkes. Når dette er slått på avsluttes applikasjonen kun ved å velge avslutt i menyen.</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>&Koble til gjennom SOCKS4 proxy:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Koble til Bitcoin nettverket gjennom en SOCKS4 mellomtjener (f.eks. for tilkobling gjennom Tor)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> - <source>IP address of the proxy (e.g. 127.0.0.1)</source> - <translation>IP-adresse for mellomtjener (f.eks. 127.0.0.1)</translation> + <location filename="../optionsdialog.cpp" line="195"/> + <source>Proxy &IP: </source> + <translation>Mellomtjeners &IP: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> - <source>&Port: </source> - <translation>&Port: </translation> + <location filename="../optionsdialog.cpp" line="201"/> + <source>IP address of the proxy (e.g. 127.0.0.1)</source> + <translation>IP-adresse for mellomtjener (f.eks. 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Port for mellomtjener (f.eks. 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>Valgfritt transaksjonsgebyr per kB som sikrer at dine transaksjoner blir raskt prosessert. De fleste transaksjoner er 1 kB. Et gebyr på 0.01 er anbefalt.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>Betal transaksjons&gebyr</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> - <source>Proxy &IP: </source> - <translation>Mellomtjeners &IP: </translation> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation>Koble fra databaser ved avslutning</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation>Koble fra blokk og adresse databaser ved avslutning. Dette betyr at de kan flyttes til en annen mappe, men det gir en tregere avslutning. Lommeboken blir alltid koblet fra.</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="204"/> + <source>&Port: </source> + <translation>&Port: </translation> </message> </context> <context> @@ -820,16 +837,28 @@ Adresse: %4 <translation>Signér en melding for å bevise at du eier denne adressen</translation> </message> <message> - <location filename="../messagepage.cpp" line="101"/> - <source>Sign failed</source> - <translation>Signering feilet</translation> - </message> - <message> <location filename="../forms/messagepage.ui" line="131"/> <source>Copy the current signature to the system clipboard</source> <translation>Kopier valgt signatur til utklippstavle</translation> </message> <message> + <location filename="../forms/messagepage.ui" line="120"/> + <source>&Sign Message</source> + <translation>&Signér Melding</translation> + </message> + <message> + <location filename="../messagepage.cpp" line="74"/> + <location filename="../messagepage.cpp" line="89"/> + <location filename="../messagepage.cpp" line="101"/> + <source>Error signing</source> + <translation>Feil ved signering</translation> + </message> + <message> + <location filename="../messagepage.cpp" line="74"/> + <source>%1 is not a valid address.</source> + <translation>%1 er ikke en gyldig adresse</translation> + </message> + <message> <location filename="../forms/messagepage.ui" line="14"/> <source>Message</source> <translation>Melding</translation> @@ -870,47 +899,35 @@ Adresse: %4 <translation>Skriv inn meldingen du vil signere her</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="120"/> - <source>&Sign Message</source> - <translation>&Signér Melding</translation> - </message> - <message> <location filename="../forms/messagepage.ui" line="134"/> <source>&Copy to Clipboard</source> <translation>&Kopier til utklippstavle</translation> </message> <message> - <location filename="../messagepage.cpp" line="74"/> - <location filename="../messagepage.cpp" line="89"/> - <location filename="../messagepage.cpp" line="101"/> - <source>Error signing</source> - <translation>Feil ved signering</translation> - </message> - <message> - <location filename="../messagepage.cpp" line="74"/> - <source>%1 is not a valid address.</source> - <translation>%1 er ikke en gyldig adresse</translation> - </message> - <message> <location filename="../messagepage.cpp" line="89"/> <source>Private key for %1 is not available.</source> <translation>Privat nøkkel for %1 er ikke tilgjengelig.</translation> </message> + <message> + <location filename="../messagepage.cpp" line="101"/> + <source>Sign failed</source> + <translation>Signering feilet</translation> + </message> </context> <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>Hoved</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>Visning</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>Innstillinger</translation> </message> @@ -918,6 +935,11 @@ Adresse: %4 <context> <name>OverviewPage</name> <message> + <location filename="../overviewpage.cpp" line="103"/> + <source>Your current balance</source> + <translation>Din nåværende saldo</translation> + </message> + <message> <location filename="../overviewpage.cpp" line="111"/> <source>Total number of transactions in wallet</source> <translation>Totalt antall transaksjoner i lommeboken</translation> @@ -928,19 +950,19 @@ Adresse: %4 <translation>Skjema</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="61"/> - <source>0</source> - <translation>0</translation> + <location filename="../forms/overviewpage.ui" line="40"/> + <source>Balance:</source> + <translation>Saldo:</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="88"/> - <source>Wallet</source> - <translation>Lommebok</translation> + <location filename="../forms/overviewpage.ui" line="68"/> + <source>Unconfirmed:</source> + <translation>Ubekreftet</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="124"/> - <source><b>Recent transactions</b></source> - <translation><b>Siste transaksjoner</b></translation> + <location filename="../overviewpage.cpp" line="108"/> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> + <translation>Totalt antall ubekreftede transaksjoner som ikke telles med i saldo enda</translation> </message> <message> <location filename="../forms/overviewpage.ui" line="54"/> @@ -948,49 +970,49 @@ Adresse: %4 <translation>Antall transaksjoner:</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="40"/> - <source>Balance:</source> - <translation>Saldo:</translation> - </message> - <message> - <location filename="../overviewpage.cpp" line="103"/> - <source>Your current balance</source> - <translation>Din nåværende saldo</translation> + <location filename="../forms/overviewpage.ui" line="61"/> + <source>0</source> + <translation>0</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="68"/> - <source>Unconfirmed:</source> - <translation>Ubekreftet</translation> + <location filename="../forms/overviewpage.ui" line="88"/> + <source>Wallet</source> + <translation>Lommebok</translation> </message> <message> - <location filename="../overviewpage.cpp" line="108"/> - <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> - <translation>Totalt antall ubekreftede transaksjoner som ikke telles med i saldo enda</translation> + <location filename="../forms/overviewpage.ui" line="124"/> + <source><b>Recent transactions</b></source> + <translation><b>Siste transaksjoner</b></translation> </message> </context> <context> <name>QRCodeDialog</name> <message> - <location filename="../forms/qrcodedialog.ui" line="121"/> - <source>Label:</source> - <translation>Merkelapp:</translation> - </message> - <message> - <location filename="../forms/qrcodedialog.ui" line="186"/> - <source>&Save As...</source> - <translation>&Lagre Som...</translation> - </message> - <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation>PNG bilder (*.png)</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../forms/qrcodedialog.ui" line="70"/> + <source>Amount:</source> + <translation>Beløp:</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="144"/> + <source>Message:</source> + <translation>Melding:</translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="46"/> + <source>Error encoding URI into QR Code.</source> + <translation>Feil ved koding av URI i QR kode.</translation> + </message> + <message> <location filename="../forms/qrcodedialog.ui" line="14"/> <source>Dialog</source> <translation>Dialog</translation> @@ -1001,14 +1023,9 @@ Adresse: %4 <translation>QR Kode</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="105"/> - <source>BTC</source> - <translation>BTC</translation> - </message> - <message> - <location filename="../forms/qrcodedialog.ui" line="144"/> - <source>Message:</source> - <translation>Melding:</translation> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>Resulterende URI for lang, prøv å redusere teksten for merkelapp / melding.</translation> </message> <message> <location filename="../forms/qrcodedialog.ui" line="55"/> @@ -1016,14 +1033,19 @@ Adresse: %4 <translation>Etterspør Betaling</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="70"/> - <source>Amount:</source> - <translation>Beløp:</translation> + <location filename="../forms/qrcodedialog.ui" line="121"/> + <source>Label:</source> + <translation>Merkelapp:</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> - <source>Error encoding URI into QR Code.</source> - <translation>Feil ved koding av URI i QR kode.</translation> + <location filename="../forms/qrcodedialog.ui" line="105"/> + <source>BTC</source> + <translation>BTC</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="186"/> + <source>&Save As...</source> + <translation>&Lagre Som...</translation> </message> </context> <context> @@ -1041,19 +1063,14 @@ Adresse: %4 <translation>Send Bitcoins</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="100"/> - <source>Confirm send coins</source> - <translation>Bekreft sending av bitcoins</translation> - </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="101"/> - <source>Are you sure you want to send %1?</source> - <translation>Er du sikker på at du vil sende %1?</translation> + <location filename="../sendcoinsdialog.cpp" line="95"/> + <source><b>%1</b> to %2 (%3)</source> + <translation><b>%1</b> til %2 (%3)</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="101"/> - <source> and </source> - <translation> og </translation> + <location filename="../sendcoinsdialog.cpp" line="124"/> + <source>The recipient address is not valid, please recheck.</source> + <translation>Adresse for mottaker er ugyldig.</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="129"/> @@ -1066,9 +1083,14 @@ Adresse: %4 <translation>Totalbeløpet overstiger saldo etter at %1 transaksjonsgebyr er lagt til.</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="84"/> - <source>Remove all transaction fields</source> - <translation>Fjern alle transaksjonsfelter</translation> + <location filename="../sendcoinsdialog.cpp" line="145"/> + <source>Duplicate address found, can only send to each address once per send operation.</source> + <translation>Duplikate adresser funnet. Kan bare sende én gang til hver adresse per operasjon.</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="113"/> + <source>123.456 BTC</source> + <translation>123.456 BTC</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="155"/> @@ -1081,19 +1103,29 @@ Adresse: %4 <translation>Bekreft sending</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="113"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> + <location filename="../forms/sendcoinsdialog.ui" line="84"/> + <source>Remove all transaction fields</source> + <translation>Fjern alle transaksjonsfelter</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="95"/> - <source><b>%1</b> to %2 (%3)</source> - <translation><b>%1</b> til %2 (%3)</translation> + <location filename="../forms/sendcoinsdialog.ui" line="106"/> + <source>Balance:</source> + <translation>Saldo:</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="124"/> - <source>The recipient address is not valid, please recheck.</source> - <translation>Adresse for mottaker er ugyldig.</translation> + <location filename="../sendcoinsdialog.cpp" line="101"/> + <source> and </source> + <translation> og </translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="100"/> + <source>Confirm send coins</source> + <translation>Bekreft sending av bitcoins</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="101"/> + <source>Are you sure you want to send %1?</source> + <translation>Er du sikker på at du vil sende %1?</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="134"/> @@ -1101,14 +1133,9 @@ Adresse: %4 <translation>Beløpet overstiger saldo.</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="145"/> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Duplikate adresser funnet. Kan bare sende én gang til hver adresse per operasjon.</translation> - </message> - <message> <location filename="../sendcoinsdialog.cpp" line="150"/> <source>Error: Transaction creation failed.</source> - <translation>Feil: Opprettelse av transaksjon feilet.</translation> + <translation>Feil: opprettelse av transaksjon feilet.</translation> </message> <message> <location filename="../forms/sendcoinsdialog.ui" line="64"/> @@ -1126,11 +1153,6 @@ Adresse: %4 <translation>Fjern alle</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="106"/> - <source>Balance:</source> - <translation>Saldo:</translation> - </message> - <message> <location filename="../forms/sendcoinsdialog.ui" line="147"/> <source>S&end</source> <translation type="unfinished"></translation> @@ -1139,16 +1161,6 @@ Adresse: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="75"/> - <source>&Label:</source> - <translation>&Merkelapp:</translation> - </message> - <message> - <location filename="../forms/sendcoinsentry.ui" line="14"/> - <source>Form</source> - <translation>Skjema</translation> - </message> - <message> <location filename="../forms/sendcoinsentry.ui" line="29"/> <source>A&mount:</source> <translation>&Beløp:</translation> @@ -1159,12 +1171,22 @@ Adresse: %4 <translation>Betal &Til:</translation> </message> <message> + <location filename="../forms/sendcoinsentry.ui" line="14"/> + <source>Form</source> + <translation>Skjema</translation> + </message> + <message> <location filename="../forms/sendcoinsentry.ui" line="66"/> <location filename="../sendcoinsentry.cpp" line="26"/> <source>Enter a label for this address to add it to your address book</source> <translation>Skriv inn en merkelapp for denne adressen for å legge den til i din adressebok</translation> </message> <message> + <location filename="../forms/sendcoinsentry.ui" line="75"/> + <source>&Label:</source> + <translation>&Merkelapp:</translation> + </message> + <message> <location filename="../forms/sendcoinsentry.ui" line="93"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished"></translation> @@ -1203,176 +1225,161 @@ Adresse: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="18"/> + <location filename="../transactiondesc.cpp" line="22"/> + <source>Open until %1</source> + <translation>Åpen til %1</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="20"/> <source>Open for %1 blocks</source> <translation>Åpen for %1 blokker</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation>%1/frakoblet?</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="30"/> + <source>%1/unconfirmed</source> + <translation>%1/ubekreftet</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation><b>Status:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>, kringkast gjennom %1 node</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>, kringkast gjennom %1 noder</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation><b>Dato:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>Kilde:</b> Generert<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>Fra:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> + <source><b>To:</b> </source> + <translation><b>Til:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="92"/> <source>unknown</source> <translation>ukjent</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> - <source><b>To:</b> </source> - <translation><b>Til:</b> </translation> + <location filename="../transactiondesc.cpp" line="98"/> + <source> (yours)</source> + <translation> (din)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation> (din, merkelapp: </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> - <source> (yours)</source> - <translation> (din)</translation> + <location filename="../transactiondesc.cpp" line="135"/> + <source>(%1 matures in %2 more blocks)</source> + <translation>(%1 modnes om %2 flere blokker)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation><b>Kredit:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> - <source>(%1 matures in %2 more blocks)</source> - <translation>(%1 modnes om %2 flere blokker)</translation> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> + <source><b>Debit:</b> </source> + <translation><b>Debet:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>Nettobeløp:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> - <source>Message:</source> - <translation>Melding:</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>Kommentar:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation>Transaksjons-ID:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation>Genererte mynter må vente 120 blokker før de kan brukes. Da du genererte denne blokken ble den kringkastet på nettverket for å bli lagt til i kjeden av blokker. Hvis den ikke kommer med i kjeden vil den endre seg til "ikke akseptert og pengene vil ikke kunne brukes. Dette vil noen ganger skje hvis en annen node genererer en blokk noen sekunder i tid fra din egen.</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> - <source>Open until %1</source> - <translation>Åpen til %1</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="28"/> - <source>%1/unconfirmed</source> - <translation>%1/ubekreftet</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation>%1 bekreftelser</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation>, har ikke blitt kringkastet uten problemer enda.</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation>(ikke akseptert)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> - <source><b>Debit:</b> </source> - <translation><b>Debet:</b> </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation><b>Transaksjonsgebyr:</b> </translation> </message> + <message> + <location filename="../transactiondesc.cpp" line="219"/> + <source>Message:</source> + <translation>Melding:</translation> + </message> </context> <context> <name>TransactionDescDialog</name> <message> - <location filename="../forms/transactiondescdialog.ui" line="14"/> - <source>Transaction details</source> - <translation>Transaksjonsdetaljer</translation> - </message> - <message> <location filename="../forms/transactiondescdialog.ui" line="20"/> <source>This pane shows a detailed description of the transaction</source> <translation>Her vises en detaljert beskrivelse av transaksjonen</translation> </message> + <message> + <location filename="../forms/transactiondescdialog.ui" line="14"/> + <source>Transaction details</source> + <translation>Transaksjonsdetaljer</translation> + </message> </context> <context> <name>TransactionTableModel</name> <message> <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Date</source> - <translation>Dato</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Type</source> - <translation>Type</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Address</source> - <translation>Adresse</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> <source>Amount</source> <translation>Beløp</translation> </message> @@ -1460,15 +1467,25 @@ Adresse: %4 <translation>Beløp fjernet eller lagt til saldo.</translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Type</source> + <translation>Type</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Date</source> + <translation>Dato</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Address</source> + <translation>Adresse</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="280"/> <source>Open until %1</source> <translation>Åpen til %1</translation> </message> - <message> - <location filename="../transactiontablemodel.cpp" line="283"/> - <source>Offline (%1 confirmations)</source> - <translation>Frakoblet (%1 bekreftelser)</translation> - </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="297"/> <source>Mined balance will be available in %n more blocks</source> @@ -1477,28 +1494,38 @@ Adresse: %4 <numerusform>Utvunnet saldo vil bli tilgjengelig om %n blokker</numerusform> </translation> </message> + <message> + <location filename="../transactiontablemodel.cpp" line="283"/> + <source>Offline (%1 confirmations)</source> + <translation>Frakoblet (%1 bekreftelser)</translation> + </message> </context> <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="60"/> - <source>This year</source> - <translation>Dette året</translation> + <location filename="../transactionview.cpp" line="289"/> + <source>Error exporting</source> + <translation>Feil ved eksport</translation> </message> <message> - <location filename="../transactionview.cpp" line="283"/> - <source>Address</source> - <translation>Adresse</translation> + <location filename="../transactionview.cpp" line="384"/> + <source>Range:</source> + <translation>Intervall:</translation> </message> <message> - <location filename="../transactionview.cpp" line="61"/> - <source>Range...</source> - <translation>Intervall...</translation> + <location filename="../transactionview.cpp" line="58"/> + <source>This month</source> + <translation>Denne måneden</translation> </message> <message> - <location filename="../transactionview.cpp" line="72"/> - <source>Received with</source> - <translation>Mottatt med</translation> + <location filename="../transactionview.cpp" line="392"/> + <source>to</source> + <translation>til</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="60"/> + <source>This year</source> + <translation>Dette året</translation> </message> <message> <location filename="../transactionview.cpp" line="126"/> @@ -1506,9 +1533,10 @@ Adresse: %4 <translation>Kopiér beløp</translation> </message> <message> - <location filename="../transactionview.cpp" line="74"/> - <source>Sent to</source> - <translation>Sendt til</translation> + <location filename="../transactionview.cpp" line="55"/> + <location filename="../transactionview.cpp" line="71"/> + <source>All</source> + <translation>Alle</translation> </message> <message> <location filename="../transactionview.cpp" line="56"/> @@ -1521,16 +1549,21 @@ Adresse: %4 <translation>Denne uken</translation> </message> <message> - <location filename="../transactionview.cpp" line="58"/> - <source>This month</source> - <translation>Denne måneden</translation> - </message> - <message> <location filename="../transactionview.cpp" line="59"/> <source>Last month</source> <translation>Forrige måned</translation> </message> <message> + <location filename="../transactionview.cpp" line="61"/> + <source>Range...</source> + <translation>Intervall...</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="72"/> + <source>Received with</source> + <translation>Mottatt med</translation> + </message> + <message> <location filename="../transactionview.cpp" line="76"/> <source>To yourself</source> <translation>Til deg selv</translation> @@ -1582,23 +1615,28 @@ Adresse: %4 </message> <message> <location filename="../transactionview.cpp" line="289"/> - <source>Error exporting</source> - <translation>Feil ved eksport</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="289"/> <source>Could not write to file %1.</source> <translation>Kunne ikke skrive til filen %1.</translation> </message> <message> - <location filename="../transactionview.cpp" line="384"/> - <source>Range:</source> - <translation>Intervall:</translation> + <location filename="../transactionview.cpp" line="127"/> + <source>Edit label</source> + <translation>Rediger merkelapp</translation> </message> <message> - <location filename="../transactionview.cpp" line="392"/> - <source>to</source> - <translation>til</translation> + <location filename="../transactionview.cpp" line="270"/> + <source>Export Transaction Data</source> + <translation>Eksporter transaksjonsdata</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="271"/> + <source>Comma separated file (*.csv)</source> + <translation>Kommaseparert fil (*.csv)</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="279"/> + <source>Confirmed</source> + <translation>Bekreftet</translation> </message> <message> <location filename="../transactionview.cpp" line="280"/> @@ -1611,20 +1649,9 @@ Adresse: %4 <translation>Merkelapp</translation> </message> <message> - <location filename="../transactionview.cpp" line="279"/> - <source>Confirmed</source> - <translation>Bekreftet</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="127"/> - <source>Edit label</source> - <translation>Rediger merkelapp</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="55"/> - <location filename="../transactionview.cpp" line="71"/> - <source>All</source> - <translation>Alle</translation> + <location filename="../transactionview.cpp" line="283"/> + <source>Address</source> + <translation>Adresse</translation> </message> <message> <location filename="../transactionview.cpp" line="128"/> @@ -1632,20 +1659,15 @@ Adresse: %4 <translation>Vis detaljer...</translation> </message> <message> - <location filename="../transactionview.cpp" line="270"/> - <source>Export Transaction Data</source> - <translation>Eksporter transaksjonsdata</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="271"/> - <source>Comma separated file (*.csv)</source> - <translation>Kommaseparert fil (*.csv)</translation> + <location filename="../transactionview.cpp" line="74"/> + <source>Sent to</source> + <translation>Sendt til</translation> </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>Sender...</translation> </message> @@ -1653,402 +1675,495 @@ Adresse: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> + <location filename="../bitcoinstrings.cpp" line="41"/> <source>Bitcoin version</source> <translation>Bitcoin versjon</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> - <source>Loading addresses...</source> - <translation>Laster adresser...</translation> + <location filename="../bitcoinstrings.cpp" line="115"/> + <source>Loading block index...</source> + <translation>Laster blokkindeks...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> + <location filename="../bitcoinstrings.cpp" line="117"/> <source>Loading wallet...</source> <translation>Laster lommebok...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> + <location filename="../bitcoinstrings.cpp" line="125"/> <source>Rescanning...</source> <translation>Leser gjennom...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> - <source>Done loading</source> - <translation>Ferdig med lasting</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Usage:</source> - <translation>Bruk:</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="78"/> - <source>Error loading blkindex.dat</source> - <translation>Feil ved lasting av blkindex.dat</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="83"/> + <location filename="../bitcoinstrings.cpp" line="121"/> <source>Error loading wallet.dat</source> <translation>Feil ved lasting av wallet.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> - <source>Error loading wallet.dat: Wallet corrupted</source> - <translation>Feil ved lasting av wallet.dat: Lommeboken er skadet</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="81"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation>Feil ved lasting av wallet.dat: Lommeboken krever en nyere versjon av Bitcoin</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="82"/> + <location filename="../bitcoinstrings.cpp" line="120"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Lommeboken måtte skrives om: start Bitcoin på nytt for å fullføre</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> + <location filename="../bitcoinstrings.cpp" line="44"/> <source>List commands</source> <translation>List opp kommandoer</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> + <location filename="../bitcoinstrings.cpp" line="45"/> <source>Get help for a command</source> <translation>Vis hjelpetekst for en kommando</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> + <location filename="../bitcoinstrings.cpp" line="46"/> <source>Options:</source> <translation>Innstillinger:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Send command to -server or bitcoind</source> - <translation>Send kommando til -server eller bitcoind</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="16"/> + <location filename="../bitcoinstrings.cpp" line="49"/> <source>Generate coins</source> <translation>Generér bitcoins</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> - <source>Invalid amount for -paytxfee=<amount></source> - <translation>Ugyldig gebyrbeløp for -paytxfee=<beløp></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Specify data directory</source> - <translation>Angi mappe for datafiler</translation> + <location filename="../bitcoinstrings.cpp" line="47"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation>Angi konfigurasjonsfil (standardverdi: bitcoin.conf)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> - <source>Error: CreateThread(StartNode) failed</source> - <translation>Feil: CreateThread(StartNode) feilet</translation> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>Angi pid-fil (standardverdi: bitcoind.pid)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> - <translation>Advarsel: Lite ledig diskplass</translation> + <location filename="../bitcoinstrings.cpp" line="60"/> + <source>Maintain at most <n> connections to peers (default: 125)</source> + <translation>Hold maks <n> koblinger åpne til andre noder (standardverdi: 125)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> + <location filename="../bitcoinstrings.cpp" line="61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Legg til node for tilkobling og hold forbindelsen åpen</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> - <translation>Advarsel: Vennligst sjekk at dato og klokke er riktig innstilt på datamaskinen. Hvis klokken er feil vil ikke Bitcoin fungere ordentlig.</translation> + <location filename="../bitcoinstrings.cpp" line="54"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation>Sett størrelse på mellomlager for database i megabytes (standardverdi: 25)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Maintain at most <n> connections to peers (default: 125)</source> - <translation>Hold maks <n> koblinger åpne til andre noder (standardverdi: 125)</translation> + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Specify connection timeout (in milliseconds)</source> + <translation>Angi tidsavbrudd for forbindelse (i millisekunder)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> + <location filename="../bitcoinstrings.cpp" line="67"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Grenseverdi for å koble fra noder med dårlig oppførsel (standardverdi: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation>Lytt etter JSON-RPC tilkoblinger på <port> (standardverdi: 8332)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Allow JSON-RPC connections from specified IP address</source> - <translation>Tillat JSON-RPC tilkoblinger fra angitt IP-adresse</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>Send kommandoer til node på <ip> (standardverdi: 127.0.0.1)</translation> - </message> - <message> <location filename="../bitcoinstrings.cpp" line="59"/> - <source>Rescan the block chain for missing wallet transactions</source> - <translation>Se gjennom blokk-kjeden etter manglende lommeboktransaksjoner</translation> + <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> + <translation>Lytt etter tilkoblinger på <port> (standardverdi: 8333 eller testnet: 18333)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> - <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>Bruk OpenSSL (https) for JSON-RPC forbindelser</translation> + <location filename="../bitcoinstrings.cpp" line="78"/> + <source>Accept command line and JSON-RPC commands</source> + <translation>Ta imot kommandolinje- og JSON-RPC-kommandoer</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> + <location filename="../bitcoinstrings.cpp" line="90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Eksekvér kommando når beste blokk endrer seg (%s i kommandoen erstattes med blokkens hash)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> + <location filename="../bitcoinstrings.cpp" line="93"/> <source>Upgrade wallet to latest format</source> <translation>Oppgradér lommebok til nyeste format</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>Akseptable krypteringsmetoder (standardverdi: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Prepend debug output with timestamp</source> + <translation>Sett tidsstempel på debugmeldinger</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> + <location filename="../bitcoinstrings.cpp" line="96"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation>Hvor mange blokker som skal sjekkes ved oppstart (standardverdi: 2500, 0 = alle)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> + <location filename="../bitcoinstrings.cpp" line="97"/> <source>How thorough the block verification is (0-6, default: 1)</source> <translation>Hvor grundig verifisering av blokker gjøres (0-6, standardverdi: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> - <source>Accept command line and JSON-RPC commands</source> - <translation>Ta imot kommandolinje- og JSON-RPC-kommandoer</translation> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>Done loading</source> + <translation>Ferdig med lasting</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> - <source>Use the test network</source> - <translation>Bruk testnettverket</translation> + <location filename="../bitcoinstrings.cpp" line="127"/> + <source>Invalid -proxy address</source> + <translation>Ugyldig -proxy adresse for mellomtjener</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> - <source>Prepend debug output with timestamp</source> - <translation>Sett tidsstempel på debugmeldinger</translation> + <location filename="../bitcoinstrings.cpp" line="68"/> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> + <translation>Antall sekunder noder med dårlig oppførsel hindres fra å koble til på nytt (standardverdi: 86400)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Send spor/debug informasjon til konsollet istedenfor debug.log filen</translation> + <location filename="../bitcoinstrings.cpp" line="132"/> + <source>Error: CreateThread(StartNode) failed</source> + <translation>Feil: CreateThread(StartNode) feilet</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Send trace/debug info to debugger</source> - <translation>Send spor/debug informasjon til debugger</translation> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Warning: Disk space is low</source> + <translation>Advarsel: Lite ledig diskplass</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> - <source>Error loading addr.dat</source> - <translation>Feil ved lasting av addr.dat</translation> + <location filename="../bitcoinstrings.cpp" line="133"/> + <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> + <translation>Klarer ikke binde til port %d på denne datamaskinen. Bitcoin kjører sannsynligvis allerede.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Allow DNS lookups for addnode and connect</source> - <translation>Tillat DNS-oppslag for addnode og connect</translation> + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>Username for JSON-RPC connections</source> + <translation>Brukernavn for JSON-RPC forbindelser</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> - <translation>Maksimum mottaksbuffer per tilkobling, <n>*1000 bytes (standardverdi: 10000)</translation> + <location filename="../bitcoinstrings.cpp" line="86"/> + <source>Password for JSON-RPC connections</source> + <translation>Passord for JSON-RPC forbindelser</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>Angi størrelse på nøkkel-lager til <n> (standardverdi: 100)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="102"/> + <source>Server certificate file (default: server.cert)</source> + <translation>Servers sertifikat (standardverdi: server.cert)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> + <location filename="../bitcoinstrings.cpp" line="103"/> + <source>Server private key (default: server.pem)</source> + <translation>Servers private nøkkel (standardverdi: server.pem)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="107"/> + <source>This help message</source> + <translation>Denne hjelpemeldingen</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="114"/> + <source>Error loading addr.dat</source> + <translation>Feil ved lasting av addr.dat</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="52"/> + <source>Show splash screen on startup (default: 1)</source> + <translation>Vis splashskjerm ved oppstart (standardverdi: 1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation>Koble kun til angitt node</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> + <location filename="../bitcoinstrings.cpp" line="65"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation>Sett språk, for eksempel "nb_NO" (standardverdi: fra operativsystem)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Use Universal Plug and Play to map the listening port (default: 1)</source> - <translation type="unfinished">Bruk UPnP for lytteport (standardverdi: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="71"/> + <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> + <translation>Maksimum mottaksbuffer per tilkobling, <n>*1000 bytes (standardverdi: 10000)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="80"/> + <source>Use the test network</source> + <translation>Bruk testnettverket</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished">Bruk UPnP for lytteport (standardverdi: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> - <source>Output extra debugging information</source> - <translation>Gi ut ekstra debuginformasjon</translation> + <location filename="../bitcoinstrings.cpp" line="66"/> + <source>Find peers using DNS lookup (default: 1)</source> + <translation>Finn andre noder gjennom DNS-oppslag (standardverdi: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> - <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation> -SSL innstillinger: (se Bitcoin Wiki for instruksjoner om SSL oppsett)</translation> + <location filename="../bitcoinstrings.cpp" line="72"/> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> + <translation>Maksimum sendebuffer per tilkobling, <n>*1000 bytes (standardverdi: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> - <source>Loading block index...</source> - <translation>Laster blokkindeks...</translation> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Sender...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>Ugyldig beløp</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>Utilstrekkelige midler</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation>%s, du må sette et rpcpassord i konfigurasjonsfilen: + %s +Det anbefales at du bruker følgende tilfeldige passord: +rpcuser=bitcoinrpc +rpcpassword=%s +(du trenger ikke huske dette passordet) +Hvis filen ikke finnes, opprett den med leserettighet kun for eier av filen. +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation>For å bruke %s opsjonen</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation>Feil</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation>Du må sette rpcpassword=<passord> i konfigurasjonsfilen: +%s +Hvis filen ikke finnes, opprett den med leserettighet kun for eier av filen.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="42"/> + <source>Usage:</source> + <translation>Bruk:</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation>Sett størrelse på disklogg for database i megabytes (standardverdi: 100)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="113"/> + <source>Loading addresses...</source> + <translation>Laster adresser...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="123"/> <source>Cannot initialize keypool</source> <translation>Kan ikke initialisere nøkkellager</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> - <source>Invalid -proxy address</source> - <translation>Ugyldig -proxy adresse for mellomtjener</translation> + <location filename="../bitcoinstrings.cpp" line="124"/> + <source>Cannot write default address</source> + <translation>Kan ikke skrive standardadresse</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> - <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> - <translation>Advarsel: -paytxfee er satt veldig høyt. Dette er transaksjonsgebyret du betaler når du sender en transaksjon.</translation> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>Kunne ikke låse datamappen %s. Bitcoin kjører sannsynligvis allerede.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> - <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> - <translation>Klarer ikke binde til port %d på denne datamaskinen. Bitcoin kjører sannsynligvis allerede.</translation> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation>Koble fra blokk og adresse databaser. Gir tregere avslutning (standardverdi: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>beta</translation> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Error loading blkindex.dat</source> + <translation>Feil ved lasting av blkindex.dat</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="128"/> + <source>Invalid amount for -paytxfee=<amount></source> + <translation>Ugyldig gebyrbeløp for -paytxfee=<beløp></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="118"/> + <source>Error loading wallet.dat: Wallet corrupted</source> + <translation>Feil ved lasting av wallet.dat: Lommeboken er skadet</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="129"/> + <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> + <translation>Advarsel: -paytxfee er satt veldig høyt. Dette er transaksjonsgebyret du betaler når du sender en transaksjon.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="119"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> + <translation>Feil ved lasting av wallet.dat: Lommeboken krever en nyere versjon av Bitcoin</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation>Kan ikke nedgradere lommebok</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify configuration file (default: bitcoin.conf)</source> - <translation>Angi konfigurasjonsfil (standardverdi: bitcoin.conf)</translation> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <translation>Advarsel: Vennligst sjekk at dato og klokke er riktig innstilt på datamaskinen. Hvis klokken er feil vil ikke Bitcoin fungere ordentlig.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>Angi pid-fil (standardverdi: bitcoind.pid)</translation> + <location filename="../bitcoinstrings.cpp" line="43"/> + <source>Send command to -server or bitcoind</source> + <translation>Send kommando til -server eller bitcoind</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> + <location filename="../bitcoinstrings.cpp" line="50"/> <source>Don't generate coins</source> <translation>Ikke generér bitcoins</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> + <location filename="../bitcoinstrings.cpp" line="51"/> <source>Start minimized</source> <translation>Start minimert </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Show splash screen on startup (default: 1)</source> - <translation>Vis splashskjerm ved oppstart (standardverdi: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>Akseptable krypteringsmetoder (standardverdi: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Sett størrelse på mellomlager for database i megabytes (standardverdi: 25)</translation> + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Specify data directory</source> + <translation>Angi mappe for datafiler</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Angi tidsavbrudd for forbindelse (i millisekunder)</translation> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">Feil: opprettelse av transaksjon feilet.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">Feil: Transaksjonen ble avvist. Dette kan skje om noe av beløpet allerede var brukt, f.eks. hvis du kopierte wallet.dat og noen bitcoins ble brukt i kopien men ikke ble markert som brukt her.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation>En feil oppstod ved opprettelse av RPC port %u for lytting: %s</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="57"/> <source>Connect through socks4 proxy</source> <translation>Koble til gjennom socks4 proxy</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation>Lytt etter tilkoblinger på <port> (standardverdi: 8333 eller testnet: 18333)</translation> + <location filename="../bitcoinstrings.cpp" line="58"/> + <source>Allow DNS lookups for addnode and connect</source> + <translation>Tillat DNS-oppslag for addnode og connect</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> + <location filename="../bitcoinstrings.cpp" line="63"/> <source>Find peers using internet relay chat (default: 0)</source> <translation>Finn andre noder via internet relay chat (standardverdi: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation>Ta imot tilkoblinger fra utsiden (standardverdi: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Find peers using DNS lookup (default: 1)</source> - <translation>Finn andre noder gjennom DNS-oppslag (standardverdi: 1)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="34"/> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation>Antall sekunder noder med dårlig oppførsel hindres fra å koble til på nytt (standardverdi: 86400)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> - <translation>Maksimum sendebuffer per tilkobling, <n>*1000 bytes (standardverdi: 10000)</translation> + <location filename="../bitcoinstrings.cpp" line="73"/> + <source>Use Universal Plug and Play to map the listening port (default: 1)</source> + <translation type="unfinished">Bruk UPnP for lytteport (standardverdi: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> + <location filename="../bitcoinstrings.cpp" line="77"/> <source>Fee per KB to add to transactions you send</source> <translation>Gebyr per KB for transaksjoner du sender</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> + <location filename="../bitcoinstrings.cpp" line="79"/> <source>Run in the background as a daemon and accept commands</source> <translation>Kjør i bakgrunnen som daemon og ta imot kommandoer</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> - <source>Username for JSON-RPC connections</source> - <translation>Brukernavn for JSON-RPC forbindelser</translation> + <location filename="../bitcoinstrings.cpp" line="81"/> + <source>Output extra debugging information</source> + <translation>Gi ut ekstra debuginformasjon</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Password for JSON-RPC connections</source> - <translation>Passord for JSON-RPC forbindelser</translation> + <location filename="../bitcoinstrings.cpp" line="83"/> + <source>Send trace/debug info to console instead of debug.log file</source> + <translation>Send spor/debug informasjon til konsollet istedenfor debug.log filen</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation>Angi størrelse på nøkkel-lager til <n> (standardverdi: 100)</translation> + <location filename="../bitcoinstrings.cpp" line="84"/> + <source>Send trace/debug info to debugger</source> + <translation>Send spor/debug informasjon til debugger</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> - <source>Server certificate file (default: server.cert)</source> - <translation>Servers sertifikat (standardverdi: server.cert)</translation> + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>Lytt etter JSON-RPC tilkoblinger på <port> (standardverdi: 8332)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> - <source>Server private key (default: server.pem)</source> - <translation>Servers private nøkkel (standardverdi: server.pem)</translation> + <location filename="../bitcoinstrings.cpp" line="88"/> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation>Tillat JSON-RPC tilkoblinger fra angitt IP-adresse</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> - <source>This help message</source> - <translation>Denne hjelpemeldingen</translation> + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>Send kommandoer til node på <ip> (standardverdi: 127.0.0.1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation>Se gjennom blokk-kjeden etter manglende lommeboktransaksjoner</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> - <source>Cannot write default address</source> - <translation>Kan ikke skrive standardadresse</translation> + <location filename="../bitcoinstrings.cpp" line="98"/> + <source> +SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation> +SSL innstillinger: (se Bitcoin Wiki for instruksjoner om SSL oppsett)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="101"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>Bruk OpenSSL (https) for JSON-RPC forbindelser</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation>Bruk</translation> </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts index 0f167fc734..b5a56751ea 100644 --- a/src/qt/locale/bitcoin_nl.ts +++ b/src/qt/locale/bitcoin_nl.ts @@ -16,7 +16,7 @@ <translation><b>Bitcoin</b> versie</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -76,16 +76,6 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Toon &QR-Code</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="99"/> - <source>Sign &Message</source> - <translation>&Onderteken Bericht</translation> - </message> - <message> - <location filename="../forms/addressbookpage.ui" line="110"/> - <source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source> - <translation>Verwijder het huidige geselecteerde adres van de lijst. Alleen zend-adressen kunnen verwijderd worden, niet uw ontvangstadressen.</translation> - </message> - <message> <location filename="../forms/addressbookpage.ui" line="113"/> <source>&Delete</source> <translation>&Verwijder</translation> @@ -96,54 +86,59 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Onderteken een bericht om te bewijzen dat u dit adres bezit</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> - <source>Export Address Book Data</source> - <translation>Exporteer Gegevens van het Adresboek</translation> + <location filename="../forms/addressbookpage.ui" line="99"/> + <source>Sign &Message</source> + <translation>&Onderteken Bericht</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> - <source>Error exporting</source> - <translation>Fout bij exporteren</translation> + <location filename="../forms/addressbookpage.ui" line="110"/> + <source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source> + <translation>Verwijder het huidige geselecteerde adres van de lijst. Alleen zend-adressen kunnen verwijderd worden, niet uw ontvangstadressen.</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation>Kopieer label</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="68"/> + <source>Delete</source> + <translation>Verwijder</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="286"/> + <source>Comma separated file (*.csv)</source> + <translation>Kommagescheiden bestand (*.csv)</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="299"/> + <source>Could not write to file %1.</source> + <translation>Kon niet schrijven naar bestand %1.</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>Kopieer adres</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation>Bewerk</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> - <source>Delete</source> - <translation>Verwijder</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="292"/> - <source>Could not write to file %1.</source> - <translation>Kon niet schrijven naar bestand %1.</translation> + <location filename="../addressbookpage.cpp" line="285"/> + <source>Export Address Book Data</source> + <translation>Exporteer Gegevens van het Adresboek</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> - <source>Comma separated file (*.csv)</source> - <translation>Kommagescheiden bestand (*.csv)</translation> + <location filename="../addressbookpage.cpp" line="299"/> + <source>Error exporting</source> + <translation>Fout bij exporteren</translation> </message> </context> <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="78"/> - <source>Label</source> - <translation>Label</translation> - </message> - <message> <location filename="../addresstablemodel.cpp" line="114"/> <source>(no label)</source> <translation>(geen label)</translation> @@ -153,23 +148,23 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <source>Address</source> <translation>Adres</translation> </message> + <message> + <location filename="../addresstablemodel.cpp" line="78"/> + <source>Label</source> + <translation>Label</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> <message> - <location filename="../askpassphrasedialog.cpp" line="127"/> - <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>Portemonneeversleuteling mislukt door een interne fout, Uw portemonnee is niet versleuteld.</translation> - </message> - <message> - <location filename="../forms/askpassphrasedialog.ui" line="47"/> - <source>Enter passphrase</source> - <translation>Huidig wachtwoord</translation> + <location filename="../askpassphrasedialog.cpp" line="38"/> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Deze operatie vereist uw portemonneewachtwoord om de portemonnee te openen.</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="61"/> - <source>New passphrase</source> - <translation>Nieuwe wachtwoord</translation> + <location filename="../forms/askpassphrasedialog.ui" line="94"/> + <source>TextLabel</source> + <translation>TekstLabel</translation> </message> <message> <location filename="../forms/askpassphrasedialog.ui" line="75"/> @@ -177,19 +172,24 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Herhaal wachtwoord</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="94"/> - <source>TextLabel</source> - <translation>TekstLabel</translation> + <location filename="../askpassphrasedialog.cpp" line="170"/> + <source>Wallet passphrase was successfully changed.</source> + <translation>Portemonneewachtwoord is met succes gewijzigd.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="156"/> - <source>Wallet decryption failed</source> - <translation>Portemonnee-ontsleuteling mislukt</translation> + <location filename="../askpassphrasedialog.cpp" line="46"/> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Deze operatie vereist uw portemonneewachtwoord om de portemonnee te ontsleutelen</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="43"/> - <source>Unlock wallet</source> - <translation>Open portemonnee</translation> + <location filename="../askpassphrasedialog.cpp" line="35"/> + <source>Encrypt wallet</source> + <translation>Versleutel portemonnee</translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="61"/> + <source>New passphrase</source> + <translation>Nieuwe wachtwoord</translation> </message> <message> <location filename="../forms/askpassphrasedialog.ui" line="26"/> @@ -197,6 +197,22 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Dialoog</translation> </message> <message> + <location filename="../askpassphrasedialog.cpp" line="111"/> + <location filename="../askpassphrasedialog.cpp" line="169"/> + <source>Wallet encrypted</source> + <translation>Portemonnee versleuteld</translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="47"/> + <source>Enter passphrase</source> + <translation>Huidig wachtwoord</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="43"/> + <source>Unlock wallet</source> + <translation>Open portemonnee</translation> + </message> + <message> <location filename="../askpassphrasedialog.cpp" line="51"/> <source>Decrypt wallet</source> <translation>Ontsleutel portemonnee</translation> @@ -212,9 +228,16 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Vul uw oude en nieuwe portemonneewachtwoord in.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="101"/> - <source>Confirm wallet encryption</source> - <translation>Bevestig versleuteling van de portemonnee</translation> + <location filename="../askpassphrasedialog.cpp" line="102"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! +Are you sure you wish to encrypt your wallet?</source> + <translation>WAARSCHUWING: Wanneer uw portemonnee wordt versleuteld en u verliest uw wachtwoord, dan verliest u<b>AL UW BITCOINS</b>! +Bent u er zeker van uw dat u uw portemonnee wilt versleutelen?</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="113"/> + <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>Bitcoin zal nu afsluiten om het versleutelingsproces te voltooien. Onthoud dat het versleutelen van uw portemonnee u niet volledig kan beschermen: Malware kan uw computer infecteren en uw bitcoins stelen.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="117"/> @@ -222,36 +245,9 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>BELANGRIJK: Elke eerder gemaakte backup van uw portemonneebestand dient u te vervangen door het nieuw gegenereerde, versleutelde portemonneebestand. Om veiligheidsredenen zullen eerdere backups van het niet-versleutelde portemonneebestand onbruikbaar worden zodra u uw nieuwe, versleutelde, portemonnee begint te gebruiken.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="126"/> - <location filename="../askpassphrasedialog.cpp" line="133"/> - <location filename="../askpassphrasedialog.cpp" line="175"/> - <location filename="../askpassphrasedialog.cpp" line="181"/> - <source>Wallet encryption failed</source> - <translation>Portemonneeversleuteling mislukt</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="134"/> - <location filename="../askpassphrasedialog.cpp" line="182"/> - <source>The supplied passphrases do not match.</source> - <translation>De opgegeven wachtwoorden komen niet overeen</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="146"/> - <location filename="../askpassphrasedialog.cpp" line="157"/> - <location filename="../askpassphrasedialog.cpp" line="176"/> - <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation>Het opgegeven wachtwoord voor de portemonnee-ontsleuteling is niet correct.</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="111"/> - <location filename="../askpassphrasedialog.cpp" line="169"/> - <source>Wallet encrypted</source> - <translation>Portemonnee versleuteld</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="170"/> - <source>Wallet passphrase was successfully changed.</source> - <translation>Portemonneewachtwoord is met succes gewijzigd.</translation> + <location filename="../askpassphrasedialog.cpp" line="127"/> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Portemonneeversleuteling mislukt door een interne fout, Uw portemonnee is niet versleuteld.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="217"/> @@ -260,26 +256,28 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Waarschuwing: De Caps-Lock-toets staat aan.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="46"/> - <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>Deze operatie vereist uw portemonneewachtwoord om de portemonnee te ontsleutelen</translation> + <location filename="../askpassphrasedialog.cpp" line="34"/> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>Vul een nieuw wachtwoord in voor uw portemonnee. <br/> Gebruik een wachtwoord van <b>10 of meer lukrake karakters</b>, of <b> acht of meer woorden</b> . </translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="38"/> - <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>Deze operatie vereist uw portemonneewachtwoord om de portemonnee te openen.</translation> + <location filename="../askpassphrasedialog.cpp" line="134"/> + <location filename="../askpassphrasedialog.cpp" line="182"/> + <source>The supplied passphrases do not match.</source> + <translation>De opgegeven wachtwoorden komen niet overeen</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="102"/> - <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! -Are you sure you wish to encrypt your wallet?</source> - <translation>WAARSCHUWING: Wanneer uw portemonnee wordt versleuteld en u verliest uw wachtwoord, dan verliest u<b>AL UW BITCOINS</b>! -Bent u er zeker van uw dat u uw portemonnee wilt versleutelen?</translation> + <location filename="../askpassphrasedialog.cpp" line="126"/> + <location filename="../askpassphrasedialog.cpp" line="133"/> + <location filename="../askpassphrasedialog.cpp" line="175"/> + <location filename="../askpassphrasedialog.cpp" line="181"/> + <source>Wallet encryption failed</source> + <translation>Portemonneeversleuteling mislukt</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="113"/> - <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> - <translation>Bitcoin zal nu afsluiten om het versleutelingsproces te voltooien. Onthoud dat het versleutelen van uw portemonnee u niet volledig kan beschermen: Malware kan uw computer infecteren en uw bitcoins stelen.</translation> + <location filename="../askpassphrasedialog.cpp" line="101"/> + <source>Confirm wallet encryption</source> + <translation>Bevestig versleuteling van de portemonnee</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="145"/> @@ -287,225 +285,187 @@ Bent u er zeker van uw dat u uw portemonnee wilt versleutelen?</translation> <translation>Portemonnee openen mislukt</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="34"/> - <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>Vul een nieuw wachtwoord in voor uw portemonnee. <br/> Gebruik een wachtwoord van <b>10 of meer lukrake karakters</b>, of <b> acht of meer woorden</b> . </translation> + <location filename="../askpassphrasedialog.cpp" line="146"/> + <location filename="../askpassphrasedialog.cpp" line="157"/> + <location filename="../askpassphrasedialog.cpp" line="176"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Het opgegeven wachtwoord voor de portemonnee-ontsleuteling is niet correct.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="35"/> - <source>Encrypt wallet</source> - <translation>Versleutel portemonnee</translation> + <location filename="../askpassphrasedialog.cpp" line="156"/> + <source>Wallet decryption failed</source> + <translation>Portemonnee-ontsleuteling mislukt</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="194"/> - <source>Browse transaction history</source> - <translation>Blader door transactieverleden</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="205"/> - <source>&Receive coins</source> - <translation>&Ontvang munten</translation> + <location filename="../bitcoingui.cpp" line="185"/> + <source>&Overview</source> + <translation>&Overzicht</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> - <source>&Options...</source> - <translation>O&pties...</translation> + <location filename="../bitcoingui.cpp" line="191"/> + <source>&Transactions</source> + <translation>&Transacties</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> - <source>&File</source> - <translation>&Bestand</translation> + <location filename="../bitcoingui.cpp" line="192"/> + <source>Browse transaction history</source> + <translation>Blader door transactieverleden</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> - <source>&Settings</source> - <translation>&Instellingen</translation> + <location filename="../bitcoingui.cpp" line="197"/> + <source>&Address Book</source> + <translation>&Adresboek</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> - <source>&Transactions</source> - <translation>&Transacties</translation> + <location filename="../bitcoingui.cpp" line="204"/> + <source>Show the list of addresses for receiving payments</source> + <translation>Toon lijst van adressen om betalingen mee te ontvangen</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="187"/> - <source>&Overview</source> - <translation>&Overzicht</translation> + <location filename="../bitcoingui.cpp" line="203"/> + <source>&Receive coins</source> + <translation>&Ontvang munten</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> + <location filename="../bitcoingui.cpp" line="235"/> <source>E&xit</source> <translation>&Afsluiten</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> + <location filename="../bitcoingui.cpp" line="242"/> <source>About &Qt</source> <translation>Over &Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> - <source>Change the passphrase used for wallet encryption</source> - <translation>wijzig het wachtwoord voor uw portemonneversleuteling</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="211"/> + <location filename="../bitcoingui.cpp" line="209"/> <source>&Send coins</source> <translation>&Verstuur munten</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> + <location filename="../bitcoingui.cpp" line="255"/> + <source>&Backup Wallet</source> + <translation>Backup &Portemonnee</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="236"/> <source>Quit application</source> <translation>Programma afsluiten</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> + <location filename="../bitcoingui.cpp" line="240"/> <source>Show information about Bitcoin</source> <translation>Laat informatie zien over Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> + <location filename="../bitcoingui.cpp" line="243"/> <source>Show information about Qt</source> <translation>Toon informatie over Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> - <translation>&Exporteer...</translation> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Send coins to a bitcoin address</source> + <translation>Verstuur munten naar een bitcoin-adres</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> - <source>Export the data in the current tab to a file</source> - <translation>Exporteer de data in de huidige tab naar een bestand</translation> + <location filename="../bitcoingui.cpp" line="636"/> + <source>Sending...</source> + <translation>Versturen...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> - <source>Backup wallet to another location</source> - <translation>&Backup portemonnee naar een andere locatie</translation> + <location filename="../bitcoingui.cpp" line="245"/> + <source>&Options...</source> + <translation>O&pties...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> - <source>Show general overview of wallet</source> - <translation>Toon algemeen overzicht van de portemonnee</translation> + <location filename="../bitcoingui.cpp" line="250"/> + <source>&Export...</source> + <translation>&Exporteer...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="255"/> - <source>Encrypt or decrypt wallet</source> - <translation>Versleutel of ontsleutel portemonnee</translation> + <location filename="../bitcoingui.cpp" line="251"/> + <source>Export the data in the current tab to a file</source> + <translation>Exporteer de data in de huidige tab naar een bestand</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> - <source>Send coins to a bitcoin address</source> - <translation>Verstuur munten naar een bitcoin-adres</translation> + <location filename="../bitcoingui.cpp" line="303"/> + <source>Tabs toolbar</source> + <translation>Tab-werkbalk</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> - <source>Edit the list of stored addresses and labels</source> - <translation>Bewerk de lijst van opgeslagen adressen en labels</translation> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation>&Toon/Verberg Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="73"/> - <source>Bitcoin Wallet</source> - <translation>Bitcoin-portemonnee</translation> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation>Toon of verberg Bitcoin venster</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> - <source>&Address Book</source> - <translation>&Adresboek</translation> + <location filename="../bitcoingui.cpp" line="281"/> + <source>&File</source> + <translation>&Bestand</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> - <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="253"/> + <source>Encrypt or decrypt wallet</source> + <translation>Versleutel of ontsleutel portemonnee</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> - <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation>Portemonnee is <b>versleuteld</b> en momenteel <b>geopend</b></translation> + <location filename="../bitcoingui.cpp" line="71"/> + <source>Bitcoin Wallet</source> + <translation>Bitcoin-portemonnee</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> - <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation>Portemonnee is <b>versleuteld</b> en momenteel <b>gesloten</b></translation> + <location filename="../bitcoingui.cpp" line="186"/> + <source>Show general overview of wallet</source> + <translation>Toon algemeen overzicht van de portemonnee</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Backup Wallet</source> - <translation>Backup Portemonnee</translation> + <location filename="../bitcoingui.cpp" line="296"/> + <source>&Help</source> + <translation>&Hulp</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Wallet Data (*.dat)</source> - <translation>Portemonnee-data (*.dat)</translation> + <location filename="../bitcoingui.cpp" line="632"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation>Backup Mislukt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation>Er is een fout opgetreden bij het wegschrijven van de portemonnee-data naar de nieuwe locatie.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> - <source>Tabs toolbar</source> - <translation>Tab-werkbalk</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>&Over %1</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Bezig met blokkenketen-synchronisatie</translation> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation>Bitcoin client</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> - <source>Show the list of addresses for receiving payments</source> - <translation>Toon lijst van adressen om betalingen mee te ontvangen</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="217"/> - <source>Sign &message</source> - <translation>&Onderteken Bericht</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="218"/> + <location filename="../bitcoingui.cpp" line="216"/> <source>Prove you control an address</source> <translation>Bewijs dat u een adres bezit</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>Wijzig instellingen van Bitcoin</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>Open &Bitcoin</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="257"/> - <source>&Backup Wallet</source> - <translation>Backup &Portemonnee</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="329"/> - <source>[testnet]</source> - <translation>[testnetwerk]</translation> + <location filename="../bitcoingui.cpp" line="418"/> + <source>bitcoin-qt</source> + <translation>bitcoin-qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> + <location filename="../bitcoingui.cpp" line="531"/> <source>Downloaded %1 blocks of transaction history.</source> <translation>%1 blokken van transactiehistorie opgehaald.</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation> <numerusform>%n seconde geleden</numerusform> @@ -513,15 +473,7 @@ Bent u er zeker van uw dat u uw portemonnee wilt versleutelen?</translation> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> - <source>%n minute(s) ago</source> - <translation> - <numerusform>%n minuut geleden</numerusform> - <numerusform>%n minuten geleden</numerusform> - </translation> - </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation> <numerusform>%n uur geleden</numerusform> @@ -529,7 +481,7 @@ Bent u er zeker van uw dat u uw portemonnee wilt versleutelen?</translation> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>%n dag geleden</numerusform> @@ -537,37 +489,37 @@ Bent u er zeker van uw dat u uw portemonnee wilt versleutelen?</translation> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation>Bijgewerkt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>Aan het bijwerken...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation>Laatst ontvangen blok is %1 gegenereerd.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>&Wijzig Wachtwoord</translation> + <location filename="../bitcoingui.cpp" line="215"/> + <source>Sign &message</source> + <translation>&Onderteken Bericht</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> + <location filename="../bitcoingui.cpp" line="663"/> <source>Sent transaction</source> <translation>Verzonden transactie</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> + <location filename="../bitcoingui.cpp" line="664"/> <source>Incoming transaction</source> <translation>Binnenkomende transactie</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -580,79 +532,134 @@ Adres: %4 </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> - <source>&Help</source> - <translation>&Hulp</translation> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>&Over %1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> - <source>Actions toolbar</source> - <translation>Actie-werkbalk</translation> + <location filename="../bitcoingui.cpp" line="790"/> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation>Portemonnee is <b>versleuteld</b> en momenteel <b>geopend</b></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="798"/> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation>Portemonnee is <b>versleuteld</b> en momenteel <b>gesloten</b></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>Wijzig instellingen van Bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="252"/> + <source>&Encrypt Wallet</source> + <translation>&Versleutel Portemonnee</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="256"/> + <source>Backup wallet to another location</source> + <translation>&Backup portemonnee naar een andere locatie</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation>&Wijzig Wachtwoord</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="258"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>wijzig het wachtwoord voor uw portemonneversleuteling</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="290"/> + <source>&Settings</source> + <translation>&Instellingen</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="327"/> + <source>[testnet]</source> + <translation>[testnetwerk]</translation> + </message> + <message> + <location filename="../bitcoin.cpp" line="127"/> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>Er is een fatale fout opgetreden. Bitcoin kan niet meer veilig doorgaan en zal nu afgesloten worden.</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> + <location filename="../bitcoingui.cpp" line="482"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n actieve connectie naar Bitcoinnetwerk</numerusform> <numerusform>%n actieve connecties naar Bitcoinnetwerk</numerusform> </translation> </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation> + <numerusform>~%n blok resterend</numerusform> + <numerusform>~%n blokken resterend</numerusform> + </translation> + </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> + <location filename="../bitcoingui.cpp" line="506"/> <source>Synchronizing with network...</source> <translation>Synchroniseren met netwerk...</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> - <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> - <translation>Er is een fatale fout opgetreden. Bitcoin kan niet meer veilig doorgaan en zal nu afgesloten worden.</translation> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>%1 van %2 blokken van transactiehistorie opgehaald (%3% klaar).</translation> </message> - <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Toon Bitcoin-venster</translation> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="550"/> + <source>%n minute(s) ago</source> + <translation> + <numerusform>%n minuut geleden</numerusform> + <numerusform>%n minuten geleden</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation>&Versleutel Portemonnee</translation> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Backup Wallet</source> + <translation>Backup Portemonnee</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> - <source>bitcoin-qt</source> - <translation>bitcoin-qt</translation> + <location filename="../bitcoingui.cpp" line="314"/> + <source>Actions toolbar</source> + <translation>Actie-werkbalk</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> - <source>Sending...</source> - <translation>Versturen...</translation> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Wallet Data (*.dat)</source> + <translation>Portemonnee-data (*.dat)</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>%1 van %2 blokken van transactiehistorie opgehaald.</translation> + <location filename="../bitcoingui.cpp" line="198"/> + <source>Edit the list of stored addresses and labels</source> + <translation>Bewerk de lijst van opgeslagen adressen en labels</translation> </message> </context> <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&Eenheid om bedrag in te tonen:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>Kies de standaard onderverdelingseenheid om weer te geven in uw programma, en voor het versturen van munten</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&Toon adressen in uw transactielijst</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation>Of Bitcoinadressen getoond worden in de transactielijst</translation> </message> @@ -728,85 +735,95 @@ Adres: %4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> - <source>&Start Bitcoin on window system startup</source> - <translation>Start &Bitcoin wanneer het systeem opstart</translation> + <location filename="../optionsdialog.cpp" line="176"/> + <source>&Minimize to the tray instead of the taskbar</source> + <translation>&Minimaliseer naar het systeemvak in plaats van de taakbalk</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> - <source>Automatically start Bitcoin after the computer is turned on</source> - <translation>Start Bitcoin automatisch wanneer de computer wordt aangezet</translation> + <location filename="../optionsdialog.cpp" line="177"/> + <source>Show only a tray icon after minimizing the window</source> + <translation>Laat alleen een systeemvak-icoon zien wanneer het venster geminimaliseerd is</translation> </message> <message> <location filename="../optionsdialog.cpp" line="185"/> - <source>M&inimize on close</source> - <translation>Minimaliseer bij &sluiten van het venster</translation> + <source>Map port using &UPnP</source> + <translation>Portmapping via &UPnP</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="181"/> + <location filename="../optionsdialog.cpp" line="186"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Open de Bitcoin-poort automatisch op de router. Dit werkt alleen als de router UPnP ondersteunt.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> - <source>&Minimize to the tray instead of the taskbar</source> - <translation>&Minimaliseer naar het systeemvak in plaats van de taakbalk</translation> + <location filename="../optionsdialog.cpp" line="171"/> + <source>&Start Bitcoin on window system startup</source> + <translation>Start &Bitcoin wanneer het systeem opstart</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> - <source>Show only a tray icon after minimizing the window</source> - <translation>Laat alleen een systeemvak-icoon zien wanneer het venster geminimaliseerd is</translation> + <location filename="../optionsdialog.cpp" line="172"/> + <source>Automatically start Bitcoin after the computer is turned on</source> + <translation>Start Bitcoin automatisch wanneer de computer wordt aangezet</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="186"/> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimaliseer het venster in de plaats van de applicatie af te sluiten als het venster gesloten wordt. Wanneer deze optie aan staan, kan de applicatie alleen worden afgesloten door Afsluiten te kiezen in het menu.</translation> + <location filename="../optionsdialog.cpp" line="180"/> + <source>M&inimize on close</source> + <translation>Minimaliseer bij &sluiten van het venster</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> - <source>Map port using &UPnP</source> - <translation>Portmapping via &UPnP</translation> + <location filename="../optionsdialog.cpp" line="181"/> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> + <translation>Minimaliseer het venster in de plaats van de applicatie af te sluiten als het venster gesloten wordt. Wanneer deze optie aan staan, kan de applicatie alleen worden afgesloten door Afsluiten te kiezen in het menu.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>&Verbind via SOCKS4 proxy: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Verbind met het Bitcoin-netwerk door een SOCKS4 proxy (bijv. wanneer Tor gebruikt wordt)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>Proxy &IP:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>IP-adres van de proxy (bijv. 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>&Poort:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Poort waarop de proxy luistert (bijv. 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>Optionele transactiekosten per kB die helpen om uw transacties snel te verwerken. De meeste transacties zijn 1 kB. Transactiekosten van 0,01 wordt aangeraden</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>Betaal &transactiekosten</translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation>Ontkoppel databases bij afsluiten</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation>Ontkoppel blok- en adresdatabases bij afsluiten. Dit betekent dat ze verplaatst kunnen worden naar een andere map, maar het vertraagt het afsluiten. De portemonnee wordt altijd ontkoppeld.</translation> + </message> </context> <context> <name>MessagePage</name> @@ -826,19 +843,24 @@ Adres: %4 <translation>Onderteken een bericht om te bewijzen dat u dit adres bezit</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="105"/> - <source>Click "Sign Message" to get signature</source> - <translation>Klik "Onderteken Bericht" om de handtekening te verkrijgen</translation> + <location filename="../forms/messagepage.ui" line="48"/> + <source>Choose adress from address book</source> + <translation>Kies adres uit adresboek</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="131"/> - <source>Copy the current signature to the system clipboard</source> - <translation>Kopieer de huidige handtekening naar het systeemklembord</translation> + <location filename="../forms/messagepage.ui" line="93"/> + <source>Enter the message you want to sign here</source> + <translation>Typ hier het bericht dat u wilt ondertekenen</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="134"/> - <source>&Copy to Clipboard</source> - <translation>&Kopieer naar Klembord</translation> + <location filename="../messagepage.cpp" line="89"/> + <source>Private key for %1 is not available.</source> + <translation>Geheime sleutel voor %1 is niet beschikbaar.</translation> + </message> + <message> + <location filename="../messagepage.cpp" line="101"/> + <source>Sign failed</source> + <translation>Ondertekenen mislukt</translation> </message> <message> <location filename="../forms/messagepage.ui" line="38"/> @@ -846,11 +868,6 @@ Adres: %4 <translation>Het adres om het bericht mee te ondertekenen (Vb.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="48"/> - <source>Choose adress from address book</source> - <translation>Kies adres uit adresboek</translation> - </message> - <message> <location filename="../forms/messagepage.ui" line="58"/> <source>Alt+A</source> <translation>Alt+A</translation> @@ -866,9 +883,9 @@ Adres: %4 <translation>Alt+P</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="93"/> - <source>Enter the message you want to sign here</source> - <translation>Typ hier het bericht dat u wilt ondertekenen</translation> + <location filename="../forms/messagepage.ui" line="105"/> + <source>Click "Sign Message" to get signature</source> + <translation>Klik "Onderteken Bericht" om de handtekening te verkrijgen</translation> </message> <message> <location filename="../forms/messagepage.ui" line="120"/> @@ -876,6 +893,16 @@ Adres: %4 <translation>&Onderteken Bericht</translation> </message> <message> + <location filename="../forms/messagepage.ui" line="131"/> + <source>Copy the current signature to the system clipboard</source> + <translation>Kopieer de huidige handtekening naar het systeemklembord</translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="134"/> + <source>&Copy to Clipboard</source> + <translation>&Kopieer naar Klembord</translation> + </message> + <message> <location filename="../messagepage.cpp" line="74"/> <location filename="../messagepage.cpp" line="89"/> <location filename="../messagepage.cpp" line="101"/> @@ -887,31 +914,21 @@ Adres: %4 <source>%1 is not a valid address.</source> <translation>%1 is geen geldig adres.</translation> </message> - <message> - <location filename="../messagepage.cpp" line="89"/> - <source>Private key for %1 is not available.</source> - <translation>Geheime sleutel voor %1 is niet beschikbaar.</translation> - </message> - <message> - <location filename="../messagepage.cpp" line="101"/> - <source>Sign failed</source> - <translation>Ondertekenen mislukt</translation> - </message> </context> <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>Algemeen</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>Beeldscherm</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>Opties</translation> </message> @@ -919,14 +936,9 @@ Adres: %4 <context> <name>OverviewPage</name> <message> - <location filename="../overviewpage.cpp" line="103"/> - <source>Your current balance</source> - <translation>Uw huidige saldo</translation> - </message> - <message> - <location filename="../overviewpage.cpp" line="108"/> - <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> - <translation>Totaal van de transacties die nog moeten worden bevestigd en nog niet zijn meegeteld in uw huidige saldo </translation> + <location filename="../forms/overviewpage.ui" line="14"/> + <source>Form</source> + <translation>Vorm</translation> </message> <message> <location filename="../forms/overviewpage.ui" line="40"/> @@ -934,19 +946,19 @@ Adres: %4 <translation>Saldo:</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="61"/> - <source>0</source> - <translation>0</translation> + <location filename="../overviewpage.cpp" line="103"/> + <source>Your current balance</source> + <translation>Uw huidige saldo</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="88"/> - <source>Wallet</source> - <translation>Portemonnee</translation> + <location filename="../overviewpage.cpp" line="108"/> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> + <translation>Totaal van de transacties die nog moeten worden bevestigd en nog niet zijn meegeteld in uw huidige saldo </translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="14"/> - <source>Form</source> - <translation>Vorm</translation> + <location filename="../overviewpage.cpp" line="111"/> + <source>Total number of transactions in wallet</source> + <translation>Totaal aantal transacties in uw portemonnee</translation> </message> <message> <location filename="../forms/overviewpage.ui" line="54"/> @@ -954,20 +966,25 @@ Adres: %4 <translation>Aantal transacties:</translation> </message> <message> + <location filename="../forms/overviewpage.ui" line="61"/> + <source>0</source> + <translation>0</translation> + </message> + <message> <location filename="../forms/overviewpage.ui" line="68"/> <source>Unconfirmed:</source> <translation>Onbevestigd:</translation> </message> <message> + <location filename="../forms/overviewpage.ui" line="88"/> + <source>Wallet</source> + <translation>Portemonnee</translation> + </message> + <message> <location filename="../forms/overviewpage.ui" line="124"/> <source><b>Recent transactions</b></source> <translation><b>Recente transacties</b></translation> </message> - <message> - <location filename="../overviewpage.cpp" line="111"/> - <source>Total number of transactions in wallet</source> - <translation>Totaal aantal transacties in uw portemonnee</translation> - </message> </context> <context> <name>QRCodeDialog</name> @@ -982,9 +999,14 @@ Adres: %4 <translation>Label:</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="14"/> - <source>Dialog</source> - <translation>Dialoog</translation> + <location filename="../qrcodedialog.cpp" line="121"/> + <source>PNG Images (*.png)</source> + <translation>PNG-Afbeeldingen (*.png)</translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>Resulterende URI te lang, probeer de tekst korter te maken voor het label/bericht.</translation> </message> <message> <location filename="../forms/qrcodedialog.ui" line="105"/> @@ -992,21 +1014,11 @@ Adres: %4 <translation>BTC</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation>Afbeelding Opslaan...</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="32"/> - <source>QR Code</source> - <translation>QR-code</translation> - </message> - <message> - <location filename="../forms/qrcodedialog.ui" line="55"/> - <source>Request Payment</source> - <translation>Vraag betaling aan</translation> - </message> - <message> <location filename="../forms/qrcodedialog.ui" line="144"/> <source>Message:</source> <translation>Bericht:</translation> @@ -1017,31 +1029,29 @@ Adres: %4 <translation>&Opslaan Als...</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation>Fout tijdens encoderen URI in QR-code</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> - <source>PNG Images (*.png)</source> - <translation>PNG-Afbeeldingen (*.png)</translation> + <location filename="../forms/qrcodedialog.ui" line="14"/> + <source>Dialog</source> + <translation>Dialoog</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="32"/> + <source>QR Code</source> + <translation>QR-code</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="55"/> + <source>Request Payment</source> + <translation>Vraag betaling aan</translation> </message> </context> <context> <name>SendCoinsDialog</name> <message> - <location filename="../forms/sendcoinsdialog.ui" line="14"/> - <location filename="../sendcoinsdialog.cpp" line="123"/> - <location filename="../sendcoinsdialog.cpp" line="128"/> - <location filename="../sendcoinsdialog.cpp" line="133"/> - <location filename="../sendcoinsdialog.cpp" line="138"/> - <location filename="../sendcoinsdialog.cpp" line="144"/> - <location filename="../sendcoinsdialog.cpp" line="149"/> - <location filename="../sendcoinsdialog.cpp" line="154"/> - <source>Send Coins</source> - <translation>Verstuur munten</translation> - </message> - <message> <location filename="../forms/sendcoinsdialog.ui" line="64"/> <source>Send to multiple recipients at once</source> <translation>Verstuur aan verschillende ontvangers ineens</translation> @@ -1057,46 +1067,11 @@ Adres: %4 <translation>Saldo:</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="144"/> - <source>Confirm the send action</source> - <translation>Bevestig de verstuuractie</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="147"/> - <source>S&end</source> - <translation>&Verstuur</translation> - </message> - <message> <location filename="../sendcoinsdialog.cpp" line="95"/> <source><b>%1</b> to %2 (%3)</source> <translation><b>%1</b> aan %2 (%3)</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="134"/> - <source>The amount exceeds your balance.</source> - <translation>Bedrag is hoger dan uw huidige saldo</translation> - </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="139"/> - <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation>Totaal overschrijdt uw huidige saldo wanneer de %1 transactiekosten worden meegerekend</translation> - </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="145"/> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Dubbel adres gevonden, u kunt slechts eenmaal naar een bepaald adres verzenden per verstuurtransactie</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="67"/> - <source>&Add recipient...</source> - <translation>Voeg &ontvanger toe...</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="113"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> - </message> - <message> <location filename="../sendcoinsdialog.cpp" line="100"/> <source>Confirm send coins</source> <translation>Bevestig versturen munten</translation> @@ -1122,43 +1097,74 @@ Adres: %4 <translation>Het ingevoerde bedrag moet groter zijn dan 0.</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="150"/> - <source>Error: Transaction creation failed.</source> - <translation>Fout: Aanmaak transactie mislukt</translation> + <location filename="../sendcoinsdialog.cpp" line="134"/> + <source>The amount exceeds your balance.</source> + <translation>Bedrag is hoger dan uw huidige saldo</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="155"/> - <source>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.</source> - <translation>Fout: De transactie was afgewezen. Dit kan gebeuren als u eerder uitgegeven munten opnieuw wilt versturen, zoals wanneer u een kopie van uw portemonneebestand (wallet.dat) heeft gebruikt en in de kopie deze munten zijn uitgegeven, maar in de huidige portemonnee deze nog niet als zodanig zijn gemarkeerd.</translation> + <location filename="../forms/sendcoinsdialog.ui" line="14"/> + <location filename="../sendcoinsdialog.cpp" line="123"/> + <location filename="../sendcoinsdialog.cpp" line="128"/> + <location filename="../sendcoinsdialog.cpp" line="133"/> + <location filename="../sendcoinsdialog.cpp" line="138"/> + <location filename="../sendcoinsdialog.cpp" line="144"/> + <location filename="../sendcoinsdialog.cpp" line="149"/> + <location filename="../sendcoinsdialog.cpp" line="154"/> + <source>Send Coins</source> + <translation>Verstuur munten</translation> </message> <message> <location filename="../forms/sendcoinsdialog.ui" line="87"/> <source>Clear all</source> <translation>Verwijder alles</translation> </message> -</context> -<context> - <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="42"/> - <source>Pay &To:</source> - <translation>Betaal &Aan:</translation> + <location filename="../forms/sendcoinsdialog.ui" line="113"/> + <source>123.456 BTC</source> + <translation>123.456 BTC</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="14"/> - <source>Form</source> - <translation>Vorm</translation> + <location filename="../forms/sendcoinsdialog.ui" line="144"/> + <source>Confirm the send action</source> + <translation>Bevestig de verstuuractie</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="29"/> - <source>A&mount:</source> - <translation>Bedra&g:</translation> + <location filename="../forms/sendcoinsdialog.ui" line="147"/> + <source>S&end</source> + <translation>&Verstuur</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="66"/> - <location filename="../sendcoinsentry.cpp" line="26"/> - <source>Enter a label for this address to add it to your address book</source> - <translation>Vul een label in voor dit adres om het toe te voegen aan uw adresboek</translation> + <location filename="../forms/sendcoinsdialog.ui" line="67"/> + <source>&Add recipient...</source> + <translation>Voeg &ontvanger toe...</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="145"/> + <source>Duplicate address found, can only send to each address once per send operation.</source> + <translation>Dubbel adres gevonden, u kunt slechts eenmaal naar een bepaald adres verzenden per verstuurtransactie</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="139"/> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>Totaal overschrijdt uw huidige saldo wanneer de %1 transactiekosten worden meegerekend</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="150"/> + <source>Error: Transaction creation failed.</source> + <translation>Fout: Aanmaak transactie mislukt</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="155"/> + <source>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.</source> + <translation>Fout: De transactie was afgewezen. Dit kan gebeuren als u eerder uitgegeven munten opnieuw wilt versturen, zoals wanneer u een kopie van uw portemonneebestand (wallet.dat) heeft gebruikt en in de kopie deze munten zijn uitgegeven, maar in de huidige portemonnee deze nog niet als zodanig zijn gemarkeerd.</translation> + </message> +</context> +<context> + <name>SendCoinsEntry</name> + <message> + <location filename="../forms/sendcoinsentry.ui" line="75"/> + <source>&Label:</source> + <translation>&Label:</translation> </message> <message> <location filename="../forms/sendcoinsentry.ui" line="93"/> @@ -1186,16 +1192,32 @@ Adres: %4 <translation>Alt+P</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="75"/> - <source>&Label:</source> - <translation>&Label:</translation> - </message> - <message> <location filename="../forms/sendcoinsentry.ui" line="137"/> <source>Remove this recipient</source> <translation>Verwijder deze ontvanger</translation> </message> <message> + <location filename="../forms/sendcoinsentry.ui" line="29"/> + <source>A&mount:</source> + <translation>Bedra&g:</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="14"/> + <source>Form</source> + <translation>Vorm</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="42"/> + <source>Pay &To:</source> + <translation>Betaal &Aan:</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="66"/> + <location filename="../sendcoinsentry.cpp" line="26"/> + <source>Enter a label for this address to add it to your address book</source> + <translation>Vul een label in voor dit adres om het toe te voegen aan uw adresboek</translation> + </message> + <message> <location filename="../sendcoinsentry.cpp" line="25"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Vul een Bitcoinadres in (bijv. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1204,140 +1226,140 @@ Adres: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="30"/> - <source>%1 confirmations</source> - <translation>%1 bevestigingen</translation> + <location filename="../transactiondesc.cpp" line="22"/> + <source>Open until %1</source> + <translation>Openen totdat %1</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> - <source>unknown</source> - <translation>onbekend</translation> + <location filename="../transactiondesc.cpp" line="30"/> + <source>%1/unconfirmed</source> + <translation>%1/onbevestigd</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="18"/> - <source>Open for %1 blocks</source> - <translation>Openen voor %1 blokken</translation> + <location filename="../transactiondesc.cpp" line="32"/> + <source>%1 confirmations</source> + <translation>%1 bevestigingen</translation> </message> <message> <location filename="../transactiondesc.cpp" line="20"/> - <source>Open until %1</source> - <translation>Openen totdat %1</translation> + <source>Open for %1 blocks</source> + <translation>Openen voor %1 blokken</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation>%1/niet verbonden?</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="28"/> - <source>%1/unconfirmed</source> - <translation>%1/onbevestigd</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation><b>Status:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>, uitgezonden naar %1 node</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>, uitgezonden naar %1 nodes</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation><b>Datum:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>Bron:</b>Gegenereerd<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>Van:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation><b>Aan:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> - <source> (yours, label: </source> - <translation>(Uw adres, label:</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="95"/> - <source> (yours)</source> - <translation> (uw)</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> - <source><b>Credit:</b> </source> - <translation><b>Bij:</b></translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation>(%1 komt beschikbaar na %2 blokken)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> - <source>(not accepted)</source> - <translation>(niet geaccepteerd)</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation><b>Af:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="221"/> + <source>Comment:</source> + <translation>Opmerking:</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation>Transactie-ID:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation>, is nog niet met succes uitgezonden</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="92"/> + <source>unknown</source> + <translation>onbekend</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="96"/> + <source> (yours, label: </source> + <translation>(Uw adres, label:</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="98"/> + <source> (yours)</source> + <translation>(uw)</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> + <source><b>Credit:</b> </source> + <translation><b>Bij:</b></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="139"/> + <source>(not accepted)</source> + <translation>(niet geaccepteerd)</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation><b>Transactiekosten:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>Netto bedrag:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>Bericht:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> - <source>Comment:</source> - <translation>Opmerking:</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation>Gegeneerde munten moeten 120 blokken wachten voor ze kunnen worden uitgegeven. Uw net gegenereerde blok is uitgezonden aan het netwerk om te worden toegevoegd aan de blokkenketen. Als het niet wordt geaccepteerd in de keten, zal het blok als "ongeldig" worden aangemerkt en kan het niet worden uitgegeven. Dit kan soms gebeuren als een andere node net iets sneller een blok heeft gegenereerd; een paar seconden voor het uwe.</translation> </message> @@ -1359,24 +1381,14 @@ Adres: %4 <name>TransactionTableModel</name> <message> <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Date</source> - <translation>Datum</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Type</source> - <translation>Type</translation> + <source>Amount</source> + <translation>Bedrag</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="214"/> <source>Address</source> <translation>Adres</translation> </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Amount</source> - <translation>Bedrag</translation> - </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="277"/> <source>Open for %n block(s)</source> @@ -1396,31 +1408,11 @@ Adres: %4 <translation>Niet verbonden (%1 bevestigingen)</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="286"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Onbevestigd (%1 van %2 bevestigd)</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="289"/> - <source>Confirmed (%1 confirmations)</source> - <translation>Bevestigd (%1 bevestigingen)</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="303"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Dit blok is niet ontvangen bij andere nodes en zal waarschijnlijk niet worden geaccepteerd!</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="306"/> <source>Generated but not accepted</source> <translation>Gegenereerd maar niet geaccepteerd</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="349"/> - <source>Received with</source> - <translation>Ontvangen met</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="351"/> <source>Received from</source> <translation>Ontvangen van</translation> @@ -1470,6 +1462,36 @@ Adres: %4 <source>Amount removed from or added to balance.</source> <translation>Bedrag verwijderd van of toegevoegd aan saldo</translation> </message> + <message> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Type</source> + <translation>Type</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="286"/> + <source>Unconfirmed (%1 of %2 confirmations)</source> + <translation>Onbevestigd (%1 van %2 bevestigd)</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="303"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Dit blok is niet ontvangen bij andere nodes en zal waarschijnlijk niet worden geaccepteerd!</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="349"/> + <source>Received with</source> + <translation>Ontvangen met</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="289"/> + <source>Confirmed (%1 confirmations)</source> + <translation>Bevestigd (%1 bevestigingen)</translation> + </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="297"/> <source>Mined balance will be available in %n more blocks</source> @@ -1482,24 +1504,25 @@ Adres: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="124"/> - <source>Copy address</source> - <translation>Kopieer adres</translation> + <location filename="../transactionview.cpp" line="384"/> + <source>Range:</source> + <translation>Bereik:</translation> </message> <message> - <location filename="../transactionview.cpp" line="60"/> - <source>This year</source> - <translation>Dit jaar</translation> + <location filename="../transactionview.cpp" line="392"/> + <source>to</source> + <translation>naar</translation> </message> <message> - <location filename="../transactionview.cpp" line="72"/> - <source>Received with</source> - <translation>Ontvangen met</translation> + <location filename="../transactionview.cpp" line="55"/> + <location filename="../transactionview.cpp" line="71"/> + <source>All</source> + <translation>Alles</translation> </message> <message> - <location filename="../transactionview.cpp" line="74"/> - <source>Sent to</source> - <translation>Verzonden aan</translation> + <location filename="../transactionview.cpp" line="84"/> + <source>Enter address or label to search</source> + <translation>Vul adres of label in om te zoeken</translation> </message> <message> <location filename="../transactionview.cpp" line="282"/> @@ -1507,21 +1530,6 @@ Adres: %4 <translation>Label</translation> </message> <message> - <location filename="../transactionview.cpp" line="125"/> - <source>Copy label</source> - <translation>Kopieer label</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="78"/> - <source>Other</source> - <translation>Anders</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="128"/> - <source>Show details...</source> - <translation>Toon details...</translation> - </message> - <message> <location filename="../transactionview.cpp" line="58"/> <source>This month</source> <translation>Deze maand</translation> @@ -1532,6 +1540,11 @@ Adres: %4 <translation>Min. bedrag</translation> </message> <message> + <location filename="../transactionview.cpp" line="124"/> + <source>Copy address</source> + <translation>Kopieer adres</translation> + </message> + <message> <location filename="../transactionview.cpp" line="126"/> <source>Copy amount</source> <translation>Kopieer bedrag</translation> @@ -1547,9 +1560,9 @@ Adres: %4 <translation>Bewerk label</translation> </message> <message> - <location filename="../transactionview.cpp" line="77"/> - <source>Mined</source> - <translation>Ontgonnen</translation> + <location filename="../transactionview.cpp" line="74"/> + <source>Sent to</source> + <translation>Verzonden aan</translation> </message> <message> <location filename="../transactionview.cpp" line="270"/> @@ -1557,6 +1570,11 @@ Adres: %4 <translation>Exporteer transactiegegevens</translation> </message> <message> + <location filename="../transactionview.cpp" line="77"/> + <source>Mined</source> + <translation>Ontgonnen</translation> + </message> + <message> <location filename="../transactionview.cpp" line="271"/> <source>Comma separated file (*.csv)</source> <translation>Kommagescheiden bestand (*.csv)</translation> @@ -1567,34 +1585,9 @@ Adres: %4 <translation>Bevestigd</translation> </message> <message> - <location filename="../transactionview.cpp" line="284"/> - <source>Amount</source> - <translation>Bedrag</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="285"/> - <source>ID</source> - <translation>ID</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="289"/> - <source>Error exporting</source> - <translation>Fout bij exporteren</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="289"/> - <source>Could not write to file %1.</source> - <translation>Kon niet schrijven naar bestand %1.</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="384"/> - <source>Range:</source> - <translation>Bereik:</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="392"/> - <source>to</source> - <translation>naar</translation> + <location filename="../transactionview.cpp" line="125"/> + <source>Copy label</source> + <translation>Kopieer label</translation> </message> <message> <location filename="../transactionview.cpp" line="280"/> @@ -1612,6 +1605,21 @@ Adres: %4 <translation>Adres</translation> </message> <message> + <location filename="../transactionview.cpp" line="284"/> + <source>Amount</source> + <translation>Bedrag</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="289"/> + <source>Error exporting</source> + <translation>Fout bij exporteren</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="289"/> + <source>Could not write to file %1.</source> + <translation>Kon niet schrijven naar bestand %1.</translation> + </message> + <message> <location filename="../transactionview.cpp" line="76"/> <source>To yourself</source> <translation>Aan uzelf</translation> @@ -1627,15 +1635,29 @@ Adres: %4 <translation>Vorige maand</translation> </message> <message> - <location filename="../transactionview.cpp" line="84"/> - <source>Enter address or label to search</source> - <translation>Vul adres of label in om te zoeken</translation> + <location filename="../transactionview.cpp" line="60"/> + <source>This year</source> + <translation>Dit jaar</translation> </message> <message> - <location filename="../transactionview.cpp" line="55"/> - <location filename="../transactionview.cpp" line="71"/> - <source>All</source> - <translation>Alles</translation> + <location filename="../transactionview.cpp" line="72"/> + <source>Received with</source> + <translation>Ontvangen met</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="78"/> + <source>Other</source> + <translation>Anders</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="128"/> + <source>Show details...</source> + <translation>Toon details...</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="285"/> + <source>ID</source> + <translation>ID</translation> </message> <message> <location filename="../transactionview.cpp" line="56"/> @@ -1646,7 +1668,7 @@ Adres: %4 <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>Versturen...</translation> </message> @@ -1654,429 +1676,522 @@ Adres: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> - <source>Loading addresses...</source> - <translation>Adressen aan het laden...</translation> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>Kan geen lock op de datamap %s verkrijgen. Bitcoin draait vermoedelijk reeds.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> + <location filename="../bitcoinstrings.cpp" line="115"/> <source>Loading block index...</source> <translation>Blokindex aan het laden...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> + <location filename="../bitcoinstrings.cpp" line="125"/> <source>Rescanning...</source> <translation>Opnieuw aan het scannen ...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>Done loading</source> + <translation>Klaar met laden</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="120"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Portemonnee moest herschreven worden: Herstart Bitcoin om te voltooien</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> - <source>Error loading wallet.dat: Wallet corrupted</source> - <translation>Fout bij laden wallet.dat: Portemonnee corrupt</translation> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>Error loading wallet.dat</source> + <translation>Fout bij laden wallet.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation>Fout bij laden wallet.dat: Portemonnee vereist een nieuwere versie van Bitcoin</translation> + <location filename="../bitcoinstrings.cpp" line="122"/> + <source>Cannot downgrade wallet</source> + <translation>Kan portemonnee niet downgraden</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> - <source>Invalid -proxy address</source> - <translation>Foutief -proxy adres</translation> + <location filename="../bitcoinstrings.cpp" line="124"/> + <source>Cannot write default address</source> + <translation>Kan standaard adres niet schrijven</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>Specifieer pid-bestand (standaard: bitcoind.pid) + <location filename="../bitcoinstrings.cpp" line="46"/> + <source>Options:</source> + <translation>Opties: </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> - <source>Invalid amount for -paytxfee=<amount></source> - <translation>Ongeldig bedrag voor -paytxfee=<bedrag></translation> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> - <source>List commands</source> - <translation>List van commando's -</translation> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> - <source>Error: CreateThread(StartNode) failed</source> - <translation>Fout: CreateThread(StartNode) is mislukt</translation> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">Fout: Aanmaak transactie mislukt</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">Fout: De transactie was afgewezen. Dit kan gebeuren als u eerder uitgegeven munten opnieuw wilt versturen, zoals wanneer u een kopie van uw portemonneebestand (wallet.dat) heeft gebruikt en in de kopie deze munten zijn uitgegeven, maar in de huidige portemonnee deze nog niet als zodanig zijn gemarkeerd.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="43"/> + <source>Send command to -server or bitcoind</source> + <translation>Stuur commando naar -server of bitcoind +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="50"/> <source>Don't generate coins</source> <translation>Genereer geen munten </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Options:</source> - <translation>Opties: + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Specify data directory</source> + <translation>Stel datamap in </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Find peers using internet relay chat (default: 0)</source> - <translation>Vind anderen door middel van Internet Relay Chat (standaard: 0)</translation> + <location filename="../bitcoinstrings.cpp" line="54"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation>Stel databankcachegrootte in in megabytes (standaard: 25)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> - <source>Accept command line and JSON-RPC commands</source> - <translation>Aanvaard commandoregel en JSON-RPC commando's -</translation> + <location filename="../bitcoinstrings.cpp" line="59"/> + <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> + <translation>Luister voor verbindingen op <poort> (standaard: 8333 of testnet: 18333)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Maintain at most <n> connections to peers (default: 125)</source> - <translation>Onderhoud maximaal <n> verbindingen naar peers (standaard: 125)</translation> + <location filename="../bitcoinstrings.cpp" line="61"/> + <source>Add a node to connect to and attempt to keep the connection open</source> + <translation>Voeg een knooppunt om te verbinden toe en probeer de verbinding open te houden</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> + <location filename="../bitcoinstrings.cpp" line="83"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Stuur trace/debug-info naar de console in plaats van het debug.log bestand</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> + <location filename="../bitcoinstrings.cpp" line="86"/> <source>Password for JSON-RPC connections</source> <translation>Wachtwoord voor JSON-RPC verbindingen </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Allow JSON-RPC connections from specified IP address</source> - <translation>Sta JSON-RPC verbindingen van opgegeven IP adres toe -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="53"/> + <location filename="../bitcoinstrings.cpp" line="89"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Verstuur commando's naar proces dat op <ip> draait (standaard: 127.0.0.1) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="68"/> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> + <translation>Aantal seconden dat zich misdragende peers niet opnieuw mogen verbinden (standaard: 86400)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> - <source>Error loading addr.dat</source> - <translation>Fout bij laden addr.dat</translation> + <location filename="../bitcoinstrings.cpp" line="129"/> + <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> + <translation>Waarschuwing: -paytxfee is zeer hoog ingesteld. Dit zijn de transactiekosten die u betaalt bij het versturen van een transactie.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> + <location filename="../bitcoinstrings.cpp" line="133"/> + <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> + <translation>Kan niet binden aan poort %d op deze computer. Bitcoin draait vermoedelijk reeds.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <translation>Waarschuwing: Controleer dat de datum en tijd op uw computer correct zijn ingesteld. Als uw klok fout staat zal Bitcoin niet correct werken.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="102"/> <source>Server certificate file (default: server.cert)</source> <translation>Certificaat-bestand voor server (standaard: server.cert) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> - <source>Server private key (default: server.pem)</source> - <translation>Geheime sleutel voor server (standaard: server.pem) -</translation> + <location filename="../bitcoinstrings.cpp" line="77"/> + <source>Fee per KB to add to transactions you send</source> + <translation>Kosten per KB om aan transacties toe te voegen die u verstuurt</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> - <source>This help message</source> - <translation>Dit helpbericht + <location filename="../bitcoinstrings.cpp" line="79"/> + <source>Run in the background as a daemon and accept commands</source> + <translation>Draai in de achtergrond als daemon en aanvaard commando's </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Start minimized</source> - <translation>Geminimaliseerd starten + <location filename="../bitcoinstrings.cpp" line="80"/> + <source>Use the test network</source> + <translation>Gebruik het testnetwerk </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Show splash screen on startup (default: 1)</source> - <translation>Laat laadscherm zien bij het opstarten. (standaard: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Prepend debug output with timestamp</source> + <translation>Voorzie de debuggingsuitvoer van een tijdsaanduiding</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Find peers using DNS lookup (default: 1)</source> - <translation>Vind andere nodes d.m.v. DNS-naslag (standaard: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>Aanvaardbare ciphers (standaard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> - <translation>Maximale ontvangstbuffer per connectie, <n>*1000 bytes (standaard: 10000)</translation> + <location filename="../bitcoinstrings.cpp" line="84"/> + <source>Send trace/debug info to debugger</source> + <translation>Stuur trace/debug-info naar debugger</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Use Universal Plug and Play to map the listening port (default: 0)</source> - <translation type="unfinished">Gebruik UPnP om de luisterende poort te mappen (standaard: 0)</translation> + <location filename="../bitcoinstrings.cpp" line="90"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation>Voer commando uit zodra het beste blok verandert (%s in cmd wordt vervangen door blockhash)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Bitcoin version</source> - <translation>Bitcoinversie</translation> + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>Username for JSON-RPC connections</source> + <translation>Gebruikersnaam voor JSON-RPC verbindingen +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> - <source>Loading wallet...</source> - <translation>Portemonnee aan het laden...</translation> + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>Luister voor JSON-RPC verbindingen op <poort> (standaard: 8332) +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Usage:</source> - <translation>Gebruik:</translation> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Upgrade wallet to latest format</source> + <translation>Vernieuw portemonnee naar nieuwste versie</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> - <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> - <translation>Waarschuwing: -paytxfee is zeer hoog ingesteld. Dit zijn de transactiekosten die u betaalt bij het versturen van een transactie.</translation> + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>Stel sleutelpoelgrootte in op <n> (standaard: 100) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation>Doorzoek de blokkenketen op ontbrekende portemonnee-transacties</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="96"/> - <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> - <translation>Kan niet binden aan poort %d op deze computer. Bitcoin draait vermoedelijk reeds.</translation> + <source>How many blocks to check at startup (default: 2500, 0 = all)</source> + <translation>Het aantal blokken na te kijken bij opstarten (standaard: 2500, 0=alle)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> - <translation>Waarschuwing: Controleer dat de datum en tijd op uw computer correct zijn ingesteld. Als uw klok fout staat zal Bitcoin niet correct werken.</translation> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>How thorough the block verification is (0-6, default: 1)</source> + <translation>De grondigheid van de blokverificatie (0-6, standaard: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> - <translation>Waarschuwing: Weinig schijfruimte over</translation> + <location filename="../bitcoinstrings.cpp" line="101"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>Gebruik OpenSSL (https) voor JSON-RPC verbindingen +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> - <source>Done loading</source> - <translation>Klaar met laden</translation> + <location filename="../bitcoinstrings.cpp" line="57"/> + <source>Connect through socks4 proxy</source> + <translation>Verbind via socks4 proxy +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>beta</translation> + <location filename="../bitcoinstrings.cpp" line="71"/> + <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> + <translation>Maximale ontvangstbuffer per connectie, <n>*1000 bytes (standaard: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> - <source>Error loading blkindex.dat</source> - <translation>Fout bij laden blkindex.dat</translation> + <location filename="../bitcoinstrings.cpp" line="74"/> + <source>Use Universal Plug and Play to map the listening port (default: 0)</source> + <translation type="unfinished">Gebruik UPnP om de luisterende poort te mappen (standaard: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> - <source>Error loading wallet.dat</source> - <translation>Fout bij laden wallet.dat</translation> + <location filename="../bitcoinstrings.cpp" line="62"/> + <source>Connect only to the specified node</source> + <translation>Verbind alleen met deze node +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> - <source>Cannot downgrade wallet</source> - <translation>Kan portemonnee niet downgraden</translation> + <location filename="../bitcoinstrings.cpp" line="64"/> + <source>Accept connections from outside (default: 1)</source> + <translation>Accepteer verbindingen van buitenaf (standaard: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> - <source>Cannot initialize keypool</source> - <translation>Kan sleutel-pool niet initialiseren</translation> + <location filename="../bitcoinstrings.cpp" line="65"/> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Stel taal in, bijvoorbeeld ''de_DE" (standaard: systeeminstellingen)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> - <source>Cannot write default address</source> - <translation>Kan standaard adres niet schrijven</translation> + <location filename="../bitcoinstrings.cpp" line="72"/> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> + <translation>Maximale zendbuffer per connectie, <n>*1000 bytes (standaard: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Send command to -server or bitcoind</source> - <translation>Stuur commando naar -server of bitcoind -</translation> + <location filename="../bitcoinstrings.cpp" line="73"/> + <source>Use Universal Plug and Play to map the listening port (default: 1)</source> + <translation type="unfinished">Gebruik UPnP om de luisterende poort te mappen (standaard: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Get help for a command</source> - <translation>Toon hulp voor een commando -</translation> + <location filename="../bitcoinstrings.cpp" line="81"/> + <source>Output extra debugging information</source> + <translation>Toon extra debuggingsinformatie</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify configuration file (default: bitcoin.conf)</source> - <translation>Specifieer configuratiebestand (standaard: bitcoin.conf) -</translation> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Aan het versturen...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Generate coins</source> - <translation>Genereer munten + <location filename="../bitcoinstrings.cpp" line="98"/> + <source> +SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation> +SSL opties: (zie de Bitcoin wiki voor SSL instructies) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>Aanvaardbare ciphers (standaard: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>Ongeldig aantal</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Specify data directory</source> - <translation>Stel datamap in + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>Ontoereikend saldo</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation>%s, u moet een rpcpassword instellen in het configuratiebestand: + %s +Het wordt aangeraden het volgende willekeurige wachtwoord te gebruiken: +rpcuser=bitcoinrpc +rpcpassword=%s +(U hoeft het wachtwoord niet te onthouden) +Als het bestand niet bestaat, maak het aan met een alleen-lezen-permissie. </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Stel databankcachegrootte in in megabytes (standaard: 25)</translation> + <source>To use the %s option</source> + <translation>Om de %s optie te gebruiken</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Specificeer de time-out tijd (in milliseconden) -</translation> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation>Fout</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Connect through socks4 proxy</source> - <translation>Verbind via socks4 proxy -</translation> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation>U dient rpcpassword=<wachtwoord> in te stellen in het configuratiebestand: +%s +Als het bestand niet bestaat, maak het dan aan, met een alleen-lezen-permissie.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Allow DNS lookups for addnode and connect</source> - <translation>Sta DNS-naslag toe voor addnode en connect -</translation> + <location filename="../bitcoinstrings.cpp" line="41"/> + <source>Bitcoin version</source> + <translation>Bitcoinversie</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation>Luister voor verbindingen op <poort> (standaard: 8333 of testnet: 18333)</translation> + <location filename="../bitcoinstrings.cpp" line="42"/> + <source>Usage:</source> + <translation>Gebruik:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Add a node to connect to and attempt to keep the connection open</source> - <translation>Voeg een knooppunt om te verbinden toe en probeer de verbinding open te houden</translation> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation>Stel databankloggrootte in in megabytes (standaard: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Connect only to the specified node</source> - <translation>Verbind alleen met deze node -</translation> + <location filename="../bitcoinstrings.cpp" line="113"/> + <source>Loading addresses...</source> + <translation>Adressen aan het laden...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Accept connections from outside (default: 1)</source> - <translation>Accepteer verbindingen van buitenaf (standaard: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Loading wallet...</source> + <translation>Portemonnee aan het laden...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Stel taal in, bijvoorbeeld ''de_DE" (standaard: systeeminstellingen)</translation> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Warning: Disk space is low</source> + <translation>Waarschuwing: Weinig schijfruimte over</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Threshold for disconnecting misbehaving peers (default: 100)</source> - <translation>Drempel om verbinding te verbreken naar zich misdragende peers (standaard: 100)</translation> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Voer commando uit zodra het beste blok verandert (%s in cmd wordt vervangen door blockhash)</translation> + <location filename="../bitcoinstrings.cpp" line="128"/> + <source>Invalid amount for -paytxfee=<amount></source> + <translation>Ongeldig bedrag voor -paytxfee=<bedrag></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation>Aantal seconden dat zich misdragende peers niet opnieuw mogen verbinden (standaard: 86400)</translation> + <location filename="../bitcoinstrings.cpp" line="132"/> + <source>Error: CreateThread(StartNode) failed</source> + <translation>Fout: CreateThread(StartNode) is mislukt</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> - <translation>Maximale zendbuffer per connectie, <n>*1000 bytes (standaard: 10000)</translation> + <location filename="../bitcoinstrings.cpp" line="127"/> + <source>Invalid -proxy address</source> + <translation>Foutief -proxy adres</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Use Universal Plug and Play to map the listening port (default: 1)</source> - <translation type="unfinished">Gebruik UPnP om de luisterende poort te mappen (standaard: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="114"/> + <source>Error loading addr.dat</source> + <translation>Fout bij laden addr.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Kosten per KB om aan transacties toe te voegen die u verstuurt</translation> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Error loading blkindex.dat</source> + <translation>Fout bij laden blkindex.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> - <source>Run in the background as a daemon and accept commands</source> - <translation>Draai in de achtergrond als daemon en aanvaard commando's -</translation> + <location filename="../bitcoinstrings.cpp" line="118"/> + <source>Error loading wallet.dat: Wallet corrupted</source> + <translation>Fout bij laden wallet.dat: Portemonnee corrupt</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="119"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> + <translation>Fout bij laden wallet.dat: Portemonnee vereist een nieuwere versie van Bitcoin</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="123"/> + <source>Cannot initialize keypool</source> + <translation>Kan sleutel-pool niet initialiseren</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation>Er is een fout opgetreden tijdens het opzetten van de inkomende RPC-poort %u: %s</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="44"/> - <source>Use the test network</source> - <translation>Gebruik het testnetwerk + <source>List commands</source> + <translation>List van commando's </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="45"/> - <source>Output extra debugging information</source> - <translation>Toon extra debuggingsinformatie</translation> + <source>Get help for a command</source> + <translation>Toon hulp voor een commando +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> - <source>Prepend debug output with timestamp</source> - <translation>Voorzie de debuggingsuitvoer van een tijdsaanduiding</translation> + <location filename="../bitcoinstrings.cpp" line="47"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation>Specifieer configuratiebestand (standaard: bitcoin.conf) +</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Send trace/debug info to debugger</source> - <translation>Stuur trace/debug-info naar debugger</translation> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>Specifieer pid-bestand (standaard: bitcoind.pid) +</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="49"/> - <source>Username for JSON-RPC connections</source> - <translation>Gebruikersnaam voor JSON-RPC verbindingen + <source>Generate coins</source> + <translation>Genereer munten </translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="51"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation>Luister voor JSON-RPC verbindingen op <poort> (standaard: 8332) + <source>Start minimized</source> + <translation>Geminimaliseerd starten </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> - <source>Upgrade wallet to latest format</source> - <translation>Vernieuw portemonnee naar nieuwste versie</translation> + <location filename="../bitcoinstrings.cpp" line="52"/> + <source>Show splash screen on startup (default: 1)</source> + <translation>Laat laadscherm zien bij het opstarten. (standaard: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation>Stel sleutelpoelgrootte in op <n> (standaard: 100) + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Specify connection timeout (in milliseconds)</source> + <translation>Specificeer de time-out tijd (in milliseconden) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> - <source>Rescan the block chain for missing wallet transactions</source> - <translation>Doorzoek de blokkenketen op ontbrekende portemonnee-transacties</translation> + <location filename="../bitcoinstrings.cpp" line="58"/> + <source>Allow DNS lookups for addnode and connect</source> + <translation>Sta DNS-naslag toe voor addnode en connect +</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="60"/> - <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation>Het aantal blokken na te kijken bij opstarten (standaard: 2500, 0=alle)</translation> + <source>Maintain at most <n> connections to peers (default: 125)</source> + <translation>Onderhoud maximaal <n> verbindingen naar peers (standaard: 125)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> - <source>How thorough the block verification is (0-6, default: 1)</source> - <translation>De grondigheid van de blokverificatie (0-6, standaard: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="63"/> + <source>Find peers using internet relay chat (default: 0)</source> + <translation>Vind anderen door middel van Internet Relay Chat (standaard: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> - <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation> -SSL opties: (zie de Bitcoin wiki voor SSL instructies) + <location filename="../bitcoinstrings.cpp" line="66"/> + <source>Find peers using DNS lookup (default: 1)</source> + <translation>Vind andere nodes d.m.v. DNS-naslag (standaard: 1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="67"/> + <source>Threshold for disconnecting misbehaving peers (default: 100)</source> + <translation>Drempel om verbinding te verbreken naar zich misdragende peers (standaard: 100)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="78"/> + <source>Accept command line and JSON-RPC commands</source> + <translation>Aanvaard commandoregel en JSON-RPC commando's </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> - <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>Gebruik OpenSSL (https) voor JSON-RPC verbindingen + <location filename="../bitcoinstrings.cpp" line="88"/> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation>Sta JSON-RPC verbindingen van opgegeven IP adres toe +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="103"/> + <source>Server private key (default: server.pem)</source> + <translation>Geheime sleutel voor server (standaard: server.pem) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="107"/> + <source>This help message</source> + <translation>Dit helpbericht </translation> </message> + <message> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation>Ontkoppel blok- en adresdatabases. Verhoogt afsluittijd (standaard: 0)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation>Gebruik</translation> + </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts index 0194a08b41..071f5e0853 100644 --- a/src/qt/locale/bitcoin_pl.ts +++ b/src/qt/locale/bitcoin_pl.ts @@ -15,7 +15,7 @@ <translation>Wersja <b>Bitcoin</b></translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -100,42 +100,42 @@ www.transifex.net/projects/p/bitcoin/</translation> <translation>&Usuń</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>Kopiuj adres</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation>Kopiuj etykietę</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation>Edytuj</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>Usuń</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation>Eksportuj książkę adresową</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation>Plik *.CSV (rozdzielany przecinkami)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>Błąd podczas eksportowania</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation>Błąd zapisu do pliku %1.</translation> </message> @@ -176,9 +176,9 @@ www.transifex.net/projects/p/bitcoin/</translation> <translation>Powtórz nowe hasło</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="26"/> - <source>Dialog</source> - <translation>Dialog</translation> + <location filename="../forms/askpassphrasedialog.ui" line="94"/> + <source>TextLabel</source> + <translation>TekstEtykiety</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="34"/> @@ -201,9 +201,9 @@ www.transifex.net/projects/p/bitcoin/</translation> <translation>Odblokuj portfel</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="94"/> - <source>TextLabel</source> - <translation>TekstEtykiety</translation> + <location filename="../forms/askpassphrasedialog.ui" line="26"/> + <source>Dialog</source> + <translation>Dialog</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="46"/> @@ -304,241 +304,248 @@ Czy na pewno chcesz zaszyfrować swój portfel?</translation> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="244"/> - <source>About &Qt</source> - <translation>O &Qt</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="298"/> - <source>&Help</source> - <translation>Pomo&c</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> - <source>Synchronizing with network...</source> - <translation>Synchronizacja z siecią...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="186"/> <source>Show general overview of wallet</source> <translation>Pokazuje ogólny zarys portfela</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> + <location filename="../bitcoingui.cpp" line="191"/> <source>&Transactions</source> <translation>&Transakcje</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="192"/> <source>Browse transaction history</source> <translation>Przeglądaj historię transakcji</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> + <location filename="../bitcoingui.cpp" line="197"/> <source>&Address Book</source> <translation>Książka &adresowa</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation>Odbie&rz monety</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> - <source>Show information about Qt</source> - <translation>Pokazuje informacje o Qt</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>Otwórz &Bitcoin</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="257"/> - <source>&Backup Wallet</source> - <translation type="unfinished">&Backup portfel</translation> + <location filename="../bitcoingui.cpp" line="215"/> + <source>Sign &message</source> + <translation>Podpisz wiado&mość</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>Zmień h&asło</translation> + <location filename="../bitcoingui.cpp" line="243"/> + <source>Show information about Qt</source> + <translation>Pokazuje informacje o Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>Pobrano %1 z %2 bloków z historią transakcji.</translation> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation>Pokaż lub ukryj okno Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> - <source>Downloaded %1 blocks of transaction history.</source> - <translation>Pobrano %1 bloków z historią transakcji.</translation> - </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> - <source>%n active connection(s) to Bitcoin network</source> - <translation> - <numerusform>%n aktywne połączenie do sieci Bitcoin</numerusform> - <numerusform>%n aktywne połączenia do sieci Bitcoin</numerusform> - <numerusform>%n aktywnych połączeń do sieci Bitcoin</numerusform> - </translation> + <location filename="../bitcoingui.cpp" line="250"/> + <source>&Export...</source> + <translation>&Eksportuj...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> + <location filename="../bitcoingui.cpp" line="209"/> <source>&Send coins</source> <translation>Wy&syłka monet</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Synchronizacja bloku łańcucha w toku.</translation> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation>Pokaż/Ukryj &Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> - <source>&Options...</source> - <translation>&Opcje...</translation> + <location filename="../bitcoingui.cpp" line="798"/> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation>Portfel jest <b>zaszyfrowany</b> i obecnie <b>zablokowany</b></translation> </message> <message> <location filename="../bitcoingui.cpp" line="255"/> - <source>Encrypt or decrypt wallet</source> - <translation>Zaszyfruj lub odszyfruj portfel</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="615"/> - <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="646"/> - <source>Sent transaction</source> - <translation>Transakcja wysłana</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="647"/> - <source>Incoming transaction</source> - <translation>Transakcja przychodząca</translation> - </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> - <source>%n minute(s) ago</source> - <translation> - <numerusform>%n minutę temu</numerusform> - <numerusform>%n minuty temu</numerusform> - <numerusform>%n minut temu</numerusform> - </translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="781"/> - <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation>Portfel jest <b>zaszyfrowany</b> i obecnie <b>zablokowany</b></translation> + <source>&Backup Wallet</source> + <translation type="unfinished">&Backup portfel</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="187"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>&Overview</source> <translation>P&odsumowanie</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> + <location filename="../bitcoingui.cpp" line="198"/> <source>Edit the list of stored addresses and labels</source> <translation>Edytuj listę zapisanych adresów i i etykiet</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation>Pokaż listę adresów do otrzymywania płatności</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> - <source>Send coins to a bitcoin address</source> - <translation>Wyślij monety na adres bitcoin</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="217"/> - <source>Sign &message</source> - <translation>Podpisz wiado&mość</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="218"/> - <source>Prove you control an address</source> - <translation>Udowodnij, że kontrolujesz adres</translation> + <location filename="../bitcoingui.cpp" line="245"/> + <source>&Options...</source> + <translation>&Opcje...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> + <location filename="../bitcoingui.cpp" line="251"/> <source>Export the data in the current tab to a file</source> <translation>Eksportuj dane z aktywnej karty do pliku</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> + <location filename="../bitcoingui.cpp" line="256"/> <source>Backup wallet to another location</source> <translation>Zapasowy portfel w innej lokalizacji</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> + <location filename="../bitcoingui.cpp" line="258"/> <source>Change the passphrase used for wallet encryption</source> <translation>Zmień hasło użyte do szyfrowania portfela</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>&O %1</translation> + <location filename="../bitcoingui.cpp" line="632"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> - <source>Tabs toolbar</source> - <translation>Pasek zakładek</translation> + <location filename="../bitcoingui.cpp" line="663"/> + <source>Sent transaction</source> + <translation>Transakcja wysłana</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> + <location filename="../bitcoingui.cpp" line="236"/> <source>Quit application</source> <translation>Zamknij program</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> - <source>&File</source> - <translation>&Plik</translation> + <location filename="../bitcoingui.cpp" line="253"/> + <source>Encrypt or decrypt wallet</source> + <translation>Zaszyfruj lub odszyfruj portfel</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> + <location filename="../bitcoingui.cpp" line="240"/> <source>Show information about Bitcoin</source> <translation>Pokaż informację o Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation>Zmień h&asło</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="290"/> <source>&Settings</source> <translation>P&referencje</translation> </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="550"/> + <source>%n minute(s) ago</source> + <translation> + <numerusform>%n minutę temu</numerusform> + <numerusform>%n minuty temu</numerusform> + <numerusform>%n minut temu</numerusform> + </translation> + </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="790"/> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation>Portfel jest <b>zaszyfrowany</b> i obecnie <b>niezablokowany</b></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Backup Wallet</source> + <translation>Kopia Zapasowa Portfela</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation>Dane Portfela (*.dat)</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> - <source>Actions toolbar</source> - <translation>Pasek akcji</translation> + <location filename="../bitcoingui.cpp" line="824"/> + <source>Backup Failed</source> + <translation>Kopia Zapasowa Nie Została Wykonana</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="824"/> + <source>There was an error trying to save the wallet data to the new location.</source> + <translation>Wystąpił błąd podczas próby zapisu portfela do nowej lokalizacji.</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Send coins to a bitcoin address</source> + <translation>Wyślij monety na adres bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>&O %1</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="216"/> + <source>Prove you control an address</source> + <translation>Udowodnij, że kontrolujesz adres</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="558"/> + <source>%n day(s) ago</source> + <translation> + <numerusform>%n dzień temu</numerusform> + <numerusform>%n dni temu</numerusform> + <numerusform>%n dni temu</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="546"/> + <source>%n second(s) ago</source> + <translation> + <numerusform>%n sekundę temu</numerusform> + <numerusform>%n sekundy temu</numerusform> + <numerusform>%n sekund temu</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> + <location filename="../bitcoingui.cpp" line="418"/> <source>bitcoin-qt</source> <translation>bitcoin-qt</translation> </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation> + <numerusform>pozostał ~%n blok</numerusform> + <numerusform>pozostało ~%n bloki</numerusform> + <numerusform>pozostało ~%n bloków</numerusform> + </translation> + </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> - <translation>&Eksportuj...</translation> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>Zmienia opcje konfiguracji bitcoina</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> + <location filename="../bitcoingui.cpp" line="314"/> + <source>Actions toolbar</source> + <translation>Pasek akcji</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="531"/> + <source>Downloaded %1 blocks of transaction history.</source> + <translation>Pobrano %1 bloków z historią transakcji.</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="235"/> <source>E&xit</source> <translation>&Zakończ</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -551,45 +558,51 @@ Adres: %4 </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>Zmienia opcje konfiguracji bitcoina</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="254"/> + <location filename="../bitcoingui.cpp" line="252"/> <source>&Encrypt Wallet</source> <translation>Zaszyfruj portf&el</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="73"/> + <location filename="../bitcoingui.cpp" line="71"/> <source>Bitcoin Wallet</source> <translation>Portfel Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Pokaż okno Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="281"/> + <source>&File</source> + <translation>&Plik</translation> </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> - <source>%n day(s) ago</source> - <translation> - <numerusform>%n dzień temu</numerusform> - <numerusform>%n dni temu</numerusform> - <numerusform>%n dni temu</numerusform> - </translation> + <message> + <location filename="../bitcoingui.cpp" line="242"/> + <source>About &Qt</source> + <translation>O &Qt</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="296"/> + <source>&Help</source> + <translation>Pomo&c</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="303"/> + <source>Tabs toolbar</source> + <translation>Pasek zakładek</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation>Bitcoin klient</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> - <source>%n second(s) ago</source> + <location filename="../bitcoingui.cpp" line="482"/> + <source>%n active connection(s) to Bitcoin network</source> <translation> - <numerusform>%n sekundę temu</numerusform> - <numerusform>%n sekundy temu</numerusform> - <numerusform>%n sekund temu</numerusform> + <numerusform>%n aktywne połączenie do sieci Bitcoin</numerusform> + <numerusform>%n aktywne połączenia do sieci Bitcoin</numerusform> + <numerusform>%n aktywnych połączeń do sieci Bitcoin</numerusform> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation> <numerusform>%n godzinę temu</numerusform> @@ -598,47 +611,42 @@ Adres: %4 </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="506"/> + <source>Synchronizing with network...</source> + <translation>Synchronizacja z siecią...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>Pobrano %1 z %2 bloków historii transakcji(%3% ukończono).</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation>Aktualny</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>Łapanie bloków...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation>Ostatnio otrzymany blok została wygenerowany %1.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> - <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation>Portfel jest <b>zaszyfrowany</b> i obecnie <b>niezablokowany</b></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Backup Wallet</source> - <translation>Kopia Zapasowa Portfela</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="807"/> - <source>Backup Failed</source> - <translation>Kopia Zapasowa Nie Została Wykonana</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="807"/> - <source>There was an error trying to save the wallet data to the new location.</source> - <translation>Wystąpił błąd podczas próby zapisu portfela do nowej lokalizacji.</translation> + <location filename="../bitcoingui.cpp" line="664"/> + <source>Incoming transaction</source> + <translation>Transakcja przychodząca</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> + <location filename="../bitcoingui.cpp" line="636"/> <source>Sending...</source> <translation>Wysyłanie...</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Błąd krytyczny. Bitcoin nie może kontynuować bezpiecznie więc zostanie zamknięty.</translation> </message> @@ -646,22 +654,22 @@ Adres: %4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&Jednostka pokazywana przy kwocie:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>Wybierz podział jednostki pokazywany w interfejsie oraz podczas wysyłania monet</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&Wyświetlaj adresy w liście transakcji</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation>Pokazuj adresy Bitcoin na liście transakcji.</translation> </message> @@ -737,85 +745,95 @@ Adres: %4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>Uruchom Bitcoin wraz ze &startem systemu okien</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Automatyczne uruchamia Bitcoin po włączeniu komputera</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>&Minimalizuj do paska przy zegarku zamiast do paska zadań</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>Pokazuje tylko ikonę przy zegarku po zminimalizowaniu okna</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> + <location filename="../optionsdialog.cpp" line="185"/> <source>Map port using &UPnP</source> <translation>Mapuj port używając &UPnP</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="181"/> + <location filename="../optionsdialog.cpp" line="186"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Automatycznie otwiera port klienta Bitcoin na routerze. Ta opcja dzieła tylko jeśli twój router wspiera UPnP i jest ono włączone.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="180"/> <source>M&inimize on close</source> <translation>M&inimalizuj przy zamykaniu</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="186"/> + <location filename="../optionsdialog.cpp" line="181"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>Minimalizuje zamiast zakończyć działanie programu przy zamykaniu okna. Kiedy ta opcja jest włączona, program zakończy działanie po wybieraniu Zamknij w menu.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>Połącz przez proxy SO&CKS4:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Łączy się z siecią Bitcoin przez proxy SOCKS4 (np. kiedy łączysz się przez Tor)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>Proxy &IP: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>Adres IP serwera proxy (np. 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>&Port: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Port proxy (np. 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>Opcjonalna prowizja za transakcje za kB, wspomaga ona szybkość przebiegu transakcji. Większość transakcji jest 1 kB. Zalecana prowizja 0.01 .</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>Płać prowizję za t&ransakcje</translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation>Odłącz bazy danych przy zamknięciu</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation>Odłącz bazę bloków i adresów podczas zamknięcia aplikcji. Oznacza to, że baza może zostać przeniesiona do innego folderu, ale jednocześnie zwiększa czas potrzebny na zamknięcie programu. Portfel jest zawsze odłączany.</translation> + </message> </context> <context> <name>MessagePage</name> @@ -910,17 +928,17 @@ Adres: %4 <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>Główny</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>Wyświetlanie</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>Opcje</translation> </message> @@ -981,6 +999,36 @@ Adres: %4 <context> <name>QRCodeDialog</name> <message> + <location filename="../qrcodedialog.cpp" line="121"/> + <source>PNG Images (*.png)</source> + <translation>Obraz PNG (*.png)</translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="121"/> + <source>Save Image...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="55"/> + <source>Request Payment</source> + <translation>Prośba o płatność</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="70"/> + <source>Amount:</source> + <translation>Kwota:</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="105"/> + <source>BTC</source> + <translation>BTC</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="121"/> + <source>Label:</source> + <translation>Etykieta:</translation> + </message> + <message> <location filename="../forms/qrcodedialog.ui" line="144"/> <source>Message:</source> <translation>Wiadomość:</translation> @@ -991,19 +1039,14 @@ Adres: %4 <translation>Zapi&sz jako...</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation>Błąd kodowania URI w Kodzie QR.</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> - <source>Save Image...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qrcodedialog.cpp" line="113"/> - <source>PNG Images (*.png)</source> - <translation>Obraz PNG (*.png)</translation> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>Wynikowy URI jest zbyt długi, spróbuj zmniejszyć tekst etykiety / wiadomości</translation> </message> <message> <location filename="../forms/qrcodedialog.ui" line="14"/> @@ -1015,26 +1058,6 @@ Adres: %4 <source>QR Code</source> <translation>Kod QR</translation> </message> - <message> - <location filename="../forms/qrcodedialog.ui" line="55"/> - <source>Request Payment</source> - <translation>Prośba o płatność</translation> - </message> - <message> - <location filename="../forms/qrcodedialog.ui" line="121"/> - <source>Label:</source> - <translation>Etykieta:</translation> - </message> - <message> - <location filename="../forms/qrcodedialog.ui" line="70"/> - <source>Amount:</source> - <translation>Kwota:</translation> - </message> - <message> - <location filename="../forms/qrcodedialog.ui" line="105"/> - <source>BTC</source> - <translation>BTC</translation> - </message> </context> <context> <name>SendCoinsDialog</name> @@ -1056,6 +1079,11 @@ Adres: %4 <translation>Wyślij do wielu odbiorców na raz</translation> </message> <message> + <location filename="../forms/sendcoinsdialog.ui" line="67"/> + <source>&Add recipient...</source> + <translation>Dod&aj odbiorcę...</translation> + </message> + <message> <location filename="../forms/sendcoinsdialog.ui" line="84"/> <source>Remove all transaction fields</source> <translation>Wyczyść wszystkie pola transakcji</translation> @@ -1066,16 +1094,16 @@ Adres: %4 <translation>Wyczyść wszystko</translation> </message> <message> + <location filename="../forms/sendcoinsdialog.ui" line="144"/> + <source>Confirm the send action</source> + <translation>Potwierdź akcję wysyłania</translation> + </message> + <message> <location filename="../forms/sendcoinsdialog.ui" line="147"/> <source>S&end</source> <translation>Wy&syłka</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="67"/> - <source>&Add recipient...</source> - <translation>Dod&aj odbiorcę...</translation> - </message> - <message> <location filename="../forms/sendcoinsdialog.ui" line="106"/> <source>Balance:</source> <translation>Saldo:</translation> @@ -1086,11 +1114,6 @@ Adres: %4 <translation>123.456 BTC</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="144"/> - <source>Confirm the send action</source> - <translation>Potwierdź akcję wysyłania</translation> - </message> - <message> <location filename="../sendcoinsdialog.cpp" line="95"/> <source><b>%1</b> to %2 (%3)</source> <translation><b>%1</b> do %2 (%3)</translation> @@ -1102,13 +1125,13 @@ Adres: %4 </message> <message> <location filename="../sendcoinsdialog.cpp" line="101"/> - <source>Are you sure you want to send %1?</source> - <translation>Czy na pewno chcesz wysłać %1?</translation> + <source> and </source> + <translation> i </translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="101"/> - <source> and </source> - <translation> i </translation> + <source>Are you sure you want to send %1?</source> + <translation>Czy na pewno chcesz wysłać %1?</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="124"/> @@ -1149,6 +1172,11 @@ Adres: %4 <context> <name>SendCoinsEntry</name> <message> + <location filename="../sendcoinsentry.cpp" line="25"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Wprowadź adres Bitcoin (np. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> <location filename="../forms/sendcoinsentry.ui" line="42"/> <source>Pay &To:</source> <translation>Płać &Do:</translation> @@ -1204,149 +1232,144 @@ Adres: %4 <source>Remove this recipient</source> <translation>Usuń tego odbiorce</translation> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="25"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Wprowadź adres Bitcoin (np. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="20"/> + <location filename="../transactiondesc.cpp" line="22"/> <source>Open until %1</source> <translation>Otwórz do %1</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation>%1 potwierdzeń</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="28"/> + <location filename="../transactiondesc.cpp" line="30"/> <source>%1/unconfirmed</source> <translation>%1/niezatwierdzone</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="18"/> + <location filename="../transactiondesc.cpp" line="20"/> <source>Open for %1 blocks</source> <translation>Otwórz dla %1 bloków</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation>%1/offline?</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation><b>Status:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>, emitowany przez %1 węzeł</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>, emitowany przez %1 węzły</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation><b>Data:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>Źródło:</b> Wygenerowano<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation><b>Do:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation> (twoje, etykieta: </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation> (twoje)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation><b>Przypisy:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation>(niezaakceptowane)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation><b>Debet:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation><b>Prowizja transakcyjna:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>Kwota netto:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>Wiadomość:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>Komentarz:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation>ID transakcji:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation>Wygenerowane monety muszą zaczekać 120 bloków zanim będzie można je wydać. Kiedy wygenerowałeś ten blok, został on wyemitowany do sieci, aby dodać go do łańcucha bloków. Jeśli to się nie powiedzie nie zostanie on zaakceptowany i wygenerowanych monet nie będzie można wysyłać. Może się to czasami zdarzyć jeśli inny węzeł wygeneruje blok tuż przed tobą.</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> - <source>, has not been successfully broadcast yet</source> - <translation>, nie został jeszcze pomyślnie wyemitowany</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>Od:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="55"/> + <source>, has not been successfully broadcast yet</source> + <translation>, nie został jeszcze pomyślnie wyemitowany</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="92"/> <source>unknown</source> <translation>nieznany</translation> </message> @@ -1367,44 +1390,64 @@ Adres: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="286"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Niezatwierdzony (%1 z %2 potwierdzeń)</translation> + <location filename="../transactiontablemodel.cpp" line="283"/> + <source>Offline (%1 confirmations)</source> + <translation>Offline (%1 potwierdzeń)</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="306"/> - <source>Generated but not accepted</source> - <translation>Wygenerowano ale nie zaakceptowano</translation> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Type</source> + <translation>Typ</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="349"/> - <source>Received with</source> - <translation>Otrzymane przez</translation> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Amount</source> + <translation>Kwota</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="351"/> - <source>Received from</source> - <translation>Odebrano od</translation> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Address</source> + <translation>Adres</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="354"/> - <source>Sent to</source> - <translation>Wysłano do</translation> + <location filename="../transactiontablemodel.cpp" line="303"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Ten blok nie został odebrany przez jakikolwiek inny węzeł i prawdopodobnie nie zostanie zaakceptowany!</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="356"/> - <source>Payment to yourself</source> - <translation>Płatność do siebie</translation> + <location filename="../transactiontablemodel.cpp" line="358"/> + <source>Mined</source> + <translation>Wydobyto</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Date</source> - <translation>Data</translation> + <location filename="../transactiontablemodel.cpp" line="396"/> + <source>(n/a)</source> + <translation>(brak)</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Address</source> - <translation>Adres</translation> + <location filename="../transactiontablemodel.cpp" line="595"/> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Status transakcji. Najedź na pole, aby zobaczyć liczbę potwierdzeń.</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="597"/> + <source>Date and time that the transaction was received.</source> + <translation>Data i czas odebrania transakcji.</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="601"/> + <source>Destination address of transaction.</source> + <translation>Adres docelowy transakcji.</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="599"/> + <source>Type of transaction.</source> + <translation>Rodzaj transakcji.</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="356"/> + <source>Payment to yourself</source> + <translation>Płatność do siebie</translation> </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="277"/> @@ -1426,60 +1469,40 @@ Adres: %4 <translation>Zatwierdzony (%1 potwierdzeń)</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="283"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline (%1 potwierdzeń)</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Type</source> - <translation>Typ</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Amount</source> - <translation>Kwota</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="303"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Ten blok nie został odebrany przez jakikolwiek inny węzeł i prawdopodobnie nie zostanie zaakceptowany!</translation> + <source>Date</source> + <translation>Data</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="358"/> - <source>Mined</source> - <translation>Wydobyto</translation> + <location filename="../transactiontablemodel.cpp" line="286"/> + <source>Unconfirmed (%1 of %2 confirmations)</source> + <translation>Niezatwierdzony (%1 z %2 potwierdzeń)</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="396"/> - <source>(n/a)</source> - <translation>(brak)</translation> + <location filename="../transactiontablemodel.cpp" line="306"/> + <source>Generated but not accepted</source> + <translation>Wygenerowano ale nie zaakceptowano</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="595"/> - <source>Transaction status. Hover over this field to show number of confirmations.</source> - <translation>Status transakcji. Najedź na pole, aby zobaczyć liczbę potwierdzeń.</translation> + <location filename="../transactiontablemodel.cpp" line="349"/> + <source>Received with</source> + <translation>Otrzymane przez</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="597"/> - <source>Date and time that the transaction was received.</source> - <translation>Data i czas odebrania transakcji.</translation> + <location filename="../transactiontablemodel.cpp" line="351"/> + <source>Received from</source> + <translation>Odebrano od</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="601"/> - <source>Destination address of transaction.</source> - <translation>Adres docelowy transakcji.</translation> + <location filename="../transactiontablemodel.cpp" line="354"/> + <source>Sent to</source> + <translation>Wysłano do</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="603"/> <source>Amount removed from or added to balance.</source> <translation>Kwota usunięta z lub dodana do konta.</translation> </message> - <message> - <location filename="../transactiontablemodel.cpp" line="599"/> - <source>Type of transaction.</source> - <translation>Rodzaj transakcji.</translation> - </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="297"/> <source>Mined balance will be available in %n more blocks</source> @@ -1503,19 +1526,19 @@ Adres: %4 <translation>Potwierdzony</translation> </message> <message> - <location filename="../transactionview.cpp" line="280"/> - <source>Date</source> - <translation>Data</translation> + <location filename="../transactionview.cpp" line="77"/> + <source>Mined</source> + <translation>Wydobyto</translation> </message> <message> - <location filename="../transactionview.cpp" line="283"/> - <source>Address</source> - <translation>Adres</translation> + <location filename="../transactionview.cpp" line="271"/> + <source>Comma separated file (*.csv)</source> + <translation>CSV (rozdzielany przecinkami)</translation> </message> <message> - <location filename="../transactionview.cpp" line="284"/> - <source>Amount</source> - <translation>Kwota</translation> + <location filename="../transactionview.cpp" line="285"/> + <source>ID</source> + <translation>ID</translation> </message> <message> <location filename="../transactionview.cpp" line="289"/> @@ -1523,24 +1546,24 @@ Adres: %4 <translation>Błąd podczas eksportowania</translation> </message> <message> - <location filename="../transactionview.cpp" line="384"/> - <source>Range:</source> - <translation>Zakres:</translation> - </message> - <message> <location filename="../transactionview.cpp" line="392"/> <source>to</source> <translation>do</translation> </message> <message> - <location filename="../transactionview.cpp" line="281"/> - <source>Type</source> - <translation>Typ</translation> + <location filename="../transactionview.cpp" line="57"/> + <source>This week</source> + <translation>W tym tygodniu</translation> </message> <message> - <location filename="../transactionview.cpp" line="56"/> - <source>Today</source> - <translation>Dzisiaj</translation> + <location filename="../transactionview.cpp" line="59"/> + <source>Last month</source> + <translation>W zeszłym miesiącu</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="72"/> + <source>Received with</source> + <translation>Otrzymane przez</translation> </message> <message> <location filename="../transactionview.cpp" line="55"/> @@ -1549,9 +1572,9 @@ Adres: %4 <translation>Wszystko</translation> </message> <message> - <location filename="../transactionview.cpp" line="57"/> - <source>This week</source> - <translation>W tym tygodniu</translation> + <location filename="../transactionview.cpp" line="56"/> + <source>Today</source> + <translation>Dzisiaj</translation> </message> <message> <location filename="../transactionview.cpp" line="58"/> @@ -1559,11 +1582,6 @@ Adres: %4 <translation>W tym miesiącu</translation> </message> <message> - <location filename="../transactionview.cpp" line="59"/> - <source>Last month</source> - <translation>W zeszłym miesiącu</translation> - </message> - <message> <location filename="../transactionview.cpp" line="60"/> <source>This year</source> <translation>W tym roku</translation> @@ -1574,11 +1592,6 @@ Adres: %4 <translation>Zakres...</translation> </message> <message> - <location filename="../transactionview.cpp" line="72"/> - <source>Received with</source> - <translation>Otrzymane przez</translation> - </message> - <message> <location filename="../transactionview.cpp" line="74"/> <source>Sent to</source> <translation>Wysłano do</translation> @@ -1589,11 +1602,6 @@ Adres: %4 <translation>Do siebie</translation> </message> <message> - <location filename="../transactionview.cpp" line="77"/> - <source>Mined</source> - <translation>Wydobyto</translation> - </message> - <message> <location filename="../transactionview.cpp" line="78"/> <source>Other</source> <translation>Inne</translation> @@ -1634,30 +1642,45 @@ Adres: %4 <translation>Pokaż szczegóły...</translation> </message> <message> - <location filename="../transactionview.cpp" line="271"/> - <source>Comma separated file (*.csv)</source> - <translation>CSV (rozdzielany przecinkami)</translation> - </message> - <message> <location filename="../transactionview.cpp" line="282"/> <source>Label</source> <translation>Etykieta</translation> </message> <message> - <location filename="../transactionview.cpp" line="285"/> - <source>ID</source> - <translation>ID</translation> + <location filename="../transactionview.cpp" line="280"/> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="281"/> + <source>Type</source> + <translation>Typ</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="284"/> + <source>Amount</source> + <translation>Kwota</translation> </message> <message> <location filename="../transactionview.cpp" line="289"/> <source>Could not write to file %1.</source> <translation>Błąd zapisu do pliku %1.</translation> </message> + <message> + <location filename="../transactionview.cpp" line="283"/> + <source>Address</source> + <translation>Adres</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="384"/> + <source>Range:</source> + <translation>Zakres:</translation> + </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>Wysyłanie...</translation> </message> @@ -1665,402 +1688,488 @@ Adres: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Usage:</source> - <translation>Użycie:</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="43"/> - <source>Run in the background as a daemon and accept commands</source> - <translation>Uruchom w tle jako daemon i przyjmuj polecenia</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="44"/> - <source>Use the test network</source> - <translation>Użyj sieci testowej</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="49"/> - <source>Username for JSON-RPC connections</source> - <translation>Nazwa użytkownika dla połączeń JSON-RPC</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="51"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation>Nasłuchuj połączeń JSON-RPC na <port> (domyślnie: 8332)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>Wysyłaj polecenia do węzła działającego na <ip> (domyślnie: 127.0.0.1)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="48"/> + <location filename="../bitcoinstrings.cpp" line="84"/> <source>Send trace/debug info to debugger</source> <translation>Wyślij informację/raport do debuggera.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> + <location filename="../bitcoinstrings.cpp" line="126"/> <source>Done loading</source> <translation>Wczytywanie zakończone</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> + <location filename="../bitcoinstrings.cpp" line="53"/> <source>Specify data directory</source> <translation>Wskaż folder danych</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> + <location filename="../bitcoinstrings.cpp" line="56"/> <source>Specify connection timeout (in milliseconds)</source> <translation>Wskaż czas oczekiwania bezczynności połączenia (w milisekundach)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> - <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>Użyj OpenSSL (https) do połączeń JSON-RPC</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="66"/> - <source>Server certificate file (default: server.cert)</source> - <translation>Plik certyfikatu serwera (domyślnie: server.cert)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="67"/> + <location filename="../bitcoinstrings.cpp" line="103"/> <source>Server private key (default: server.pem)</source> <translation>Klucz prywatny serwera (domyślnie: server.pem)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Upgrade wallet to latest format</source> + <translation>Zaktualizuj portfel do najnowszego formatu.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="107"/> <source>This help message</source> <translation>Ta wiadomość pomocy</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> - <source>Loading addresses...</source> - <translation>Wczytywanie adresów...</translation> + <location filename="../bitcoinstrings.cpp" line="88"/> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation>Przyjmuj połączenia JSON-RPC ze wskazanego adresu IP</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="78"/> - <source>Error loading blkindex.dat</source> - <translation>Błąd ładownia blkindex.dat</translation> + <source>Accept command line and JSON-RPC commands</source> + <translation>Akceptuj linię poleceń oraz polecenia JSON-RPC</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> - <source>Loading wallet...</source> - <translation>Wczytywanie portfela...</translation> + <location filename="../bitcoinstrings.cpp" line="41"/> + <source>Bitcoin version</source> + <translation>Wersja Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> - <source>Upgrade wallet to latest format</source> - <translation>Zaktualizuj portfel do najnowszego formatu.</translation> + <location filename="../bitcoinstrings.cpp" line="43"/> + <source>Send command to -server or bitcoind</source> + <translation>Wyślij polecenie do -server lub bitcoind</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> + <location filename="../bitcoinstrings.cpp" line="44"/> + <source>List commands</source> + <translation>Lista poleceń</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="47"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation>Wskaż plik konfiguracyjny (domyślnie: bitcoin.conf)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="115"/> <source>Loading block index...</source> <translation>Ładowanie indeksu bloku...</translation> </message> <message> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>Error loading wallet.dat</source> + <translation>Błąd ładowania wallet.dat</translation> + </message> + <message> <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Options:</source> - <translation>Opcje:</translation> + <source>Sending...</source> + <translation>Wysyłanie...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>Niewystarczające środki</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="49"/> + <source>Generate coins</source> + <translation>Generuj monety</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="50"/> + <source>Don't generate coins</source> + <translation>Nie generuj monet</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Ustaw rozmiar w megabajtach cache-u bazy danych (domyślnie: 25)</translation> + <source>To use the %s option</source> + <translation>Aby użyć opcji %s</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> - <source>Rescanning...</source> - <translation>Ponowne skanowanie...</translation> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation>Błąd</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Find peers using internet relay chat (default: 0)</source> - <translation>Znajdź peery używające IRC (domyślnie: 0)</translation> + <location filename="../bitcoinstrings.cpp" line="113"/> + <source>Loading addresses...</source> + <translation>Wczytywanie adresów...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> + <location filename="../bitcoinstrings.cpp" line="83"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Wyślij informację/raport do konsoli zamiast do pliku debug.log.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> + <location filename="../bitcoinstrings.cpp" line="120"/> + <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> + <translation>Portfel wymaga przepisania: zrestartuj Bitcoina żeby ukończyć</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="63"/> + <source>Find peers using internet relay chat (default: 0)</source> + <translation>Znajdź peery używające IRC (domyślnie: 0)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> <source>Fee per KB to add to transactions you send</source> <translation> </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="42"/> + <source>Usage:</source> + <translation>Użycie:</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="79"/> + <source>Run in the background as a daemon and accept commands</source> + <translation>Uruchom w tle jako daemon i przyjmuj polecenia</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="80"/> + <source>Use the test network</source> + <translation>Użyj sieci testowej</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>Username for JSON-RPC connections</source> + <translation>Nazwa użytkownika dla połączeń JSON-RPC</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>Nasłuchuj połączeń JSON-RPC na <port> (domyślnie: 8332)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="101"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>Użyj OpenSSL (https) do połączeń JSON-RPC</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="102"/> + <source>Server certificate file (default: server.cert)</source> + <translation>Plik certyfikatu serwera (domyślnie: server.cert)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Error loading blkindex.dat</source> + <translation>Błąd ładownia blkindex.dat</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Loading wallet...</source> + <translation>Wczytywanie portfela...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="46"/> + <source>Options:</source> + <translation>Opcje:</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source>Rescanning...</source> + <translation>Ponowne skanowanie...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="96"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation>Ile bloków sprawdzać przy uruchomieniu (domyślnie: 2500, 0 = wszystkie)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> + <location filename="../bitcoinstrings.cpp" line="119"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> <translation>Błąd ładowania wallet.dat: Portfel wymaga nowszej wersji Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation>Nie można dezaktualizować portfela</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> + <location filename="../bitcoinstrings.cpp" line="86"/> <source>Password for JSON-RPC connections</source> <translation>Hasło do połączeń JSON-RPC</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> + <location filename="../bitcoinstrings.cpp" line="94"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Ustaw rozmiar puli kluczy na <n> (domyślnie: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> + <location filename="../bitcoinstrings.cpp" line="95"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>Przeskanuj blok łańcuchów żeby znaleźć zaginione transakcje portfela</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> - <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation>Portfel wymaga przepisania: zrestartuj Bitcoina żeby ukończyć</translation> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>Nie można zablokować folderu danych %s. Bitcoin prawdopodobnie już działa.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="51"/> + <source>Start minimized</source> + <translation>Uruchom zminimalizowany</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Get help for a command</source> - <translation>Uzyskaj pomoc do polecenia</translation> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">Błąd: Tworzenie transakcji nie powiodło się.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>Wskaż plik pid (domyślnie: bitcoin.pid)</translation> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">Błąd: transakcja została odrzucona. Może się to zdarzyć, gdy monety z Twojego portfela zostały już wydane, na przykład gdy używałeś kopii wallet.dat i bitcoiny które tam wydałeś nie zostały jeszcze odjęte z portfela z którego teraz korzystasz.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Generate coins</source> - <translation>Generuj monety</translation> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Don't generate coins</source> - <translation>Nie generuj monet</translation> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation>Wystąpił błąd podczas ustawiania portu RPC %u w tryb nasłuchu: %s</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Start minimized</source> - <translation>Uruchom zminimalizowany</translation> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation>Musisz ustawić rpcpassword=<hasło> w pliku configuracyjnym: +%s +Jeżeli plik nie istnieje, utwórz go z uprawnieniami właściciela-tylko-do-odczytu.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> + <location filename="../bitcoinstrings.cpp" line="52"/> <source>Show splash screen on startup (default: 1)</source> <translation>Pokazuj okno powitalne przy starcie (domyślnie: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> + <location filename="../bitcoinstrings.cpp" line="58"/> <source>Allow DNS lookups for addnode and connect</source> <translation>Zezwól -addnode i -connect na łączenie się z serwerem DNS</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> + <location filename="../bitcoinstrings.cpp" line="59"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Nasłuchuj połączeń na <port> (domyślnie: 8333 lub testnet: 18333)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Maintain at most <n> connections to peers (default: 125)</source> - <translation>Utrzymuj maksymalnie <n> połączeń z peerami (domyślnie: 125)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="28"/> + <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation>Łącz tylko do wskazanego węzła</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> + <location filename="../bitcoinstrings.cpp" line="66"/> <source>Find peers using DNS lookup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> + <location filename="../bitcoinstrings.cpp" line="67"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Próg po którym nastąpi rozłączenie nietrzymających się zasad peerów (domyślnie: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> + <location filename="../bitcoinstrings.cpp" line="68"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Czas w sekundach, przez jaki nietrzymający się zasad peerzy nie będą mogli ponownie się podłączyć (domyślnie: 86400)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation>Maksymalny bufor odbioru na połączenie, <n>*1000 bajtów (domyślnie: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation>Odłącz bazę bloków i adresów. Zwiększa czas wyłączenia (domyślnie: 0)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="81"/> <source>Output extra debugging information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> + <location filename="../bitcoinstrings.cpp" line="82"/> <source>Prepend debug output with timestamp</source> <translation>Poprzedź informacje debugowania znacznikiem czasowym</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> + <location filename="../bitcoinstrings.cpp" line="90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Wykonaj polecenie kiedy najlepszy blok ulegnie zmianie (%s w komendzie zastanie zastąpione przez hash bloku)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> + <location filename="../bitcoinstrings.cpp" line="97"/> <source>How thorough the block verification is (0-6, default: 1)</source> <translation>Głębokość weryfikacji bloku (0-6, domyślnie: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation> opcje SSL: (sprawdź Bitcoin Wiki dla instrukcje konfiguracji SSL)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>Aceptowalne szyfry (domyślnie: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="76"/> + <location filename="../bitcoinstrings.cpp" line="114"/> <source>Error loading addr.dat</source> <translation>Błąd ładowania addr.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> + <location filename="../bitcoinstrings.cpp" line="123"/> <source>Cannot initialize keypool</source> <translation>Inicjalizacja puli kluczy nieudana</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> + <location filename="../bitcoinstrings.cpp" line="124"/> <source>Cannot write default address</source> <translation>Nie można zapisać domyślnego adresu</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation>Nieprawidłowy adres -proxy</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> + <location filename="../bitcoinstrings.cpp" line="128"/> <source>Invalid amount for -paytxfee=<amount></source> <translation>Nieprawidłowa kwota dla -paytxfee=<amount></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> + <location filename="../bitcoinstrings.cpp" line="129"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation>Ostrzeżenie: -paytxfee jest bardzo duży. To jest prowizja za transakcje, którą płacisz, gdy wysyłasz monety.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation>Błąd: CreateThread(StartNode) nie powiodło się</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> + <location filename="../bitcoinstrings.cpp" line="133"/> <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> <translation>Nie można przywiązać portu %d na tym komputerze. Bitcoin prawdopodobnie już działa.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> + <location filename="../bitcoinstrings.cpp" line="38"/> <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> <translation>Ostrzeżenie: Proszę sprawdzić poprawność czasu i daty na tym komputerze. Jeśli czas jest zły Bitcoin może nie działać prawidłowo.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> + <location filename="../bitcoinstrings.cpp" line="61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Dodaj węzeł do łączenia się and attempt to keep the connection open</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation>Akceptuj połączenia z zewnątrz (domyślnie: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> + <location filename="../bitcoinstrings.cpp" line="65"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation>Ustaw Język, na przykład "pl_PL" (domyślnie: systemowy)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished">Używaj UPnP do mapowania portu nasłuchu (domyślnie: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished">Używaj UPnP do mapowania portu nasłuchu (domyślnie: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> + <location filename="../bitcoinstrings.cpp" line="20"/> <source>Warning: Disk space is low</source> <translation>Uwaga: Mało miejsca na dysku</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Allow JSON-RPC connections from specified IP address</source> - <translation>Przyjmuj połączenia JSON-RPC ze wskazanego adresu IP</translation> + <location filename="../bitcoinstrings.cpp" line="57"/> + <source>Connect through socks4 proxy</source> + <translation>Łączy przez proxy socks4</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> - <source>Accept command line and JSON-RPC commands</source> - <translation>Akceptuj linię poleceń oraz polecenia JSON-RPC</translation> + <location filename="../bitcoinstrings.cpp" line="72"/> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> + <translation>Maksymalny bufor wysyłu na połączenie, <n>*1000 bajtów (domyślnie: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Bitcoin version</source> - <translation>Wersja Bitcoin</translation> + <location filename="../bitcoinstrings.cpp" line="118"/> + <source>Error loading wallet.dat: Wallet corrupted</source> + <translation>Błąd ładowania wallet.dat: Uszkodzony portfel</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Send command to -server or bitcoind</source> - <translation>Wyślij polecenie do -server lub bitcoind</translation> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>Nieprawidłowa kwota</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> - <source>List commands</source> - <translation>Lista poleceń</translation> + <location filename="../bitcoinstrings.cpp" line="45"/> + <source>Get help for a command</source> + <translation>Uzyskaj pomoc do polecenia</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify configuration file (default: bitcoin.conf)</source> - <translation>Wskaż plik konfiguracyjny (domyślnie: bitcoin.conf)</translation> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>Aceptowalne szyfry (domyślnie: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Connect through socks4 proxy</source> - <translation>Łączy przez proxy socks4</translation> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>Wskaż plik pid (domyślnie: bitcoin.pid)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> - <translation>Maksymalny bufor wysyłu na połączenie, <n>*1000 bajtów (domyślnie: 10000)</translation> + <location filename="../bitcoinstrings.cpp" line="54"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation>Ustaw rozmiar w megabajtach cache-u bazy danych (domyślnie: 25)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> - <source>Error loading wallet.dat: Wallet corrupted</source> - <translation>Błąd ładowania wallet.dat: Uszkodzony portfel</translation> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation>Ustaw rozmiar w megabajtach logu dyskowego bazy danych (domyślnie: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>beta</translation> + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>Wysyłaj polecenia do węzła działającego na <ip> (domyślnie: 127.0.0.1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> - <source>Error loading wallet.dat</source> - <translation>Błąd ładowania wallet.dat</translation> + <location filename="../bitcoinstrings.cpp" line="60"/> + <source>Maintain at most <n> connections to peers (default: 125)</source> + <translation>Utrzymuj maksymalnie <n> połączeń z peerami (domyślnie: 125)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation type="unfinished">Użycie</translation> </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts index 441d1aaef2..5fcf17d0c3 100644 --- a/src/qt/locale/bitcoin_pt_BR.ts +++ b/src/qt/locale/bitcoin_pt_BR.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> versão</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -49,9 +49,9 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Criar um novo endereço</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> - <source>Comma separated file (*.csv)</source> - <translation>Arquivo separado por vírgulas (*. csv)</translation> + <location filename="../addressbookpage.cpp" line="299"/> + <source>Error exporting</source> + <translation>Erro ao exportar</translation> </message> <message> <location filename="../forms/addressbookpage.ui" line="60"/> @@ -69,16 +69,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Copie para a área de transferência do sistema</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="96"/> - <source>Sign a message to prove you own this address</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../forms/addressbookpage.ui" line="85"/> <source>Show &QR Code</source> <translation>Mostrar &QR Code</translation> </message> <message> + <location filename="../forms/addressbookpage.ui" line="96"/> + <source>Sign a message to prove you own this address</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../forms/addressbookpage.ui" line="99"/> <source>Sign &Message</source> <translation>&Assinar Mensagem</translation> @@ -94,52 +94,52 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Excluir</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> - <source>Copy address</source> - <translation>Copy address</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="62"/> - <source>Copy label</source> - <translation>Copy label</translation> + <location filename="../addressbookpage.cpp" line="299"/> + <source>Could not write to file %1.</source> + <translation>Could not write to file %1.</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> - <source>Delete</source> - <translation>Excluir</translation> + <location filename="../addressbookpage.cpp" line="286"/> + <source>Comma separated file (*.csv)</source> + <translation>Arquivo separado por vírgulas (*. csv)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> - <source>Error exporting</source> - <translation>Erro ao exportar</translation> + <location filename="../addressbookpage.cpp" line="285"/> + <source>Export Address Book Data</source> + <translation>Exportação de dados do Catálogo de Endereços</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> - <source>Could not write to file %1.</source> - <translation>Could not write to file %1.</translation> + <location filename="../addressbookpage.cpp" line="65"/> + <source>Copy address</source> + <translation>Copy address</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> - <source>Export Address Book Data</source> - <translation>Exportação de dados do Catálogo de Endereços</translation> + <location filename="../addressbookpage.cpp" line="66"/> + <source>Copy label</source> + <translation>Copy label</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation type="unfinished">Editar</translation> </message> + <message> + <location filename="../addressbookpage.cpp" line="68"/> + <source>Delete</source> + <translation>Excluir</translation> + </message> </context> <context> <name>AddressTableModel</name> <message> <location filename="../addresstablemodel.cpp" line="78"/> - <source>Label</source> - <translation>Rótulo</translation> + <source>Address</source> + <translation>Endereço</translation> </message> <message> <location filename="../addresstablemodel.cpp" line="78"/> - <source>Address</source> - <translation>Endereço</translation> + <source>Label</source> + <translation>Rótulo</translation> </message> <message> <location filename="../addresstablemodel.cpp" line="114"/> @@ -150,29 +150,29 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>AskPassphraseDialog</name> <message> - <location filename="../askpassphrasedialog.cpp" line="127"/> - <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>A criptografia da carteira falhou devido a um erro interno. Sua carteira não estava criptografada.</translation> - </message> - <message> <location filename="../forms/askpassphrasedialog.ui" line="47"/> <source>Enter passphrase</source> <translation>Digite a frase de segurança</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="156"/> - <source>Wallet decryption failed</source> - <translation>A descriptografia da carteira falhou</translation> + <location filename="../forms/askpassphrasedialog.ui" line="94"/> + <source>TextLabel</source> + <translation>TextoDoRótulo</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="75"/> - <source>Repeat new passphrase</source> - <translation>Repita a nova frase de segurança</translation> + <location filename="../askpassphrasedialog.cpp" line="38"/> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Esta operação precisa de sua frase de segurança para desbloquear a carteira.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="46"/> - <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>Esta operação precisa de sua frase de segurança para descriptografar a carteira.</translation> + <location filename="../askpassphrasedialog.cpp" line="34"/> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>Digite a nova frase de seguraça da sua carteira. <br/> Por favor, use uma frase de <b>10 ou mais caracteres aleatórios,</b> ou <b>oito ou mais palavras.</b></translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="55"/> + <source>Enter the old and new passphrase to the wallet.</source> + <translation>Digite a frase de segurança antiga e nova para a carteira.</translation> </message> <message> <location filename="../forms/askpassphrasedialog.ui" line="26"/> @@ -180,46 +180,60 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Diálogo</translation> </message> <message> + <location filename="../askpassphrasedialog.cpp" line="113"/> + <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>O Bitcoin irá fechar agora para finalizar o processo de encriptação. Lembre-se de que encriptar sua carteira não protege totalmente suas bitcoins de serem roubadas por malwares que tenham infectado o seu computador.</translation> + </message> + <message> <location filename="../forms/askpassphrasedialog.ui" line="61"/> <source>New passphrase</source> <translation>Nova frase de segurança</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="94"/> - <source>TextLabel</source> - <translation>TextoDoRótulo</translation> + <location filename="../askpassphrasedialog.cpp" line="43"/> + <source>Unlock wallet</source> + <translation>Desbloquear carteira</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="102"/> - <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! -Are you sure you wish to encrypt your wallet?</source> - <translation>AVISO: Se você criptografar sua carteira e perder sua senha, você vai <b>perder todos os seus BITCOINS!</b> Tem certeza de que deseja criptografar sua carteira?</translation> + <location filename="../askpassphrasedialog.cpp" line="126"/> + <location filename="../askpassphrasedialog.cpp" line="133"/> + <location filename="../askpassphrasedialog.cpp" line="175"/> + <location filename="../askpassphrasedialog.cpp" line="181"/> + <source>Wallet encryption failed</source> + <translation>A criptografia da carteira falhou</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="111"/> - <location filename="../askpassphrasedialog.cpp" line="169"/> - <source>Wallet encrypted</source> - <translation>Carteira criptografada</translation> + <location filename="../askpassphrasedialog.cpp" line="127"/> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>A criptografia da carteira falhou devido a um erro interno. Sua carteira não estava criptografada.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="170"/> - <source>Wallet passphrase was successfully changed.</source> - <translation>A frase de segurança da carteira foi alterada com êxito.</translation> + <location filename="../forms/askpassphrasedialog.ui" line="75"/> + <source>Repeat new passphrase</source> + <translation>Repita a nova frase de segurança</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="35"/> - <source>Encrypt wallet</source> - <translation>Criptografar carteira</translation> + <location filename="../askpassphrasedialog.cpp" line="146"/> + <location filename="../askpassphrasedialog.cpp" line="157"/> + <location filename="../askpassphrasedialog.cpp" line="176"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>A frase de segurança digitada para a descriptografia da carteira estava incorreta.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="38"/> - <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>Esta operação precisa de sua frase de segurança para desbloquear a carteira.</translation> + <location filename="../askpassphrasedialog.cpp" line="111"/> + <location filename="../askpassphrasedialog.cpp" line="169"/> + <source>Wallet encrypted</source> + <translation>Carteira criptografada</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="113"/> - <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> - <translation>O Bitcoin irá fechar agora para finalizar o processo de encriptação. Lembre-se de que encriptar sua carteira não protege totalmente suas bitcoins de serem roubadas por malwares que tenham infectado o seu computador.</translation> + <location filename="../askpassphrasedialog.cpp" line="156"/> + <source>Wallet decryption failed</source> + <translation>A descriptografia da carteira falhou</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="145"/> + <source>Wallet unlock failed</source> + <translation>A abertura da carteira falhou</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="51"/> @@ -227,19 +241,9 @@ Are you sure you wish to encrypt your wallet?</source> <translation>Descriptografar carteira</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="34"/> - <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>Digite a nova frase de seguraça da sua carteira. <br/> Por favor, use uma frase de <b>10 ou mais caracteres aleatórios,</b> ou <b>oito ou mais palavras.</b></translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="43"/> - <source>Unlock wallet</source> - <translation>Desbloquear carteira</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="55"/> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Digite a frase de segurança antiga e nova para a carteira.</translation> + <location filename="../askpassphrasedialog.cpp" line="54"/> + <source>Change passphrase</source> + <translation>Alterar frase de segurança</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="101"/> @@ -252,16 +256,15 @@ Are you sure you wish to encrypt your wallet?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="145"/> - <source>Wallet unlock failed</source> - <translation>A abertura da carteira falhou</translation> + <location filename="../askpassphrasedialog.cpp" line="134"/> + <location filename="../askpassphrasedialog.cpp" line="182"/> + <source>The supplied passphrases do not match.</source> + <translation>A frase de segurança fornecida não confere.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="146"/> - <location filename="../askpassphrasedialog.cpp" line="157"/> - <location filename="../askpassphrasedialog.cpp" line="176"/> - <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation>A frase de segurança digitada para a descriptografia da carteira estava incorreta.</translation> + <location filename="../askpassphrasedialog.cpp" line="170"/> + <source>Wallet passphrase was successfully changed.</source> + <translation>A frase de segurança da carteira foi alterada com êxito.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="217"/> @@ -270,39 +273,51 @@ Are you sure you wish to encrypt your wallet?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="54"/> - <source>Change passphrase</source> - <translation>Alterar frase de segurança</translation> + <location filename="../askpassphrasedialog.cpp" line="35"/> + <source>Encrypt wallet</source> + <translation>Criptografar carteira</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="126"/> - <location filename="../askpassphrasedialog.cpp" line="133"/> - <location filename="../askpassphrasedialog.cpp" line="175"/> - <location filename="../askpassphrasedialog.cpp" line="181"/> - <source>Wallet encryption failed</source> - <translation>A criptografia da carteira falhou</translation> + <location filename="../askpassphrasedialog.cpp" line="46"/> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Esta operação precisa de sua frase de segurança para descriptografar a carteira.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="134"/> - <location filename="../askpassphrasedialog.cpp" line="182"/> - <source>The supplied passphrases do not match.</source> - <translation>A frase de segurança fornecida não confere.</translation> + <location filename="../askpassphrasedialog.cpp" line="102"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! +Are you sure you wish to encrypt your wallet?</source> + <translation>AVISO: Se você criptografar sua carteira e perder sua senha, você vai <b>perder todos os seus BITCOINS!</b> Tem certeza de que deseja criptografar sua carteira?</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="255"/> - <source>Encrypt or decrypt wallet</source> - <translation>Criptografar ou decriptogravar carteira</translation> + <location filename="../bitcoingui.cpp" line="198"/> + <source>Edit the list of stored addresses and labels</source> + <translation>Editar a lista de endereços e rótulos</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> - <source>Show information about Qt</source> - <translation>Mostrar informações sobre o Qt</translation> + <location filename="../bitcoingui.cpp" line="197"/> + <source>&Address Book</source> + <translation>&Catálogo de endereços</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="242"/> + <source>About &Qt</source> + <translation>Sobre &Qt</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="281"/> + <source>&File</source> + <translation>&Arquivo</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="235"/> + <source>E&xit</source> + <translation>E&xit</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> + <location filename="../bitcoingui.cpp" line="482"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n conexão ativa na rede Bitcoin</numerusform> @@ -310,76 +325,83 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> - <source>&Receive coins</source> - <translation>&Receber moedas</translation> + <location filename="../bitcoingui.cpp" line="303"/> + <source>Tabs toolbar</source> + <translation>Barra de ferramentas</translation> </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> - <source>%n second(s) ago</source> - <translation> - <numerusform>%n segundo atrás</numerusform> - <numerusform>%n segundos atrás</numerusform> - </translation> + <message> + <location filename="../bitcoingui.cpp" line="250"/> + <source>&Export...</source> + <translation>&Exportar...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> - <source>Synchronizing with network...</source> - <translation>Sincronizando com a rede...</translation> + <location filename="../bitcoingui.cpp" line="253"/> + <source>Encrypt or decrypt wallet</source> + <translation>Criptografar ou decriptogravar carteira</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation>Mostrar a lista de endereços para receber pagamentos</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> + <location filename="../bitcoingui.cpp" line="236"/> + <source>Quit application</source> + <translation>Sair da aplicação</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="246"/> <source>Modify configuration options for bitcoin</source> <translation>Modificar opções de configuração para bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> - <source>E&xit</source> - <translation>E&xit</translation> + <location filename="../bitcoingui.cpp" line="243"/> + <source>Show information about Qt</source> + <translation>Mostrar informações sobre o Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> - <translation>&Exportar...</translation> + <location filename="../bitcoingui.cpp" line="209"/> + <source>&Send coins</source> + <translation>&Enviar moedas</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="558"/> + <source>%n day(s) ago</source> + <translation> + <numerusform>%n dia atrás</numerusform> + <numerusform>%n dias atrás</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="73"/> - <source>Bitcoin Wallet</source> - <translation>Carteira Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="185"/> + <source>&Overview</source> + <translation>&Visão geral</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="186"/> <source>Show general overview of wallet</source> <translation>Mostrar visão geral da carteira</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Mostrar a janela Bitcoin</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="238"/> - <source>Quit application</source> - <translation>Sair da aplicação</translation> + <location filename="../bitcoingui.cpp" line="203"/> + <source>&Receive coins</source> + <translation>&Receber moedas</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>Abrir &Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="531"/> + <source>Downloaded %1 blocks of transaction history.</source> + <translation>Carregados %1 blocos do histórico de transações.</translation> </message> - <message> - <location filename="../bitcoingui.cpp" line="211"/> - <source>&Send coins</source> - <translation>&Enviar moedas</translation> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="546"/> + <source>%n second(s) ago</source> + <translation> + <numerusform>%n segundo atrás</numerusform> + <numerusform>%n segundos atrás</numerusform> + </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation> <numerusform>%n minutos atrás</numerusform> @@ -387,185 +409,183 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> - <source>&Settings</source> - <translation>E configurações</translation> + <location filename="../bitcoingui.cpp" line="258"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>Mudar a frase de segurança utilizada na criptografia da carteira</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="314"/> + <source>Actions toolbar</source> + <translation>Barra de ações</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> - <source>Change the passphrase used for wallet encryption</source> - <translation>Mudar a frase de segurança utilizada na criptografia da carteira</translation> + <location filename="../bitcoingui.cpp" line="191"/> + <source>&Transactions</source> + <translation>&Transações</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> - <source>&File</source> - <translation>&Arquivo</translation> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation>Exibir ou ocultar a janela Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> - <source>About &Qt</source> - <translation>Sobre &Qt</translation> + <location filename="../bitcoingui.cpp" line="240"/> + <source>Show information about Bitcoin</source> + <translation>Mostrar informação sobre Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>&About %1</translation> + <location filename="../bitcoingui.cpp" line="296"/> + <source>&Help</source> + <translation>&Ajuda</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> - <source>Show information about Bitcoin</source> - <translation>Mostrar informação sobre Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="251"/> + <source>Export the data in the current tab to a file</source> + <translation>Exportar os dados na aba atual para um arquivo</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> + <location filename="../bitcoingui.cpp" line="245"/> <source>&Options...</source> <translation>&Opções...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> - <source>Backup wallet to another location</source> - <translation>Fazer cópia de segurança da carteira para uma outra localização</translation> + <location filename="../bitcoingui.cpp" line="192"/> + <source>Browse transaction history</source> + <translation>Navegar pelo histórico de transações</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> - <source>&Address Book</source> - <translation>&Catálogo de endereços</translation> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation>Cliente Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> - <source>Edit the list of stored addresses and labels</source> - <translation>Editar a lista de endereços e rótulos</translation> + <location filename="../bitcoingui.cpp" line="506"/> + <source>Synchronizing with network...</source> + <translation>Sincronizando com a rede...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> + <location filename="../bitcoingui.cpp" line="210"/> <source>Send coins to a bitcoin address</source> <translation>Enviar moedas para um endereço bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> - <source>Sign &message</source> - <translation>&Assinar Mensagem</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="316"/> - <source>Actions toolbar</source> - <translation>Barra de ações</translation> - </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> - <source>%n day(s) ago</source> - <translation> - <numerusform>%n dia atrás</numerusform> - <numerusform>%n dias atrás</numerusform> - </translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="501"/> - <source>Downloaded %1 blocks of transaction history.</source> - <translation>Carregados %1 blocos do histórico de transações.</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Sincronização da corrente de blocos em andamento</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="187"/> - <source>&Overview</source> - <translation>&Visão geral</translation> + <location filename="../bitcoingui.cpp" line="71"/> + <source>Bitcoin Wallet</source> + <translation>Carteira Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> - <source>&Transactions</source> - <translation>&Transações</translation> + <location filename="../bitcoingui.cpp" line="215"/> + <source>Sign &message</source> + <translation>&Assinar Mensagem</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> + <location filename="../bitcoingui.cpp" line="216"/> <source>Prove you control an address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> - <source>Export the data in the current tab to a file</source> - <translation>Exportar os dados na aba atual para um arquivo</translation> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>&About %1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation>Exibir/Ocultar &Bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="252"/> <source>&Encrypt Wallet</source> <translation>&Criptografar Carteira</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> + <location filename="../bitcoingui.cpp" line="255"/> <source>&Backup Wallet</source> <translation type="unfinished">&Backup Carteira</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>&Mudar frase de segurança</translation> + <location filename="../bitcoingui.cpp" line="256"/> + <source>Backup wallet to another location</source> + <translation>Fazer cópia de segurança da carteira para uma outra localização</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> + <location filename="../bitcoingui.cpp" line="418"/> <source>bitcoin-qt</source> <translation>bitcoin-qt</translation> </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>Carregados %1 de %2 blocos do histórico de transações (%3% done).</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="554"/> + <source>%n hour(s) ago</source> + <translation> + <numerusform>%n hora atrás</numerusform> + <numerusform>%n horas atrás</numerusform> + </translation> + </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> + <location filename="../bitcoingui.cpp" line="632"/> <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Backup Wallet</source> <translation>Fazer cópia de segurança da Carteira</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation>Dados da Carteira (*.dat)</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation>Cópia de segurança Falhou</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation>Houve um erro ao tentar salvar os dados da carteira para uma nova localização.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> - <source>Last received block was generated %1.</source> - <translation>Last received block was generated %1.</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="298"/> - <source>&Help</source> - <translation>&Ajuda</translation> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation>&Mudar frase de segurança</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> - <source>Tabs toolbar</source> - <translation>Barra de ferramentas</translation> + <location filename="../bitcoingui.cpp" line="290"/> + <source>&Settings</source> + <translation>E configurações</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> + <location filename="../bitcoingui.cpp" line="663"/> <source>Sent transaction</source> <translation>Sent transaction</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> + <location filename="../bitcoingui.cpp" line="664"/> <source>Incoming transaction</source> <translation>Incoming transaction</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -577,50 +597,37 @@ Tipo: %3 Endereço: %4</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>Carregados %1 de %2 blocos do histórico de transações.</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Wallet is <b>encrypted</b> and currently <b>unlocked</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Wallet is <b>encrypted</b> and currently <b>locked</b></translation> </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> - <source>%n hour(s) ago</source> - <translation> - <numerusform>%n hora atrás</numerusform> - <numerusform>%n horas atrás</numerusform> - </translation> - </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation>Atualizado</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>Recuperando o atraso ...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> - <source>Sending...</source> - <translation>Sending...</translation> + <location filename="../bitcoingui.cpp" line="577"/> + <source>Last received block was generated %1.</source> + <translation>Last received block was generated %1.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> - <source>Browse transaction history</source> - <translation>Navegar pelo histórico de transações</translation> + <location filename="../bitcoingui.cpp" line="636"/> + <source>Sending...</source> + <translation>Sending...</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -628,22 +635,22 @@ Endereço: %4</translation> <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&Unit to show amounts in: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>Choose the default subdivision unit to show in the interface, and when sending coins</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished"></translation> </message> @@ -719,132 +726,102 @@ Endereço: %4</translation> <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>&Start Bitcoin on window system startup</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Automatically start Bitcoin after the computer is turned on</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>&Minimize to the tray instead of the taskbar</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>Show only a tray icon after minimizing the window</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> - <source>Map port using &UPnP</source> - <translation>Map port using &UPnP</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="186"/> + <location filename="../optionsdialog.cpp" line="181"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</translation> </message> <message> <location filename="../optionsdialog.cpp" line="185"/> - <source>M&inimize on close</source> - <translation>M&inimize on close</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="181"/> - <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> - <translation>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="190"/> - <source>&Connect through SOCKS4 proxy:</source> - <translation>&Connect through SOCKS4 proxy:</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="191"/> - <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> - <translation>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="196"/> - <source>Proxy &IP: </source> - <translation>Proxy &IP: </translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="202"/> - <source>IP address of the proxy (e.g. 127.0.0.1)</source> - <translation>IP address of the proxy (e.g. 127.0.0.1)</translation> + <source>Map port using &UPnP</source> + <translation>Map port using &UPnP</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>&Port: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Port of the proxy (e.g. 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>Taxa opcional de transações por kB que ajuda a garantir que suas transações serão processadas rapidamente. A maior parte das transações é de 1 kB. Taxa de 0.01 recomendada.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>Pay transaction &fee</translation> </message> -</context> -<context> - <name>MessagePage</name> <message> - <location filename="../forms/messagepage.ui" line="58"/> - <source>Alt+A</source> - <translation>Alt+A</translation> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/messagepage.ui" line="105"/> - <source>Click "Sign Message" to get signature</source> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/messagepage.ui" line="117"/> - <source>Sign a message to prove you own this address</source> - <translation type="unfinished"></translation> + <location filename="../optionsdialog.cpp" line="180"/> + <source>M&inimize on close</source> + <translation>M&inimize on close</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="131"/> - <source>Copy the current signature to the system clipboard</source> - <translation type="unfinished"></translation> + <location filename="../optionsdialog.cpp" line="186"/> + <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> + <translation>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="134"/> - <source>&Copy to Clipboard</source> - <translation>&Copie para a área de transferência do sistema</translation> + <location filename="../optionsdialog.cpp" line="189"/> + <source>&Connect through SOCKS4 proxy:</source> + <translation>&Connect through SOCKS4 proxy:</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="120"/> - <source>&Sign Message</source> - <translation>&Assinar Mensagem</translation> + <location filename="../optionsdialog.cpp" line="190"/> + <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> + <translation>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="14"/> - <source>Message</source> - <translation type="unfinished"></translation> + <location filename="../optionsdialog.cpp" line="195"/> + <source>Proxy &IP: </source> + <translation>Proxy &IP: </translation> </message> <message> - <location filename="../forms/messagepage.ui" line="20"/> - <source>You can sign messages with your addresses to prove you own them. Be careful not to sign anything vague, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source> - <translation>Você pode assinar mensagens com seus endereços para provar que você é o dono deles. Seja cuidadoso para não assinar algo vago, pois ataques de pishing podem tentar te enganar para dar sua assinatura de identidade para eles. Apenas assine afirmações completamente detalhadas com as quais você concorda.</translation> + <location filename="../optionsdialog.cpp" line="201"/> + <source>IP address of the proxy (e.g. 127.0.0.1)</source> + <translation>IP address of the proxy (e.g. 127.0.0.1)</translation> </message> +</context> +<context> + <name>MessagePage</name> <message> - <location filename="../forms/messagepage.ui" line="38"/> - <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished">Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <location filename="../forms/messagepage.ui" line="120"/> + <source>&Sign Message</source> + <translation>&Assinar Mensagem</translation> </message> <message> <location filename="../forms/messagepage.ui" line="48"/> @@ -852,9 +829,9 @@ Endereço: %4</translation> <translation>Escolher endereço </translation> </message> <message> - <location filename="../forms/messagepage.ui" line="71"/> - <source>Paste address from clipboard</source> - <translation>Paste address from clipboard</translation> + <location filename="../forms/messagepage.ui" line="14"/> + <source>Message</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../forms/messagepage.ui" line="81"/> @@ -888,24 +865,64 @@ Endereço: %4</translation> <source>Sign failed</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../forms/messagepage.ui" line="20"/> + <source>You can sign messages with your addresses to prove you own them. Be careful not to sign anything vague, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source> + <translation>Você pode assinar mensagens com seus endereços para provar que você é o dono deles. Seja cuidadoso para não assinar algo vago, pois ataques de pishing podem tentar te enganar para dar sua assinatura de identidade para eles. Apenas assine afirmações completamente detalhadas com as quais você concorda.</translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="38"/> + <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished">Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="58"/> + <source>Alt+A</source> + <translation>Alt+A</translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="71"/> + <source>Paste address from clipboard</source> + <translation>Paste address from clipboard</translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="105"/> + <source>Click "Sign Message" to get signature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="117"/> + <source>Sign a message to prove you own this address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="131"/> + <source>Copy the current signature to the system clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="134"/> + <source>&Copy to Clipboard</source> + <translation>&Copie para a área de transferência do sistema</translation> + </message> </context> <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="104"/> - <source>Options</source> - <translation>Options</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>Main</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>Display</translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="105"/> + <source>Options</source> + <translation>Options</translation> + </message> </context> <context> <name>OverviewPage</name> @@ -915,9 +932,14 @@ Endereço: %4</translation> <translation>Form</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="40"/> - <source>Balance:</source> - <translation>Balance:</translation> + <location filename="../forms/overviewpage.ui" line="88"/> + <source>Wallet</source> + <translation>Carteira</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="124"/> + <source><b>Recent transactions</b></source> + <translation><b>Recent transactions</b></translation> </message> <message> <location filename="../forms/overviewpage.ui" line="54"/> @@ -925,6 +947,11 @@ Endereço: %4</translation> <translation>Number of transactions:</translation> </message> <message> + <location filename="../forms/overviewpage.ui" line="40"/> + <source>Balance:</source> + <translation>Balance:</translation> + </message> + <message> <location filename="../forms/overviewpage.ui" line="61"/> <source>0</source> <translation>0</translation> @@ -935,16 +962,6 @@ Endereço: %4</translation> <translation>Unconfirmed:</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="88"/> - <source>Wallet</source> - <translation>Carteira</translation> - </message> - <message> - <location filename="../forms/overviewpage.ui" line="124"/> - <source><b>Recent transactions</b></source> - <translation><b>Recent transactions</b></translation> - </message> - <message> <location filename="../overviewpage.cpp" line="103"/> <source>Your current balance</source> <translation>Your current balance</translation> @@ -963,44 +980,29 @@ Endereço: %4</translation> <context> <name>QRCodeDialog</name> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation>Imagens PNG (*.png)</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="144"/> - <source>Message:</source> - <translation>Message:</translation> - </message> - <message> - <location filename="../forms/qrcodedialog.ui" line="55"/> - <source>Request Payment</source> - <translation>Requisitar Pagamento</translation> - </message> - <message> - <location filename="../forms/qrcodedialog.ui" line="32"/> - <source>QR Code</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../forms/qrcodedialog.ui" line="70"/> <source>Amount:</source> <translation>Quantia:</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="121"/> - <source>Label:</source> - <translation>Etiqueta:</translation> + <location filename="../forms/qrcodedialog.ui" line="144"/> + <source>Message:</source> + <translation>Message:</translation> </message> <message> <location filename="../forms/qrcodedialog.ui" line="105"/> @@ -1008,14 +1010,34 @@ Endereço: %4</translation> <translation></translation> </message> <message> + <location filename="../forms/qrcodedialog.ui" line="186"/> + <source>&Save As...</source> + <translation>&Salvar como...</translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>URI resultante muito longa. Tente reduzir o texto do rótulo ou da mensagem.</translation> + </message> + <message> <location filename="../forms/qrcodedialog.ui" line="14"/> <source>Dialog</source> <translation>Diálogo</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="186"/> - <source>&Save As...</source> - <translation>&Salvar como...</translation> + <location filename="../forms/qrcodedialog.ui" line="32"/> + <source>QR Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="55"/> + <source>Request Payment</source> + <translation>Requisitar Pagamento</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="121"/> + <source>Label:</source> + <translation>Etiqueta:</translation> </message> </context> <context> @@ -1026,9 +1048,9 @@ Endereço: %4</translation> <translation>Send to multiple recipients at once</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="87"/> - <source>Clear all</source> - <translation>Clear all</translation> + <location filename="../forms/sendcoinsdialog.ui" line="84"/> + <source>Remove all transaction fields</source> + <translation>Remover todos os campos da transação</translation> </message> <message> <location filename="../forms/sendcoinsdialog.ui" line="106"/> @@ -1051,46 +1073,14 @@ Endereço: %4</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="101"/> - <source>Are you sure you want to send %1?</source> - <translation>Are you sure you want to send %1?</translation> - </message> - <message> <location filename="../sendcoinsdialog.cpp" line="95"/> <source><b>%1</b> to %2 (%3)</source> <translation><b>%1</b> to %2 (%3)</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="101"/> - <source> and </source> - <translation> and </translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="14"/> - <location filename="../sendcoinsdialog.cpp" line="123"/> - <location filename="../sendcoinsdialog.cpp" line="128"/> - <location filename="../sendcoinsdialog.cpp" line="133"/> - <location filename="../sendcoinsdialog.cpp" line="138"/> - <location filename="../sendcoinsdialog.cpp" line="144"/> - <location filename="../sendcoinsdialog.cpp" line="149"/> - <location filename="../sendcoinsdialog.cpp" line="154"/> - <source>Send Coins</source> - <translation>Send Coins</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="67"/> - <source>&Add recipient...</source> - <translation>&Add recipient...</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="84"/> - <source>Remove all transaction fields</source> - <translation>Remover todos os campos da transação</translation> - </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="100"/> - <source>Confirm send coins</source> - <translation>Confirm send coins</translation> + <source>Are you sure you want to send %1?</source> + <translation>Are you sure you want to send %1?</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="124"/> @@ -1127,6 +1117,38 @@ Endereço: %4</translation> <source>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.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="100"/> + <source>Confirm send coins</source> + <translation>Confirm send coins</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="14"/> + <location filename="../sendcoinsdialog.cpp" line="123"/> + <location filename="../sendcoinsdialog.cpp" line="128"/> + <location filename="../sendcoinsdialog.cpp" line="133"/> + <location filename="../sendcoinsdialog.cpp" line="138"/> + <location filename="../sendcoinsdialog.cpp" line="144"/> + <location filename="../sendcoinsdialog.cpp" line="149"/> + <location filename="../sendcoinsdialog.cpp" line="154"/> + <source>Send Coins</source> + <translation>Send Coins</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="67"/> + <source>&Add recipient...</source> + <translation>&Add recipient...</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="87"/> + <source>Clear all</source> + <translation>Clear all</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="101"/> + <source> and </source> + <translation> and </translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1136,14 +1158,25 @@ Endereço: %4</translation> <translation>Form</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="103"/> - <source>Choose address from address book</source> - <translation>Choose address from address book</translation> + <location filename="../sendcoinsentry.cpp" line="25"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="113"/> - <source>Alt+A</source> - <translation>Alt+A</translation> + <location filename="../forms/sendcoinsentry.ui" line="66"/> + <location filename="../sendcoinsentry.cpp" line="26"/> + <source>Enter a label for this address to add it to your address book</source> + <translation>Enter a label for this address to add it to your address book</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="75"/> + <source>&Label:</source> + <translation>&Label:</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="93"/> + <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../forms/sendcoinsentry.ui" line="130"/> @@ -1161,20 +1194,14 @@ Endereço: %4</translation> <translation>Pay &To:</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="66"/> - <location filename="../sendcoinsentry.cpp" line="26"/> - <source>Enter a label for this address to add it to your address book</source> - <translation>Enter a label for this address to add it to your address book</translation> - </message> - <message> - <location filename="../forms/sendcoinsentry.ui" line="75"/> - <source>&Label:</source> - <translation>&Label:</translation> + <location filename="../forms/sendcoinsentry.ui" line="103"/> + <source>Choose address from address book</source> + <translation>Choose address from address book</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="93"/> - <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"></translation> + <location filename="../forms/sendcoinsentry.ui" line="113"/> + <source>Alt+A</source> + <translation>Alt+A</translation> </message> <message> <location filename="../forms/sendcoinsentry.ui" line="120"/> @@ -1186,149 +1213,144 @@ Endereço: %4</translation> <source>Remove this recipient</source> <translation>Remove this recipient</translation> </message> - <message> - <location filename="../sendcoinsentry.cpp" line="25"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> </context> <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="30"/> - <source>%1 confirmations</source> - <translation>%1 confirmations</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="26"/> - <source>%1/offline?</source> - <translation>%1/offline?</translation> + <location filename="../transactiondesc.cpp" line="22"/> + <source>Open until %1</source> + <translation>Open until %1</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="18"/> + <location filename="../transactiondesc.cpp" line="20"/> <source>Open for %1 blocks</source> <translation>Open for %1 blocks</translation> </message> <message> <location filename="../transactiondesc.cpp" line="28"/> + <source>%1/offline?</source> + <translation>%1/offline?</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="30"/> <source>%1/unconfirmed</source> <translation>%1/unconfirmed</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="32"/> + <source>%1 confirmations</source> + <translation>%1 confirmations</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="92"/> + <source>unknown</source> + <translation>unknown</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation><b>Status:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>, broadcast through %1 node</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>, broadcast through %1 nodes</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation><b>Date:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>Source:</b> Generated<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>From:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation><b>To:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> - <source>unknown</source> - <translation>unknown</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation> (yours, label: </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation> (yours)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation><b>Credit:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation>(%1 matures in %2 more blocks)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation>(not accepted)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation><b>Debit:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation><b>Transaction fee:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>Net amount:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> - <source>Open until %1</source> - <translation>Open until %1</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="216"/> - <source>Message:</source> - <translation>Message:</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>Comment:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation>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.</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="219"/> + <source>Message:</source> + <translation>Message:</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation>, has not been successfully broadcast yet</translation> </message> @@ -1360,11 +1382,6 @@ Endereço: %4</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Address</source> - <translation>Address</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> <source>Amount</source> <translation>Amount</translation> </message> @@ -1377,9 +1394,9 @@ Endereço: %4</translation> </translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="280"/> - <source>Open until %1</source> - <translation>Open until %1</translation> + <location filename="../transactiontablemodel.cpp" line="283"/> + <source>Offline (%1 confirmations)</source> + <translation>Offline (%1 confirmations)</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="286"/> @@ -1387,6 +1404,11 @@ Endereço: %4</translation> <translation>Unconfirmed (%1 of %2 confirmations)</translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="289"/> + <source>Confirmed (%1 confirmations)</source> + <translation>Confirmed (%1 confirmations)</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="303"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>This block was not received by any other nodes and will probably not be accepted!</translation> @@ -1447,14 +1469,14 @@ Endereço: %4</translation> <translation>Amount removed from or added to balance.</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="283"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline (%1 confirmations)</translation> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Address</source> + <translation>Address</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="289"/> - <source>Confirmed (%1 confirmations)</source> - <translation>Confirmed (%1 confirmations)</translation> + <location filename="../transactiontablemodel.cpp" line="280"/> + <source>Open until %1</source> + <translation>Open until %1</translation> </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="297"/> @@ -1473,14 +1495,39 @@ Endereço: %4</translation> <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="284"/> - <source>Amount</source> - <translation>Amount</translation> + <location filename="../transactionview.cpp" line="77"/> + <source>Mined</source> + <translation>Mined</translation> </message> <message> - <location filename="../transactionview.cpp" line="392"/> - <source>to</source> - <translation>to</translation> + <location filename="../transactionview.cpp" line="78"/> + <source>Other</source> + <translation>Other</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="84"/> + <source>Enter address or label to search</source> + <translation>Enter address or label to search</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="90"/> + <source>Min amount</source> + <translation>Min amount</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="124"/> + <source>Copy address</source> + <translation>Copy address</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="125"/> + <source>Copy label</source> + <translation>Copy label</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="127"/> + <source>Edit label</source> + <translation>Edit label</translation> </message> <message> <location filename="../transactionview.cpp" line="279"/> @@ -1488,6 +1535,16 @@ Endereço: %4</translation> <translation>Confirmed</translation> </message> <message> + <location filename="../transactionview.cpp" line="270"/> + <source>Export Transaction Data</source> + <translation>Export Transaction Data</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="271"/> + <source>Comma separated file (*.csv)</source> + <translation>Comma separated file (*.csv)</translation> + </message> + <message> <location filename="../transactionview.cpp" line="285"/> <source>ID</source> <translation>ID</translation> @@ -1498,9 +1555,9 @@ Endereço: %4</translation> <translation>Error exporting</translation> </message> <message> - <location filename="../transactionview.cpp" line="270"/> - <source>Export Transaction Data</source> - <translation>Export Transaction Data</translation> + <location filename="../transactionview.cpp" line="384"/> + <source>Range:</source> + <translation>Range:</translation> </message> <message> <location filename="../transactionview.cpp" line="128"/> @@ -1513,6 +1570,12 @@ Endereço: %4</translation> <translation>Copiar quantia</translation> </message> <message> + <location filename="../transactionview.cpp" line="55"/> + <location filename="../transactionview.cpp" line="71"/> + <source>All</source> + <translation>All</translation> + </message> + <message> <location filename="../transactionview.cpp" line="57"/> <source>This week</source> <translation>This week</translation> @@ -1538,29 +1601,9 @@ Endereço: %4</translation> <translation>Range...</translation> </message> <message> - <location filename="../transactionview.cpp" line="271"/> - <source>Comma separated file (*.csv)</source> - <translation>Comma separated file (*.csv)</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="280"/> - <source>Date</source> - <translation>Date</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="281"/> - <source>Type</source> - <translation>Type</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="283"/> - <source>Address</source> - <translation>Address</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="282"/> - <source>Label</source> - <translation>Label</translation> + <location filename="../transactionview.cpp" line="72"/> + <source>Received with</source> + <translation>Received with</translation> </message> <message> <location filename="../transactionview.cpp" line="74"/> @@ -1573,39 +1616,24 @@ Endereço: %4</translation> <translation>To yourself</translation> </message> <message> - <location filename="../transactionview.cpp" line="77"/> - <source>Mined</source> - <translation>Mined</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="78"/> - <source>Other</source> - <translation>Other</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="84"/> - <source>Enter address or label to search</source> - <translation>Enter address or label to search</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="90"/> - <source>Min amount</source> - <translation>Min amount</translation> + <location filename="../transactionview.cpp" line="282"/> + <source>Label</source> + <translation>Label</translation> </message> <message> - <location filename="../transactionview.cpp" line="124"/> - <source>Copy address</source> - <translation>Copy address</translation> + <location filename="../transactionview.cpp" line="283"/> + <source>Address</source> + <translation>Address</translation> </message> <message> - <location filename="../transactionview.cpp" line="125"/> - <source>Copy label</source> - <translation>Copy label</translation> + <location filename="../transactionview.cpp" line="281"/> + <source>Type</source> + <translation>Type</translation> </message> <message> - <location filename="../transactionview.cpp" line="127"/> - <source>Edit label</source> - <translation>Edit label</translation> + <location filename="../transactionview.cpp" line="284"/> + <source>Amount</source> + <translation>Amount</translation> </message> <message> <location filename="../transactionview.cpp" line="289"/> @@ -1613,31 +1641,25 @@ Endereço: %4</translation> <translation>Could not write to file %1.</translation> </message> <message> - <location filename="../transactionview.cpp" line="384"/> - <source>Range:</source> - <translation>Range:</translation> + <location filename="../transactionview.cpp" line="280"/> + <source>Date</source> + <translation>Date</translation> </message> <message> - <location filename="../transactionview.cpp" line="55"/> - <location filename="../transactionview.cpp" line="71"/> - <source>All</source> - <translation>All</translation> + <location filename="../transactionview.cpp" line="392"/> + <source>to</source> + <translation>to</translation> </message> <message> <location filename="../transactionview.cpp" line="56"/> <source>Today</source> <translation>Today</translation> </message> - <message> - <location filename="../transactionview.cpp" line="72"/> - <source>Received with</source> - <translation>Received with</translation> - </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>Sending...</translation> </message> @@ -1645,256 +1667,330 @@ Endereço: %4</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> - <source>Loading wallet...</source> - <translation>Loading wallet...</translation> + <location filename="../bitcoinstrings.cpp" line="42"/> + <source>Usage:</source> + <translation>Usage:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="113"/> <source>Loading addresses...</source> <translation>Loading addresses...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Bitcoin version</source> - <translation>Bitcoin version</translation> + <location filename="../bitcoinstrings.cpp" line="115"/> + <source>Loading block index...</source> + <translation>Loading block index...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Add a node to connect to and attempt to keep the connection open</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source>Rescanning...</source> + <translation>Rescanning...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Find peers using internet relay chat (default: 0)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="60"/> + <source>Maintain at most <n> connections to peers (default: 125)</source> + <translation>Manter no máximo <n> conexões aos peers (padrão: 125)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Accept connections from outside (default: 1)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <translation>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="128"/> + <source>Invalid amount for -paytxfee=<amount></source> + <translation>Invalid amount for -paytxfee=<amount></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Find peers using DNS lookup (default: 1)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="129"/> + <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> + <translation>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>Error loading wallet.dat</source> + <translation>Erro ao carregar wallet.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> + <location filename="../bitcoinstrings.cpp" line="43"/> + <source>Send command to -server or bitcoind</source> + <translation>Send command to -server or bitcoind +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="44"/> + <source>List commands</source> + <translation>List commands +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="47"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation>Specify configuration file (default: bitcoin.conf) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="45"/> + <source>Get help for a command</source> + <translation>Get help for a command +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Specify connection timeout (in milliseconds)</source> + <translation>Specify connection timeout (in milliseconds) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>Specify pid file (default: bitcoind.pid) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Use Universal Plug and Play to map the listening port (default: 1)</source> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Warning: Disk space is low</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Use Universal Plug and Play to map the listening port (default: 0)</source> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> - <source>Output extra debugging information</source> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> - <source>How thorough the block verification is (0-6, default: 1)</source> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <location filename="../bitcoinstrings.cpp" line="46"/> + <source>Options:</source> + <translation>Options: +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="49"/> + <source>Generate coins</source> + <translation>Generate coins +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="50"/> + <source>Don't generate coins</source> + <translation>Don't generate coins +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="52"/> + <source>Show splash screen on startup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> - <source>Error loading addr.dat</source> - <translation>Erro ao carregar addr.dat</translation> + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Specify data directory</source> + <translation>Specify data directory +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> - <source>Loading block index...</source> - <translation>Loading block index...</translation> + <location filename="../bitcoinstrings.cpp" line="54"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation>Definir o tamanho do cache do banco de dados em megabytes (padrão: 25)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> - <source>Cannot downgrade wallet</source> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> - <source>Cannot initialize keypool</source> + <location filename="../bitcoinstrings.cpp" line="59"/> + <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> + <translation>Procurar por conexões em <port> (padrão: 8333 ou testnet:18333)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="61"/> + <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> - <source>Cannot write default address</source> + <location filename="../bitcoinstrings.cpp" line="63"/> + <source>Find peers using internet relay chat (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> - <source>Rescanning...</source> - <translation>Rescanning...</translation> + <location filename="../bitcoinstrings.cpp" line="64"/> + <source>Accept connections from outside (default: 1)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> - <source>Invalid -proxy address</source> - <translation>Invalid -proxy address</translation> + <location filename="../bitcoinstrings.cpp" line="65"/> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> - <source>Error: CreateThread(StartNode) failed</source> - <translation>Error: CreateThread(StartNode) failed</translation> + <location filename="../bitcoinstrings.cpp" line="66"/> + <source>Find peers using DNS lookup (default: 1)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> + <location filename="../bitcoinstrings.cpp" line="71"/> + <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> - <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> - <translation>Unable to bind to port %d on this computer. Bitcoin is probably already running.</translation> + <location filename="../bitcoinstrings.cpp" line="72"/> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> - <source>Invalid amount for -paytxfee=<amount></source> - <translation>Invalid amount for -paytxfee=<amount></translation> + <location filename="../bitcoinstrings.cpp" line="73"/> + <source>Use Universal Plug and Play to map the listening port (default: 1)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation>Erro ao carregar wallet.dat: Carteira requer uma versão mais nova do Bitcoin</translation> + <location filename="../bitcoinstrings.cpp" line="74"/> + <source>Use Universal Plug and Play to map the listening port (default: 0)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> - <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation>A Carteira precisou ser reescrita: reinicie o Bitcoin para completar</translation> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Send command to -server or bitcoind</source> - <translation>Send command to -server or bitcoind -</translation> + <location filename="../bitcoinstrings.cpp" line="81"/> + <source>Output extra debugging information</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> - <source>List commands</source> - <translation>List commands + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>Listen for JSON-RPC connections on <port> (default: 8332) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify configuration file (default: bitcoin.conf)</source> - <translation>Specify configuration file (default: bitcoin.conf) -</translation> + <location filename="../bitcoinstrings.cpp" line="84"/> + <source>Send trace/debug info to debugger</source> + <translation>Mandar informação de trace/debug para o debugger</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>Specify pid file (default: bitcoind.pid) + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Generate coins</source> - <translation>Generate coins + <location filename="../bitcoinstrings.cpp" line="79"/> + <source>Run in the background as a daemon and accept commands</source> + <translation>Run in the background as a daemon and accept commands </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Show splash screen on startup (default: 1)</source> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Specify data directory</source> - <translation>Specify data directory -</translation> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Definir o tamanho do cache do banco de dados em megabytes (padrão: 25)</translation> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Don't generate coins</source> - <translation>Don't generate coins -</translation> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation>Listen for JSON-RPC connections on <port> (default: 8332) + <location filename="../bitcoinstrings.cpp" line="58"/> + <source>Allow DNS lookups for addnode and connect</source> + <translation>Allow DNS lookups for addnode and connect </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Mandar informação de trace/debug para o console em vez de para o arquivo debug.log</translation> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Prepend debug output with timestamp</source> + <translation>Pré anexar a saída de debug com estampa de tempo</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Send trace/debug info to debugger</source> - <translation>Mandar informação de trace/debug para o debugger</translation> + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>Send commands to node running on <ip> (default: 127.0.0.1) +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation>Set key pool size to <n> (default: 100) -</translation> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Upgrade wallet to latest format</source> + <translation>Atualizar carteira para o formato mais recente</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> - <source>Server certificate file (default: server.cert)</source> - <translation>Server certificate file (default: server.cert) -</translation> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source>How many blocks to check at startup (default: 2500, 0 = all)</source> + <translation>Quantos blocos verificar ao iniciar (padrão: 2500, 0 = todos)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Allow JSON-RPC connections from specified IP address</source> - <translation>Allow JSON-RPC connections from specified IP address + <location filename="../bitcoinstrings.cpp" line="57"/> + <source>Connect through socks4 proxy</source> + <translation>Connect through socks4 proxy </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Allow DNS lookups for addnode and connect</source> - <translation>Allow DNS lookups for addnode and connect + <location filename="../bitcoinstrings.cpp" line="103"/> + <source>Server private key (default: server.pem)</source> + <translation>Server private key (default: server.pem) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> - <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>Use OpenSSL (https) for JSON-RPC connections + <location filename="../bitcoinstrings.cpp" line="62"/> + <source>Connect only to the specified node</source> + <translation>Connect only to the specified node </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) + <location filename="../bitcoinstrings.cpp" line="107"/> + <source>This help message</source> + <translation>This help message </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation> @@ -1902,174 +1998,184 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Usage:</source> - <translation>Usage:</translation> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Loading wallet...</source> + <translation>Loading wallet...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> - <translation>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</translation> + <location filename="../bitcoinstrings.cpp" line="127"/> + <source>Invalid -proxy address</source> + <translation>Invalid -proxy address</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> - <source>Done loading</source> - <translation>Done loading</translation> + <location filename="../bitcoinstrings.cpp" line="132"/> + <source>Error: CreateThread(StartNode) failed</source> + <translation>Error: CreateThread(StartNode) failed</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>beta</translation> + <location filename="../bitcoinstrings.cpp" line="133"/> + <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> + <translation>Unable to bind to port %d on this computer. Bitcoin is probably already running.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> - <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> - <translation>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</translation> + <location filename="../bitcoinstrings.cpp" line="41"/> + <source>Bitcoin version</source> + <translation>Bitcoin version</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>Insufficient funds</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="90"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>How thorough the block verification is (0-6, default: 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="114"/> + <source>Error loading addr.dat</source> + <translation>Erro ao carregar addr.dat</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="116"/> <source>Error loading blkindex.dat</source> <translation>Erro ao carregar blkindex.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> + <location filename="../bitcoinstrings.cpp" line="118"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Erro ao carregar wallet.dat: Carteira corrompida</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> - <source>Error loading wallet.dat</source> - <translation>Erro ao carregar wallet.dat</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Get help for a command</source> - <translation>Get help for a command -</translation> + <location filename="../bitcoinstrings.cpp" line="119"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> + <translation>Erro ao carregar wallet.dat: Carteira requer uma versão mais nova do Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Options:</source> - <translation>Options: -</translation> + <location filename="../bitcoinstrings.cpp" line="120"/> + <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> + <translation>A Carteira precisou ser reescrita: reinicie o Bitcoin para completar</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Start minimized</source> - <translation>Start minimized -</translation> + <location filename="../bitcoinstrings.cpp" line="122"/> + <source>Cannot downgrade wallet</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Specify connection timeout (in milliseconds) -</translation> + <location filename="../bitcoinstrings.cpp" line="123"/> + <source>Cannot initialize keypool</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Connect through socks4 proxy</source> - <translation>Connect through socks4 proxy -</translation> + <location filename="../bitcoinstrings.cpp" line="124"/> + <source>Cannot write default address</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation>Procurar por conexões em <port> (padrão: 8333 ou testnet:18333)</translation> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>Done loading</source> + <translation>Done loading</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Maintain at most <n> connections to peers (default: 125)</source> - <translation>Manter no máximo <n> conexões aos peers (padrão: 125)</translation> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Enviando...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Connect only to the specified node</source> - <translation>Connect only to the specified node + <location filename="../bitcoinstrings.cpp" line="51"/> + <source>Start minimized</source> + <translation>Start minimized </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> + <location filename="../bitcoinstrings.cpp" line="67"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Limite para desconectar peers mal comportados (padrão: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> + <location filename="../bitcoinstrings.cpp" line="68"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Número de segundos para impedir que peers mal comportados reconectem (padrão: 86400)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> + <location filename="../bitcoinstrings.cpp" line="78"/> <source>Accept command line and JSON-RPC commands</source> <translation>Accept command line and JSON-RPC commands </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> - <source>Run in the background as a daemon and accept commands</source> - <translation>Run in the background as a daemon and accept commands + <location filename="../bitcoinstrings.cpp" line="88"/> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation>Allow JSON-RPC connections from specified IP address </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> + <location filename="../bitcoinstrings.cpp" line="86"/> <source>Password for JSON-RPC connections</source> <translation>Password for JSON-RPC connections </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>Send commands to node running on <ip> (default: 127.0.0.1) -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="44"/> + <location filename="../bitcoinstrings.cpp" line="80"/> <source>Use the test network</source> <translation>Use the test network </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> - <source>Prepend debug output with timestamp</source> - <translation>Pré anexar a saída de debug com estampa de tempo</translation> + <location filename="../bitcoinstrings.cpp" line="83"/> + <source>Send trace/debug info to console instead of debug.log file</source> + <translation>Mandar informação de trace/debug para o console em vez de para o arquivo debug.log</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> + <location filename="../bitcoinstrings.cpp" line="85"/> <source>Username for JSON-RPC connections</source> <translation>Username for JSON-RPC connections </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> + <location filename="../bitcoinstrings.cpp" line="77"/> <source>Fee per KB to add to transactions you send</source> <translation>Fee per KB to add to transactions you send</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> - <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation>Quantos blocos verificar ao iniciar (padrão: 2500, 0 = todos)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="59"/> + <location filename="../bitcoinstrings.cpp" line="95"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>Rescan the block chain for missing wallet transactions </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> - <source>Server private key (default: server.pem)</source> - <translation>Server private key (default: server.pem) + <location filename="../bitcoinstrings.cpp" line="102"/> + <source>Server certificate file (default: server.cert)</source> + <translation>Server certificate file (default: server.cert) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> - <source>This help message</source> - <translation>This help message + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>Set key pool size to <n> (default: 100) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> - <source>Upgrade wallet to latest format</source> - <translation>Atualizar carteira para o formato mais recente</translation> + <location filename="../bitcoinstrings.cpp" line="101"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>Use OpenSSL (https) for JSON-RPC connections +</translation> </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts index 05680828a7..fd5eb0c10c 100644 --- a/src/qt/locale/bitcoin_ro_RO.ts +++ b/src/qt/locale/bitcoin_ro_RO.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> versiunea</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -89,42 +89,42 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Șterge</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>Copiază adresa</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation>Copiază eticheta</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation type="unfinished">Editează</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>Șterge</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation>Exportă Lista de adrese</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation>Fisier csv: valori separate prin virgulă (*.csv)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>Eroare la exportare.</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation>Eroare la scrierea în fişerul %1.</translation> </message> @@ -293,123 +293,87 @@ Sunteţi sigur că doriţi să criptaţi portofelul electronic?</translation> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="73"/> + <location filename="../bitcoingui.cpp" line="71"/> <source>Bitcoin Wallet</source> <translation>Portofel electronic Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> - <source>Synchronizing with network...</source> - <translation>Se sincronizează cu reţeaua...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Se sincronizează blocurile.</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="187"/> - <source>&Overview</source> - <translation>&Detalii</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="188"/> - <source>Show general overview of wallet</source> - <translation>Afişează detalii despre portofelul electronic</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="193"/> - <source>&Transactions</source> - <translation>&Tranzacţii</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="194"/> - <source>Browse transaction history</source> - <translation>Istoricul tranzacţiilor</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="199"/> - <source>&Address Book</source> - <translation>&Lista de adrese</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="200"/> - <source>Edit the list of stored addresses and labels</source> - <translation>Editaţi lista de adrese şi etichete.</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation>&Primiţi Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> - <translation>&Exportă...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation>Lista de adrese pentru recepţionarea plăţilor</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="255"/> - <source>Encrypt or decrypt wallet</source> - <translation>Criptează şi decriptează portofelul electronic</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="260"/> - <source>Change the passphrase used for wallet encryption</source> - <translation>&Schimbă parola folosită pentru criptarea portofelului electronic</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="211"/> - <source>&Send coins</source> - <translation>&Trimiteţi Bitcoin</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="217"/> + <location filename="../bitcoingui.cpp" line="215"/> <source>Sign &message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> + <location filename="../bitcoingui.cpp" line="216"/> <source>Prove you control an address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> + <location filename="../bitcoingui.cpp" line="235"/> <source>E&xit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Afişează fereastra Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>Modifică setările pentru Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation type="unfinished">Afişează fereastra Bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="251"/> <source>Export the data in the current tab to a file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> + <location filename="../bitcoingui.cpp" line="256"/> <source>Backup wallet to another location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>S-au descărcat %1 din %2 blocuri din istoricul tranzaciilor.</translation> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation>&Schimbă parola</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="418"/> + <source>bitcoin-qt</source> + <translation>bitcoin-qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>S-au descărcat %1 din %2 blocuri din istoricul tranzaciilor (%3% done).</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="531"/> <source>Downloaded %1 blocks of transaction history.</source> <translation>S-au descărcat %1 blocuri din istoricul tranzaciilor.</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation> <numerusform>%n seconds ago</numerusform> @@ -418,7 +382,7 @@ Sunteţi sigur că doriţi să criptaţi portofelul electronic?</translation> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation> <numerusform>Acum %n minut</numerusform> @@ -427,7 +391,7 @@ Sunteţi sigur că doriţi să criptaţi portofelul electronic?</translation> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation> <numerusform>Acum %n oră</numerusform> @@ -436,7 +400,7 @@ Sunteţi sigur că doriţi să criptaţi portofelul electronic?</translation> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>Acum %n zi</numerusform> @@ -445,32 +409,17 @@ Sunteţi sigur că doriţi să criptaţi portofelul electronic?</translation> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation>Actualizat</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> - <source>Catching up...</source> - <translation>Se actualizează...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation>Ultimul bloc primit a fost generat %1.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> - <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="646"/> - <source>Sent transaction</source> - <translation>Tranzacţie expediată</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -479,112 +428,171 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Portofelul electronic este <b>criptat</b> iar in momentul de faţă este <b>deblocat</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Portofelul electronic este <b>criptat</b> iar in momentul de faţă este <b>blocat</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Backup Wallet</source> - <translation>Backup portofelul electronic</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation type="unfinished"></translation> </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> - <source>Send coins to a bitcoin address</source> - <translation>&Trimiteţi Bitcoin către o anumită adresă</translation> + <location filename="../bitcoingui.cpp" line="506"/> + <source>Synchronizing with network...</source> + <translation>Se sincronizează cu reţeaua...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="185"/> + <source>&Overview</source> + <translation>&Detalii</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="186"/> + <source>Show general overview of wallet</source> + <translation>Afişează detalii despre portofelul electronic</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="191"/> + <source>&Transactions</source> + <translation>&Tranzacţii</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="192"/> + <source>Browse transaction history</source> + <translation>Istoricul tranzacţiilor</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> + <location filename="../bitcoingui.cpp" line="197"/> + <source>&Address Book</source> + <translation>&Lista de adrese</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="198"/> + <source>Edit the list of stored addresses and labels</source> + <translation>Editaţi lista de adrese şi etichete.</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="250"/> + <source>&Export...</source> + <translation>&Exportă...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="253"/> + <source>Encrypt or decrypt wallet</source> + <translation>Criptează şi decriptează portofelul electronic</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="258"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>&Schimbă parola folosită pentru criptarea portofelului electronic</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="209"/> + <source>&Send coins</source> + <translation>&Trimiteţi Bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="632"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="663"/> + <source>Sent transaction</source> + <translation>Tranzacţie expediată</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="664"/> + <source>Incoming transaction</source> + <translation>Tranzacţie recepţionată</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="569"/> + <source>Catching up...</source> + <translation>Se actualizează...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="236"/> <source>Quit application</source> <translation>Părăsiţi aplicaţia</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation type="unfinished">&Despre %1</translation> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Backup Wallet</source> + <translation>Backup portofelul electronic</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> + <location filename="../bitcoingui.cpp" line="240"/> <source>Show information about Bitcoin</source> <translation>Informaţii despre Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> - <source>About &Qt</source> - <translation>Despre &Qt</translation> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Send coins to a bitcoin address</source> + <translation>&Trimiteţi Bitcoin către o anumită adresă</translation> </message> <message> <location filename="../bitcoingui.cpp" line="245"/> - <source>Show information about Qt</source> - <translation>Informaţii despre Qt</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="247"/> <source>&Options...</source> <translation>&Setări...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>Modifică setările pentru Bitcoin</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>Deschide &Bitcoin</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation>Criptează portofelul electronic</translation> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation type="unfinished">&Despre %1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> - <source>&Backup Wallet</source> - <translation type="unfinished">&Backup portofelul electronic</translation> + <location filename="../bitcoingui.cpp" line="242"/> + <source>About &Qt</source> + <translation>Despre &Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>&Schimbă parola</translation> + <location filename="../bitcoingui.cpp" line="243"/> + <source>Show information about Qt</source> + <translation>Informaţii despre Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> + <location filename="../bitcoingui.cpp" line="281"/> <source>&File</source> <translation>&Fişier</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> - <source>&Settings</source> - <translation>&Setări</translation> + <location filename="../bitcoingui.cpp" line="252"/> + <source>&Encrypt Wallet</source> + <translation>Criptează portofelul electronic</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> - <source>&Help</source> - <translation>&Ajutor</translation> + <location filename="../bitcoingui.cpp" line="255"/> + <source>&Backup Wallet</source> + <translation type="unfinished">&Backup portofelul electronic</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> + <location filename="../bitcoingui.cpp" line="482"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n active connections to Bitcoin network</numerusform> @@ -593,37 +601,37 @@ Address: %4 </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> - <source>Actions toolbar</source> - <translation>Bara de acţiuni</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="421"/> - <source>bitcoin-qt</source> - <translation>bitcoin-qt</translation> + <location filename="../bitcoingui.cpp" line="290"/> + <source>&Settings</source> + <translation>&Setări</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> - <source>Incoming transaction</source> - <translation>Tranzacţie recepţionată</translation> + <location filename="../bitcoingui.cpp" line="296"/> + <source>&Help</source> + <translation>&Ajutor</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> + <location filename="../bitcoingui.cpp" line="636"/> <source>Sending...</source> <translation>Expediază...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> + <location filename="../bitcoingui.cpp" line="303"/> <source>Tabs toolbar</source> <translation>Bara de ferestre de lucru</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="314"/> + <source>Actions toolbar</source> + <translation>Bara de acţiuni</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -631,22 +639,22 @@ Address: %4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&Unitatea de măsură pentru afişarea sumelor: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>Alege subdiviziunea folosită la afişarea interfeţei şi la trimiterea de bitcoin.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&Afişează adresele în lista de tranzacţii</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished"></translation> </message> @@ -722,85 +730,95 @@ Address: %4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>&S Porneşte Bitcoin la pornirea sistemului</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Porneşte automat programul Bitcoin la pornirea computerului.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>&M Ascunde în tray în loc de taskbar</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>Afişează doar un icon in tray la ascunderea ferestrei</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> + <location filename="../optionsdialog.cpp" line="185"/> <source>Map port using &UPnP</source> <translation>Mapeaza portul folosind &UPnP</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="181"/> + <location filename="../optionsdialog.cpp" line="186"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Deschide automat în router portul aferent clientului Bitcoin. Funcţionează doar în cazul în care routerul e compatibil UPnP şi opţiunea e activată.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="180"/> <source>M&inimize on close</source> <translation>&i Ascunde fereastra în locul închiderii programului</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="186"/> + <location filename="../optionsdialog.cpp" line="181"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>Ascunde fereastra în locul părăsirii programului în momentul închiderii ferestrei. Când acestă opţiune e activă, aplicaţia se va opri doar în momentul selectării comenzii Quit din menu.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>&Conectează prin proxy SOCKS4:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Conectare la reţeaua Bitcoin folosind un proxy SOCKS4 (de exemplu, când conexiunea se stabileşte prin reţeaua Tor)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>Proxy &IP: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>Adresa de IP a proxy serverului (de exemplu: 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>&Port: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Portul pe care se concetează proxy serverul (de exemplu: 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>Plăteşte comision pentru tranzacţie &f</translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessagePage</name> @@ -895,17 +913,17 @@ Address: %4 <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>Setări</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>Afişare</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>Principal</translation> </message> @@ -948,11 +966,6 @@ Address: %4 <translation><b>Ultimele tranzacţii</b></translation> </message> <message> - <location filename="../overviewpage.cpp" line="108"/> - <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> - <translation>Totalul tranzacţiilor care aşteaptă să fie confirmate şi care nu sunt încă luate în calcul la afişarea soldului contului.</translation> - </message> - <message> <location filename="../overviewpage.cpp" line="111"/> <source>Total number of transactions in wallet</source> <translation>Numărul total de tranzacţii din portofelul electronic</translation> @@ -962,10 +975,20 @@ Address: %4 <source>Unconfirmed:</source> <translation>Neconfirmat:</translation> </message> + <message> + <location filename="../overviewpage.cpp" line="108"/> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> + <translation>Totalul tranzacţiilor care aşteaptă să fie confirmate şi care nu sunt încă luate în calcul la afişarea soldului contului.</translation> + </message> </context> <context> <name>QRCodeDialog</name> <message> + <location filename="../forms/qrcodedialog.ui" line="144"/> + <source>Message:</source> + <translation>Mesaj:</translation> + </message> + <message> <location filename="../forms/qrcodedialog.ui" line="14"/> <source>Dialog</source> <translation>Dialog</translation> @@ -996,27 +1019,27 @@ Address: %4 <translation>Etichetă:</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="144"/> - <source>Message:</source> - <translation>Mesaj:</translation> - </message> - <message> <location filename="../forms/qrcodedialog.ui" line="186"/> <source>&Save As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation type="unfinished"></translation> </message> @@ -1198,143 +1221,143 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="18"/> + <location filename="../transactiondesc.cpp" line="20"/> <source>Open for %1 blocks</source> <translation>Deschis pentru %1 blocuri</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> + <location filename="../transactiondesc.cpp" line="22"/> <source>Open until %1</source> <translation>Deschis până la %1</translation> </message> <message> <location filename="../transactiondesc.cpp" line="28"/> + <source>%1/offline?</source> + <translation>%1/offline?</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="30"/> <source>%1/unconfirmed</source> <translation>%1/neconfirmat</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation>%1 confirmări</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> - <source>%1/offline?</source> - <translation>%1/offline?</translation> + <location filename="../transactiondesc.cpp" line="70"/> + <source><b>Source:</b> Generated<br></source> + <translation><b>Sursă:</b> Generat<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>De la:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="92"/> <source>unknown</source> <translation>necunoscut</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="197"/> + <source><b>Transaction fee:</b> </source> + <translation><b>Comisionul tranzacţiei:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="213"/> + <source><b>Net amount:</b> </source> + <translation><b>Suma netă:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="219"/> + <source>Message:</source> + <translation>Mesaj:</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="223"/> + <source>Transaction ID:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="226"/> + <source>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.</source> + <translation>Monedele bitcoin generate se pot cheltui dupa parcurgerea a 120 de blocuri. După ce a fost generat, s-a propagat în reţea, urmând să fie adăugat lanţului de blocuri. Dacă nu poate fi inclus in lanţ, starea sa va deveni "neacceptat" si nu va putea fi folosit la tranzacţii. Acest fenomen se întâmplă atunci cand un alt nod a generat un bloc la o diferenţa de câteva secunde.</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation><b>Stare:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation>, nu s-a propagat încă</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>, se propagă prin %1 nod</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>, se propagă prin %1 noduri</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation><b>Data:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation><b>Către:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation> (propriu, etichetă: </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation> (propriu)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation><b>Credit:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation>(%1 se definitivează peste %2 blocuri)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation>(nu este acceptat)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation><b>Debit:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> - <source><b>Transaction fee:</b> </source> - <translation><b>Comisionul tranzacţiei:</b> </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="210"/> - <source><b>Net amount:</b> </source> - <translation><b>Suma netă:</b> </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="216"/> - <source>Message:</source> - <translation>Mesaj:</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>Comentarii:</translation> </message> - <message> - <location filename="../transactiondesc.cpp" line="220"/> - <source>Transaction ID:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="223"/> - <source>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.</source> - <translation>Monedele bitcoin generate se pot cheltui dupa parcurgerea a 120 de blocuri. După ce a fost generat, s-a propagat în reţea, urmând să fie adăugat lanţului de blocuri. Dacă nu poate fi inclus in lanţ, starea sa va deveni "neacceptat" si nu va putea fi folosit la tranzacţii. Acest fenomen se întâmplă atunci cand un alt nod a generat un bloc la o diferenţa de câteva secunde.</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="67"/> - <source><b>Source:</b> Generated<br></source> - <translation><b>Sursă:</b> Generat<br></translation> - </message> </context> <context> <name>TransactionDescDialog</name> @@ -1352,14 +1375,9 @@ Address: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="601"/> - <source>Destination address of transaction.</source> - <translation>Adresa de destinaţie a tranzacţiei.</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Date</source> - <translation>Data</translation> + <location filename="../transactiontablemodel.cpp" line="306"/> + <source>Generated but not accepted</source> + <translation>Generat, dar neacceptat</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="214"/> @@ -1376,6 +1394,11 @@ Address: %4 <source>Amount</source> <translation>Cantitate</translation> </message> + <message> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Date</source> + <translation>Data</translation> + </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="277"/> <source>Open for %n block(s)</source> @@ -1420,19 +1443,14 @@ Address: %4 <translation>Blocul nu a fost recepţionat de niciun alt nod şi e probabil că nu va fi acceptat.</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="306"/> - <source>Generated but not accepted</source> - <translation>Generat, dar neacceptat</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="349"/> <source>Received with</source> <translation>Recepţionat cu</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="351"/> - <source>Received from</source> - <translation type="unfinished"></translation> + <location filename="../transactiontablemodel.cpp" line="356"/> + <source>Payment to yourself</source> + <translation>Plată către un cont propriu</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="354"/> @@ -1440,9 +1458,9 @@ Address: %4 <translation>Trimis către</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="356"/> - <source>Payment to yourself</source> - <translation>Plată către un cont propriu</translation> + <location filename="../transactiontablemodel.cpp" line="351"/> + <source>Received from</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="358"/> @@ -1474,29 +1492,48 @@ Address: %4 <source>Amount removed from or added to balance.</source> <translation>Suma extrasă sau adăugată la sold.</translation> </message> + <message> + <location filename="../transactiontablemodel.cpp" line="601"/> + <source>Destination address of transaction.</source> + <translation>Adresa de destinaţie a tranzacţiei.</translation> + </message> </context> <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="57"/> - <source>This week</source> - <translation>Săptămâna aceasta</translation> + <location filename="../transactionview.cpp" line="283"/> + <source>Address</source> + <translation>Adresă</translation> </message> <message> - <location filename="../transactionview.cpp" line="384"/> - <source>Range:</source> - <translation>Interval:</translation> + <location filename="../transactionview.cpp" line="56"/> + <source>Today</source> + <translation>Astăzi</translation> </message> <message> - <location filename="../transactionview.cpp" line="392"/> - <source>to</source> - <translation>către</translation> + <location filename="../transactionview.cpp" line="271"/> + <source>Comma separated file (*.csv)</source> + <translation>Fişier text cu valori separate prin virgulă (*.csv)</translation> </message> <message> - <location filename="../transactionview.cpp" line="55"/> - <location filename="../transactionview.cpp" line="71"/> - <source>All</source> - <translation>Toate</translation> + <location filename="../transactionview.cpp" line="279"/> + <source>Confirmed</source> + <translation>Confirmat</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="280"/> + <source>Date</source> + <translation>Data</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="57"/> + <source>This week</source> + <translation>Săptămâna aceasta</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="281"/> + <source>Type</source> + <translation>Tipul</translation> </message> <message> <location filename="../transactionview.cpp" line="282"/> @@ -1504,11 +1541,6 @@ Address: %4 <translation>Etichetă</translation> </message> <message> - <location filename="../transactionview.cpp" line="283"/> - <source>Address</source> - <translation>Adresă</translation> - </message> - <message> <location filename="../transactionview.cpp" line="284"/> <source>Amount</source> <translation>Sumă</translation> @@ -1529,9 +1561,20 @@ Address: %4 <translation>Fisierul %1 nu a putut fi accesat pentru scriere.</translation> </message> <message> - <location filename="../transactionview.cpp" line="56"/> - <source>Today</source> - <translation>Astăzi</translation> + <location filename="../transactionview.cpp" line="384"/> + <source>Range:</source> + <translation>Interval:</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="392"/> + <source>to</source> + <translation>către</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="55"/> + <location filename="../transactionview.cpp" line="71"/> + <source>All</source> + <translation>Toate</translation> </message> <message> <location filename="../transactionview.cpp" line="58"/> @@ -1569,16 +1612,16 @@ Address: %4 <translation>Către propriul cont</translation> </message> <message> - <location filename="../transactionview.cpp" line="78"/> - <source>Other</source> - <translation>Altele</translation> - </message> - <message> <location filename="../transactionview.cpp" line="77"/> <source>Mined</source> <translation>Produs</translation> </message> <message> + <location filename="../transactionview.cpp" line="78"/> + <source>Other</source> + <translation>Altele</translation> + </message> + <message> <location filename="../transactionview.cpp" line="84"/> <source>Enter address or label to search</source> <translation>Introduceţi adresa sau eticheta pentru căutare</translation> @@ -1604,45 +1647,25 @@ Address: %4 <translation>Editează eticheta</translation> </message> <message> - <location filename="../transactionview.cpp" line="125"/> - <source>Copy label</source> - <translation>Copiază eticheta</translation> - </message> - <message> <location filename="../transactionview.cpp" line="128"/> <source>Show details...</source> <translation>Afişează detalii...</translation> </message> <message> + <location filename="../transactionview.cpp" line="125"/> + <source>Copy label</source> + <translation>Copiază eticheta</translation> + </message> + <message> <location filename="../transactionview.cpp" line="270"/> <source>Export Transaction Data</source> <translation>Exportă tranzacţiile</translation> </message> - <message> - <location filename="../transactionview.cpp" line="271"/> - <source>Comma separated file (*.csv)</source> - <translation>Fişier text cu valori separate prin virgulă (*.csv)</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="279"/> - <source>Confirmed</source> - <translation>Confirmat</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="280"/> - <source>Date</source> - <translation>Data</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="281"/> - <source>Type</source> - <translation>Tipul</translation> - </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>Se expediază...</translation> </message> @@ -1650,400 +1673,484 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> + <location filename="../bitcoinstrings.cpp" line="115"/> <source>Loading block index...</source> <translation>Încarc indice bloc...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> + <location filename="../bitcoinstrings.cpp" line="116"/> <source>Error loading blkindex.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> + <location filename="../bitcoinstrings.cpp" line="117"/> <source>Loading wallet...</source> <translation>Încarc portofel...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> + <location filename="../bitcoinstrings.cpp" line="118"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> + <location filename="../bitcoinstrings.cpp" line="119"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> + <location filename="../bitcoinstrings.cpp" line="120"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> + <location filename="../bitcoinstrings.cpp" line="121"/> <source>Error loading wallet.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> + <location filename="../bitcoinstrings.cpp" line="123"/> <source>Cannot initialize keypool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> + <location filename="../bitcoinstrings.cpp" line="124"/> <source>Cannot write default address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> + <location filename="../bitcoinstrings.cpp" line="125"/> <source>Rescanning...</source> <translation>Rescanez...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> + <location filename="../bitcoinstrings.cpp" line="126"/> <source>Done loading</source> <translation>Încărcare terminată</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> + <location filename="../bitcoinstrings.cpp" line="41"/> <source>Bitcoin version</source> <translation>versiunea Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Warning: Disk space is low</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation>Eroare</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="42"/> <source>Usage:</source> <translation>Uz:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> + <location filename="../bitcoinstrings.cpp" line="43"/> <source>Send command to -server or bitcoind</source> <translation>Trimite comanda la -server sau bitcoind</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> + <location filename="../bitcoinstrings.cpp" line="44"/> <source>List commands</source> <translation>Listă de comenzi</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> + <location filename="../bitcoinstrings.cpp" line="45"/> <source>Get help for a command</source> <translation>Ajutor pentru o comandă</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> + <location filename="../bitcoinstrings.cpp" line="46"/> <source>Options:</source> <translation>Setări:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> + <location filename="../bitcoinstrings.cpp" line="47"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> + <location filename="../bitcoinstrings.cpp" line="48"/> <source>Specify pid file (default: bitcoind.pid)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> + <location filename="../bitcoinstrings.cpp" line="49"/> <source>Generate coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> + <location filename="../bitcoinstrings.cpp" line="50"/> <source>Don't generate coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> + <location filename="../bitcoinstrings.cpp" line="51"/> <source>Start minimized</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> + <location filename="../bitcoinstrings.cpp" line="52"/> <source>Show splash screen on startup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> + <location filename="../bitcoinstrings.cpp" line="53"/> <source>Specify data directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> + <location filename="../bitcoinstrings.cpp" line="54"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="56"/> <source>Specify connection timeout (in milliseconds)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> + <location filename="../bitcoinstrings.cpp" line="58"/> <source>Allow DNS lookups for addnode and connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> + <location filename="../bitcoinstrings.cpp" line="59"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> + <location filename="../bitcoinstrings.cpp" line="60"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> + <location filename="../bitcoinstrings.cpp" line="61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> + <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> + <location filename="../bitcoinstrings.cpp" line="63"/> <source>Find peers using internet relay chat (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> + <location filename="../bitcoinstrings.cpp" line="65"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> + <location filename="../bitcoinstrings.cpp" line="66"/> <source>Find peers using DNS lookup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> + <location filename="../bitcoinstrings.cpp" line="67"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> + <location filename="../bitcoinstrings.cpp" line="68"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> + <location filename="../bitcoinstrings.cpp" line="78"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> + <location filename="../bitcoinstrings.cpp" line="79"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> + <location filename="../bitcoinstrings.cpp" line="80"/> <source>Use the test network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> + <location filename="../bitcoinstrings.cpp" line="81"/> <source>Output extra debugging information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> + <location filename="../bitcoinstrings.cpp" line="82"/> <source>Prepend debug output with timestamp</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> + <location filename="../bitcoinstrings.cpp" line="83"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> + <location filename="../bitcoinstrings.cpp" line="84"/> <source>Send trace/debug info to debugger</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> + <location filename="../bitcoinstrings.cpp" line="85"/> <source>Username for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> + <location filename="../bitcoinstrings.cpp" line="86"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> + <location filename="../bitcoinstrings.cpp" line="87"/> <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> + <location filename="../bitcoinstrings.cpp" line="88"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> + <location filename="../bitcoinstrings.cpp" line="89"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> + <location filename="../bitcoinstrings.cpp" line="90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> + <location filename="../bitcoinstrings.cpp" line="93"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> + <location filename="../bitcoinstrings.cpp" line="94"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> + <location filename="../bitcoinstrings.cpp" line="95"/> <source>Rescan the block chain for missing wallet transactions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> + <location filename="../bitcoinstrings.cpp" line="96"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> + <location filename="../bitcoinstrings.cpp" line="97"/> <source>How thorough the block verification is (0-6, default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> + <location filename="../bitcoinstrings.cpp" line="101"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> + <location filename="../bitcoinstrings.cpp" line="102"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> + <location filename="../bitcoinstrings.cpp" line="103"/> <source>Server private key (default: server.pem)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> + <location filename="../bitcoinstrings.cpp" line="104"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> + <location filename="../bitcoinstrings.cpp" line="107"/> <source>This help message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> + <location filename="../bitcoinstrings.cpp" line="113"/> <source>Loading addresses...</source> <translation>Încarc adrese...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> + <location filename="../bitcoinstrings.cpp" line="114"/> <source>Error loading addr.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> + <location filename="../bitcoinstrings.cpp" line="128"/> <source>Invalid amount for -paytxfee=<amount></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> + <location filename="../bitcoinstrings.cpp" line="129"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> + <location filename="../bitcoinstrings.cpp" line="133"/> + <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> - <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>Fonduri insuficiente</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Transmitere...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">Eroare: Tranyacţia nu a putut fi iniţiată.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">Eroare: Tranyacţia a fost respinsă. Acesta poate fi rezultatul cheltuirii prealabile a unei sume de bitcoin din portofelul electronic, ca în cazul folosirii unei copii a fisierului wallet.dat, în care s-au efectuat tranzacţii neînregistrate în fisierul curent.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="57"/> <source>Connect through socks4 proxy</source> <translation>Conectează prin proxy SOCKS4</translation> </message> + <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation>Uz</translation> + </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts index 7fee66931f..5b7acf72e2 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> версия</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -70,6 +70,11 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Kопировать</translation> </message> <message> + <location filename="../forms/addressbookpage.ui" line="85"/> + <source>Show &QR Code</source> + <translation>Показать &QR код</translation> + </message> + <message> <location filename="../forms/addressbookpage.ui" line="99"/> <source>Sign &Message</source> <translation>Подписать &сообщение</translation> @@ -85,65 +90,55 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Удалить</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="85"/> - <source>Show &QR Code</source> - <translation>Показать &QR код</translation> - </message> - <message> <location filename="../forms/addressbookpage.ui" line="96"/> <source>Sign a message to prove you own this address</source> <translation>Подпишите сообщение для доказательства </translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> - <source>Copy address</source> - <translation>Копировать адрес</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="62"/> - <source>Copy label</source> - <translation>Копировать метку</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="63"/> - <source>Edit</source> - <translation>Правка</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>Удалить</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation>Экспортировать адресную книгу</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="286"/> + <source>Comma separated file (*.csv)</source> + <translation>Текст, разделённый запятыми (*.csv)</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation>Невозможно записать в файл %1.</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>Ошибка экспорта</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> - <source>Comma separated file (*.csv)</source> - <translation>Текст, разделённый запятыми (*.csv)</translation> + <location filename="../addressbookpage.cpp" line="65"/> + <source>Copy address</source> + <translation>Копировать адрес</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="66"/> + <source>Copy label</source> + <translation>Копировать метку</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="67"/> + <source>Edit</source> + <translation>Правка</translation> </message> </context> <context> <name>AddressTableModel</name> <message> <location filename="../addresstablemodel.cpp" line="78"/> - <source>Label</source> - <translation>Метка</translation> - </message> - <message> - <location filename="../addresstablemodel.cpp" line="78"/> <source>Address</source> <translation>Адрес</translation> </message> @@ -152,18 +147,26 @@ This product includes software developed by the OpenSSL Project for use in the O <source>(no label)</source> <translation>[нет метки]</translation> </message> + <message> + <location filename="../addresstablemodel.cpp" line="78"/> + <source>Label</source> + <translation>Метка</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> <message> - <location filename="../forms/askpassphrasedialog.ui" line="61"/> - <source>New passphrase</source> - <translation>Новый пароль</translation> + <location filename="../askpassphrasedialog.cpp" line="126"/> + <location filename="../askpassphrasedialog.cpp" line="133"/> + <location filename="../askpassphrasedialog.cpp" line="175"/> + <location filename="../askpassphrasedialog.cpp" line="181"/> + <source>Wallet encryption failed</source> + <translation>Не удалось зашифровать бумажник</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="47"/> - <source>Enter passphrase</source> - <translation>Введите пароль</translation> + <location filename="../askpassphrasedialog.cpp" line="101"/> + <source>Confirm wallet encryption</source> + <translation>Подтвердите шифрование бумажника</translation> </message> <message> <location filename="../forms/askpassphrasedialog.ui" line="26"/> @@ -171,27 +174,24 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Dialog</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="75"/> - <source>Repeat new passphrase</source> - <translation>Повторите новый пароль</translation> + <location filename="../forms/askpassphrasedialog.ui" line="94"/> + <source>TextLabel</source> + <translation>TextLabel</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="46"/> - <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>Для выполнения операции требуется пароль вашего бумажника.</translation> + <location filename="../forms/askpassphrasedialog.ui" line="47"/> + <source>Enter passphrase</source> + <translation>Введите пароль</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="94"/> - <source>TextLabel</source> - <translation>TextLabel</translation> + <location filename="../askpassphrasedialog.cpp" line="38"/> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Для выполнения операции требуется пароль вашего бумажника.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="126"/> - <location filename="../askpassphrasedialog.cpp" line="133"/> - <location filename="../askpassphrasedialog.cpp" line="175"/> - <location filename="../askpassphrasedialog.cpp" line="181"/> - <source>Wallet encryption failed</source> - <translation>Не удалось зашифровать бумажник</translation> + <location filename="../forms/askpassphrasedialog.ui" line="61"/> + <source>New passphrase</source> + <translation>Новый пароль</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="55"/> @@ -199,6 +199,26 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Введите старый и новый пароль для бумажника.</translation> </message> <message> + <location filename="../forms/askpassphrasedialog.ui" line="75"/> + <source>Repeat new passphrase</source> + <translation>Повторите новый пароль</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="35"/> + <source>Encrypt wallet</source> + <translation>Зашифровать бумажник</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="43"/> + <source>Unlock wallet</source> + <translation>Разблокировать бумажник</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="46"/> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Для выполнения операции требуется пароль вашего бумажника.</translation> + </message> + <message> <location filename="../askpassphrasedialog.cpp" line="51"/> <source>Decrypt wallet</source> <translation>Расшифровать бумажник</translation> @@ -209,25 +229,25 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Сменить пароль</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="35"/> - <source>Encrypt wallet</source> - <translation>Зашифровать бумажник</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="101"/> - <source>Confirm wallet encryption</source> - <translation>Подтвердите шифрование бумажника</translation> - </message> - <message> <location filename="../askpassphrasedialog.cpp" line="111"/> <location filename="../askpassphrasedialog.cpp" line="169"/> <source>Wallet encrypted</source> <translation>Бумажник зашифрован</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="145"/> - <source>Wallet unlock failed</source> - <translation>Разблокировка бумажника не удалась</translation> + <location filename="../askpassphrasedialog.cpp" line="113"/> + <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>Сейчас программа закроется для завершения процесса шифрования. Помните, что шифрование вашего бумажника не может полностью защитить ваши биткоины от кражи с помощью инфицирования вашего компьютера вредоносным ПО.</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="117"/> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>ВАЖНО: все предыдущие резервные копии вашего кошелька должны быть заменены новым зашифрованным файлом. В целях безопасности предыдущие резервные копии нешифрованного кошелька станут бесполезны, как только вы начнёте использовать новый шифрованный кошелёк.</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="127"/> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Шифрование бумажника не удалось из-за внутренней ошибки. Ваш бумажник не был зашифрован.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="146"/> @@ -237,25 +257,20 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Указанный пароль не подходит.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="134"/> - <location filename="../askpassphrasedialog.cpp" line="182"/> - <source>The supplied passphrases do not match.</source> - <translation>Введённые пароли не совпадают.</translation> - </message> - <message> <location filename="../askpassphrasedialog.cpp" line="156"/> <source>Wallet decryption failed</source> <translation>Расшифрование бумажника не удалось</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="170"/> - <source>Wallet passphrase was successfully changed.</source> - <translation>Пароль бумажника успешно изменён.</translation> + <location filename="../askpassphrasedialog.cpp" line="217"/> + <location filename="../askpassphrasedialog.cpp" line="241"/> + <source>Warning: The Caps Lock key is on.</source> + <translation>Внимание: Caps Lock включен.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="38"/> - <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>Для выполнения операции требуется пароль вашего бумажника.</translation> + <location filename="../askpassphrasedialog.cpp" line="145"/> + <source>Wallet unlock failed</source> + <translation>Разблокировка бумажника не удалась</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="34"/> @@ -263,9 +278,9 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Введите новый пароль для бумажника. <br/> Пожалуйста, используйте фразы из <b>10 или более случайных символов,</b> или <b>восьми и более слов.</b></translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="43"/> - <source>Unlock wallet</source> - <translation>Разблокировать бумажник</translation> + <location filename="../askpassphrasedialog.cpp" line="170"/> + <source>Wallet passphrase was successfully changed.</source> + <translation>Пароль бумажника успешно изменён.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="102"/> @@ -275,141 +290,141 @@ Are you sure you wish to encrypt your wallet?</source> Вы действительно хотите зашифровать ваш бумажник?</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="113"/> - <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> - <translation>Сейчас программа закроется для завершения процесса шифрования. Помните, что шифрование вашего бумажника не может полностью защитить ваши биткоины от кражи с помощью инфицирования вашего компьютера вредоносным ПО.</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="117"/> - <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation>ВАЖНО: все предыдущие резервные копии вашего кошелька должны быть заменены новым зашифрованным файлом. В целях безопасности предыдущие резервные копии нешифрованного кошелька станут бесполезны, как только вы начнёте использовать новый шифрованный кошелёк.</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="127"/> - <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>Шифрование бумажника не удалось из-за внутренней ошибки. Ваш бумажник не был зашифрован.</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="217"/> - <location filename="../askpassphrasedialog.cpp" line="241"/> - <source>Warning: The Caps Lock key is on.</source> - <translation>Внимание: Caps Lock включен.</translation> + <location filename="../askpassphrasedialog.cpp" line="134"/> + <location filename="../askpassphrasedialog.cpp" line="182"/> + <source>The supplied passphrases do not match.</source> + <translation>Введённые пароли не совпадают.</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="252"/> + <location filename="../bitcoingui.cpp" line="250"/> <source>&Export...</source> <translation>&Экспорт...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> - <source>Browse transaction history</source> - <translation>Показать историю транзакций</translation> + <location filename="../bitcoingui.cpp" line="506"/> + <source>Synchronizing with network...</source> + <translation>Синхронизация с сетью...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> + <location filename="../bitcoingui.cpp" line="197"/> <source>&Address Book</source> <translation>&Адресная книга</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation>Показать список адресов для получения платежей</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="255"/> - <source>Encrypt or decrypt wallet</source> - <translation>Зашифровать или расшифровать бумажник</translation> + <location filename="../bitcoingui.cpp" line="564"/> + <source>Up to date</source> + <translation>Синхронизированно</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>&О %1</translation> + <location filename="../bitcoingui.cpp" line="569"/> + <source>Catching up...</source> + <translation>Синхронизируется...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="187"/> + <location filename="../bitcoingui.cpp" line="824"/> + <source>Backup Failed</source> + <translation>Резервное копирование не удалось</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="185"/> <source>&Overview</source> <translation>О&бзор</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="186"/> <source>Show general overview of wallet</source> <translation>Показать общий обзор действий с бумажником</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> + <location filename="../bitcoingui.cpp" line="191"/> <source>&Transactions</source> <translation>&Транзакции</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> - <source>&Receive coins</source> - <translation>&Получение монет</translation> + <location filename="../bitcoingui.cpp" line="192"/> + <source>Browse transaction history</source> + <translation>Показать историю транзакций</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> - <source>E&xit</source> - <translation>В&ыход</translation> + <location filename="../bitcoingui.cpp" line="216"/> + <source>Prove you control an address</source> + <translation>Доказать, что вы владеете адресом</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> - <source>&Send coins</source> - <translation>Отп&равка монет</translation> + <location filename="../bitcoingui.cpp" line="255"/> + <source>&Backup Wallet</source> + <translation>&Сделать резервную копию бумажника</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> - <source>Sign &message</source> - <translation>Подписать &сообщение</translation> + <location filename="../bitcoingui.cpp" line="252"/> + <source>&Encrypt Wallet</source> + <translation>&Зашифровать бумажник</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> + <location filename="../bitcoingui.cpp" line="235"/> + <source>E&xit</source> + <translation>В&ыход</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="236"/> <source>Quit application</source> <translation>Закрыть приложение</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> - <source>Export the data in the current tab to a file</source> - <translation>Экспортировать данные из вкладки в файл</translation> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation>Показать или скрыть окно Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> - <source>&Options...</source> - <translation>Оп&ции...</translation> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation>Bitcoin клиент</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> + <location filename="../bitcoingui.cpp" line="251"/> + <source>Export the data in the current tab to a file</source> + <translation>Экспортировать данные из вкладки в файл</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="256"/> <source>Backup wallet to another location</source> <translation>Сделать резервную копию бумажника в другом месте</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> + <location filename="../bitcoingui.cpp" line="281"/> <source>&File</source> <translation>&Файл</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> + <location filename="../bitcoingui.cpp" line="296"/> <source>&Help</source> <translation>&Помощь</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> - <source>There was an error trying to save the wallet data to the new location.</source> - <translation>При попытке сохранения данных бумажника в новое место произошла ошибка.</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation>[тестовая сеть]</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> - <source>&Settings</source> - <translation>&Настройки</translation> + <location filename="../bitcoingui.cpp" line="632"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="824"/> + <source>There was an error trying to save the wallet data to the new location.</source> + <translation>При попытке сохранения данных бумажника в новое место произошла ошибка.</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> + <location filename="../bitcoingui.cpp" line="482"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n активное соединение с сетью</numerusform> @@ -418,17 +433,12 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> - <source>Change the passphrase used for wallet encryption</source> - <translation>Изменить пароль шифрования бумажника</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="501"/> + <location filename="../bitcoingui.cpp" line="531"/> <source>Downloaded %1 blocks of transaction history.</source> <translation>Загружено %1 блоков истории транзакций.</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation> <numerusform>%n секунду назад</numerusform> @@ -436,58 +446,57 @@ Are you sure you wish to encrypt your wallet?</source> <numerusform>%n секунд назад</numerusform> </translation> </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> - <source>%n hour(s) ago</source> - <translation> - <numerusform>%n час назад</numerusform> - <numerusform>%n часа назад</numerusform> - <numerusform>%n часов назад</numerusform> - </translation> - </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> - <source>Synchronizing with network...</source> - <translation>Синхронизация с сетью...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="73"/> - <source>Bitcoin Wallet</source> - <translation>Bitcoin-бумажник</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Идёт синхронизация цепочки блоков</translation> + <location filename="../bitcoingui.cpp" line="314"/> + <source>Actions toolbar</source> + <translation>Панель действий</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> + <location filename="../bitcoingui.cpp" line="198"/> <source>Edit the list of stored addresses and labels</source> <translation>Изменить список сохранённых адресов и меток к ним</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> + <location filename="../bitcoingui.cpp" line="203"/> + <source>&Receive coins</source> + <translation>&Получение монет</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="210"/> <source>Send coins to a bitcoin address</source> <translation>Отправить монеты на указанный адрес</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="215"/> + <source>Sign &message</source> + <translation>Подписать &сообщение</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="554"/> + <source>%n hour(s) ago</source> + <translation> + <numerusform>%n час назад</numerusform> + <numerusform>%n часа назад</numerusform> + <numerusform>%n часов назад</numerusform> + </translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation>Последний полученный блок был сгенерирован %1.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> + <location filename="../bitcoingui.cpp" line="663"/> <source>Sent transaction</source> <translation>Исходящая транзакция</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> + <location filename="../bitcoingui.cpp" line="664"/> <source>Incoming transaction</source> <translation>Входящая транзакция</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -500,163 +509,162 @@ Address: %4 </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Бумажник <b>зашифрован</b> и в настоящее время <b>разблокирован</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Бумажник <b>зашифрован</b> и в настоящее время <b>заблокирован</b></translation> </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="550"/> + <source>%n minute(s) ago</source> + <translation> + <numerusform>%n минуту назад</numerusform> + <numerusform>%n минуты назад</numerusform> + <numerusform>%n минут назад</numerusform> + </translation> + </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation>Данные бумажника (*.dat)</translation> </message> - <message> - <location filename="../bitcoingui.cpp" line="534"/> - <source>Up to date</source> - <translation>Синхронизированно</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="539"/> - <source>Catching up...</source> - <translation>Синхронизируется...</translation> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="558"/> + <source>%n day(s) ago</source> + <translation> + <numerusform>%n день назад</numerusform> + <numerusform>%n дня назад</numerusform> + <numerusform>%n дней назад</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> + <location filename="../bitcoingui.cpp" line="240"/> <source>Show information about Bitcoin</source> <translation>Показать информацию о Bitcoin'е</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>&О %1</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="242"/> <source>About &Qt</source> <translation>О &Qt</translation> </message> <message> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Backup Wallet</source> + <translation>Сделать резервную копию бумажника</translation> + </message> + <message> <location filename="../bitcoingui.cpp" line="245"/> - <source>Show information about Qt</source> - <translation>Показать информацию о Qt</translation> + <source>&Options...</source> + <translation>Оп&ции...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> + <location filename="../bitcoingui.cpp" line="246"/> <source>Modify configuration options for bitcoin</source> <translation>Изменить настройки</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> - <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Backup Wallet</source> - <translation>Сделать резервную копию бумажника</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="807"/> - <source>Backup Failed</source> - <translation>Резервное копирование не удалось</translation> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation>Показать/Скрыть &Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation>&Зашифровать бумажник</translation> + <location filename="../bitcoingui.cpp" line="253"/> + <source>Encrypt or decrypt wallet</source> + <translation>Зашифровать или расшифровать бумажник</translation> </message> <message> <location filename="../bitcoingui.cpp" line="257"/> - <source>&Backup Wallet</source> - <translation>&Сделать резервную копию бумажника</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="259"/> <source>&Change Passphrase</source> <translation>&Изменить пароль</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> + <location filename="../bitcoingui.cpp" line="258"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>Изменить пароль шифрования бумажника</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="303"/> <source>Tabs toolbar</source> <translation>Панель вкладок</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> - <source>Actions toolbar</source> - <translation>Панель действий</translation> + <location filename="../bitcoingui.cpp" line="290"/> + <source>&Settings</source> + <translation>&Настройки</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> + <location filename="../bitcoin.cpp" line="127"/> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>Произошла неисправимая ошибка. Bitcoin не может безопасно продолжать работу и будет закрыт.</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="418"/> <source>bitcoin-qt</source> <translation>bitcoin-qt</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> - <source>%n minute(s) ago</source> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> <translation> - <numerusform>%n минуту назад</numerusform> - <numerusform>%n минуты назад</numerusform> - <numerusform>%n минут назад</numerusform> - </translation> - </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> - <source>%n day(s) ago</source> - <translation> - <numerusform>%n день назад</numerusform> - <numerusform>%n дня назад</numerusform> - <numerusform>%n дней назад</numerusform> + <numerusform>остался ~%n блок</numerusform> + <numerusform>осталось ~%n блоков</numerusform> + <numerusform>осталось ~%n блоков</numerusform> </translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> - <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> - <translation>Произошла неисправимая ошибка. Bitcoin не может безопасно продолжать работу и будет закрыт.</translation> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>Загружено %1 из %2 блоков истории операций (%3% завершено).</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> + <location filename="../bitcoingui.cpp" line="636"/> <source>Sending...</source> <translation>Отправка...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>&Показать бумажник</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="218"/> - <source>Prove you control an address</source> - <translation>Доказать, что вы владеете адресом</translation> + <location filename="../bitcoingui.cpp" line="71"/> + <source>Bitcoin Wallet</source> + <translation>Bitcoin-бумажник</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Показать окно бумажника</translation> + <location filename="../bitcoingui.cpp" line="209"/> + <source>&Send coins</source> + <translation>Отп&равка монет</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>Загружено %1 из %2 блоков истории транзакций.</translation> + <location filename="../bitcoingui.cpp" line="243"/> + <source>Show information about Qt</source> + <translation>Показать информацию о Qt</translation> </message> </context> <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&Измерять монеты в: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>Единица измерения количества монет при отображении и при отправке</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&Показывать адреса в списке транзакций</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished">Показывать ли адреса Bitcoin в списке транзакций</translation> </message> @@ -714,6 +722,11 @@ Address: %4 <translation>Введённый адрес «%1» уже находится в адресной книге.</translation> </message> <message> + <location filename="../editaddressdialog.cpp" line="106"/> + <source>New key generation failed.</source> + <translation>Генерация нового ключа не удалась.</translation> + </message> + <message> <location filename="../editaddressdialog.cpp" line="96"/> <source>The entered address "%1" is not a valid bitcoin address.</source> <translation>Введённый адрес «%1» не является правильным Bitcoin-адресом.</translation> @@ -723,94 +736,99 @@ Address: %4 <source>Could not unlock wallet.</source> <translation>Не удается разблокировать бумажник.</translation> </message> - <message> - <location filename="../editaddressdialog.cpp" line="106"/> - <source>New key generation failed.</source> - <translation>Генерация нового ключа не удалась.</translation> - </message> </context> <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>&Запускать бумажник при входе в систему</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Автоматически запускать бумажник, когда включается компьютер</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>&Cворачивать в системный лоток вместо панели задач</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>Показывать только иконку в системном лотке при сворачивании окна</translation> </message> <message> <location filename="../optionsdialog.cpp" line="180"/> - <source>Map port using &UPnP</source> - <translation>Пробросить порт через &UPnP</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="185"/> <source>M&inimize on close</source> <translation>С&ворачивать вместо закрытия</translation> </message> <message> <location filename="../optionsdialog.cpp" line="181"/> - <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> - <translation>Автоматически открыть порт для Bitcoin-клиента на роутере. Работает ТОЛЬКО если Ваш роутер поддерживает UPnP и данная функция включена.</translation> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> + <translation>Сворачивать вместо закрытия. Если данная опция будет выбрана — приложение закроется только после выбора соответствующего пункта в меню.</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="185"/> + <source>Map port using &UPnP</source> + <translation>Пробросить порт через &UPnP</translation> </message> <message> <location filename="../optionsdialog.cpp" line="186"/> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Сворачивать вместо закрытия. Если данная опция будет выбрана — приложение закроется только после выбора соответствующего пункта в меню.</translation> + <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> + <translation>Автоматически открыть порт для Bitcoin-клиента на роутере. Работает ТОЛЬКО если Ваш роутер поддерживает UPnP и данная функция включена.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>&Подключаться через SOCKS4 прокси:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Подключаться к сети Bitcoin через SOCKS4 прокси (например, при использовании Tor)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>&IP Прокси: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>IP-адрес прокси (например 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>По&рт: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Порт прокси-сервера (например 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>Опциональная комиссия за каждый КБ транзакции, которая позволяет быть уверенным, что Ваша транзакция будет обработано быстро. Большинство транзакций занимают 1КБ. Рекомендуется комиссия 0.01.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>Добавлять ко&миссию</translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation>Отключать базы данных при выходе</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation>Отключить базы данных блоков и адресов при выходе. Это означает, что их можно будет переместить в другой каталог данных, но завершение работы будет медленнее. Бумажник всегда отключается.</translation> + </message> </context> <context> <name>MessagePage</name> @@ -835,14 +853,26 @@ Address: %4 <translation>&Подписать сообщение</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="105"/> - <source>Click "Sign Message" to get signature</source> - <translation>Для создания подписи нажмите на "Подписать сообщение"</translation> + <location filename="../messagepage.cpp" line="74"/> + <location filename="../messagepage.cpp" line="89"/> + <location filename="../messagepage.cpp" line="101"/> + <source>Error signing</source> + <translation>Ошибка создания подписи</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="131"/> - <source>Copy the current signature to the system clipboard</source> - <translation>Скопировать текущую подпись в системный буфер обмена</translation> + <location filename="../messagepage.cpp" line="74"/> + <source>%1 is not a valid address.</source> + <translation>%1 не является правильным адресом.</translation> + </message> + <message> + <location filename="../messagepage.cpp" line="89"/> + <source>Private key for %1 is not available.</source> + <translation>Секретный ключ для %1 не доступен</translation> + </message> + <message> + <location filename="../messagepage.cpp" line="101"/> + <source>Sign failed</source> + <translation>Подписание не удалось.</translation> </message> <message> <location filename="../forms/messagepage.ui" line="38"/> @@ -875,47 +905,35 @@ Address: %4 <translation>Введите сообщение для подписи</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="134"/> - <source>&Copy to Clipboard</source> - <translation>&Kопировать</translation> - </message> - <message> - <location filename="../messagepage.cpp" line="74"/> - <location filename="../messagepage.cpp" line="89"/> - <location filename="../messagepage.cpp" line="101"/> - <source>Error signing</source> - <translation>Ошибка создания подписи</translation> - </message> - <message> - <location filename="../messagepage.cpp" line="74"/> - <source>%1 is not a valid address.</source> - <translation>%1 не является правильным адресом.</translation> + <location filename="../forms/messagepage.ui" line="105"/> + <source>Click "Sign Message" to get signature</source> + <translation>Для создания подписи нажмите на "Подписать сообщение"</translation> </message> <message> - <location filename="../messagepage.cpp" line="89"/> - <source>Private key for %1 is not available.</source> - <translation>Секретный ключ для %1 не доступен</translation> + <location filename="../forms/messagepage.ui" line="131"/> + <source>Copy the current signature to the system clipboard</source> + <translation>Скопировать текущую подпись в системный буфер обмена</translation> </message> <message> - <location filename="../messagepage.cpp" line="101"/> - <source>Sign failed</source> - <translation>Подписание не удалось.</translation> + <location filename="../forms/messagepage.ui" line="134"/> + <source>&Copy to Clipboard</source> + <translation>&Kопировать</translation> </message> </context> <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>Основное</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>Отображение</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>Опции</translation> </message> @@ -923,16 +941,6 @@ Address: %4 <context> <name>OverviewPage</name> <message> - <location filename="../overviewpage.cpp" line="103"/> - <source>Your current balance</source> - <translation>Ваш текущий баланс</translation> - </message> - <message> - <location filename="../overviewpage.cpp" line="108"/> - <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> - <translation>Общая сумма всех транзакций, которые до сих пор не подтверждены, и до сих пор не учитываются в текущем балансе</translation> - </message> - <message> <location filename="../forms/overviewpage.ui" line="88"/> <source>Wallet</source> <translation>Бумажник</translation> @@ -948,6 +956,21 @@ Address: %4 <translation>Баланс:</translation> </message> <message> + <location filename="../overviewpage.cpp" line="103"/> + <source>Your current balance</source> + <translation>Ваш текущий баланс</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="124"/> + <source><b>Recent transactions</b></source> + <translation><b>Последние транзакции</b></translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="68"/> + <source>Unconfirmed:</source> + <translation>Не подтверждено:</translation> + </message> + <message> <location filename="../forms/overviewpage.ui" line="54"/> <source>Number of transactions:</source> <translation>Количество транзакций:</translation> @@ -958,14 +981,9 @@ Address: %4 <translation>0</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="68"/> - <source>Unconfirmed:</source> - <translation>Не подтверждено:</translation> - </message> - <message> - <location filename="../forms/overviewpage.ui" line="124"/> - <source><b>Recent transactions</b></source> - <translation><b>Последние транзакции</b></translation> + <location filename="../overviewpage.cpp" line="108"/> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> + <translation>Общая сумма всех транзакций, которые до сих пор не подтверждены, и до сих пор не учитываются в текущем балансе</translation> </message> <message> <location filename="../overviewpage.cpp" line="111"/> @@ -976,36 +994,26 @@ Address: %4 <context> <name>QRCodeDialog</name> <message> - <location filename="../forms/qrcodedialog.ui" line="70"/> - <source>Amount:</source> - <translation>Количество:</translation> - </message> - <message> - <location filename="../forms/qrcodedialog.ui" line="55"/> - <source>Request Payment</source> - <translation>Запросить платёж</translation> - </message> - <message> - <location filename="../forms/qrcodedialog.ui" line="144"/> - <source>Message:</source> - <translation>Сообщение:</translation> - </message> - <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation>Ошибка кодирования URI в QR-код</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> - <source>Save Image...</source> - <translation>Сохранить изображение...</translation> - </message> - <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation>PNG Изображения (*.png)</translation> </message> <message> + <location filename="../forms/qrcodedialog.ui" line="105"/> + <source>BTC</source> + <translation>BTC</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="186"/> + <source>&Save As...</source> + <translation>&Сохранить как...</translation> + </message> + <message> <location filename="../forms/qrcodedialog.ui" line="14"/> <source>Dialog</source> <translation>Dialog</translation> @@ -1016,51 +1024,44 @@ Address: %4 <translation>QR код</translation> </message> <message> + <location filename="../forms/qrcodedialog.ui" line="55"/> + <source>Request Payment</source> + <translation>Запросить платёж</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="70"/> + <source>Amount:</source> + <translation>Количество:</translation> + </message> + <message> <location filename="../forms/qrcodedialog.ui" line="121"/> <source>Label:</source> <translation>Метка:</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="105"/> - <source>BTC</source> - <translation>BTC</translation> + <location filename="../forms/qrcodedialog.ui" line="144"/> + <source>Message:</source> + <translation>Сообщение:</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="186"/> - <source>&Save As...</source> - <translation>&Сохранить как...</translation> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>Получившийся URI слишком длинный, попробуйте сократить текст метки / сообщения.</translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="121"/> + <source>Save Image...</source> + <translation>Сохранить изображение...</translation> </message> </context> <context> <name>SendCoinsDialog</name> <message> - <location filename="../forms/sendcoinsdialog.ui" line="14"/> - <location filename="../sendcoinsdialog.cpp" line="123"/> - <location filename="../sendcoinsdialog.cpp" line="128"/> - <location filename="../sendcoinsdialog.cpp" line="133"/> - <location filename="../sendcoinsdialog.cpp" line="138"/> - <location filename="../sendcoinsdialog.cpp" line="144"/> - <location filename="../sendcoinsdialog.cpp" line="149"/> - <location filename="../sendcoinsdialog.cpp" line="154"/> - <source>Send Coins</source> - <translation>Отправка</translation> - </message> - <message> <location filename="../forms/sendcoinsdialog.ui" line="64"/> <source>Send to multiple recipients at once</source> <translation>Отправить нескольким получателям одновременно</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="67"/> - <source>&Add recipient...</source> - <translation>&Добавить получателя...</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="84"/> - <source>Remove all transaction fields</source> - <translation>Удалить все поля транзакции</translation> - </message> - <message> <location filename="../forms/sendcoinsdialog.ui" line="106"/> <source>Balance:</source> <translation>Баланс:</translation> @@ -1086,19 +1087,46 @@ Address: %4 <translation><b>%1</b> адресату %2 (%3)</translation> </message> <message> + <location filename="../sendcoinsdialog.cpp" line="100"/> + <source>Confirm send coins</source> + <translation>Подтвердите отправку монет</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="129"/> + <source>The amount to pay must be larger than 0.</source> + <translation>Количество монет для отправки должно быть больше 0.</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="101"/> + <source>Are you sure you want to send %1?</source> + <translation>Вы уверены, что хотите отправить %1?</translation> + </message> + <message> <location filename="../sendcoinsdialog.cpp" line="101"/> <source> and </source> <translation> и </translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="134"/> - <source>The amount exceeds your balance.</source> - <translation>Количество отправляемых монет превышает Ваш баланс</translation> + <location filename="../sendcoinsdialog.cpp" line="124"/> + <source>The recipient address is not valid, please recheck.</source> + <translation>Адрес получателя неверный, пожалуйста, перепроверьте.</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="139"/> - <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation>Сумма превысит Ваш баланс, если комиссия в размере %1 будет добавлена к транзакции</translation> + <location filename="../forms/sendcoinsdialog.ui" line="67"/> + <source>&Add recipient...</source> + <translation>&Добавить получателя...</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="14"/> + <location filename="../sendcoinsdialog.cpp" line="123"/> + <location filename="../sendcoinsdialog.cpp" line="128"/> + <location filename="../sendcoinsdialog.cpp" line="133"/> + <location filename="../sendcoinsdialog.cpp" line="138"/> + <location filename="../sendcoinsdialog.cpp" line="144"/> + <location filename="../sendcoinsdialog.cpp" line="149"/> + <location filename="../sendcoinsdialog.cpp" line="154"/> + <source>Send Coins</source> + <translation>Отправка</translation> </message> <message> <location filename="../forms/sendcoinsdialog.ui" line="87"/> @@ -1106,24 +1134,19 @@ Address: %4 <translation>Очистить всё</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="100"/> - <source>Confirm send coins</source> - <translation>Подтвердите отправку монет</translation> - </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="101"/> - <source>Are you sure you want to send %1?</source> - <translation>Вы уверены, что хотите отправить %1?</translation> + <location filename="../forms/sendcoinsdialog.ui" line="84"/> + <source>Remove all transaction fields</source> + <translation>Удалить все поля транзакции</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="124"/> - <source>The recipient address is not valid, please recheck.</source> - <translation>Адрес получателя неверный, пожалуйста, перепроверьте.</translation> + <location filename="../sendcoinsdialog.cpp" line="139"/> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>Сумма превысит Ваш баланс, если комиссия в размере %1 будет добавлена к транзакции</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="129"/> - <source>The amount to pay must be larger than 0.</source> - <translation>Количество монет для отправки должно быть больше 0.</translation> + <location filename="../sendcoinsdialog.cpp" line="155"/> + <source>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.</source> + <translation>Ошибка: В транзакции отказано. Такое может произойти, если некоторые монеты уже были потрачены, например, если Вы используете одну копию файла wallet.dat, а монеты были потрачены из другой копии, но не были отмечены как потраченные в этой.</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="145"/> @@ -1131,9 +1154,9 @@ Address: %4 <translation>Обнаружен дублирующийся адрес. Отправка на один и тот же адрес возможна только один раз за одну операцию отправки</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="155"/> - <source>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.</source> - <translation>Ошибка: В транзакции отказано. Такое может произойти, если некоторые монеты уже были потрачены, например, если Вы используете одну копию файла wallet.dat, а монеты были потрачены из другой копии, но не были отмечены как потраченные в этой.</translation> + <location filename="../sendcoinsdialog.cpp" line="134"/> + <source>The amount exceeds your balance.</source> + <translation>Количество отправляемых монет превышает Ваш баланс</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="150"/> @@ -1149,35 +1172,14 @@ Address: %4 <translation>Форма</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="66"/> - <location filename="../sendcoinsentry.cpp" line="26"/> - <source>Enter a label for this address to add it to your address book</source> - <translation>Введите метку для данного адреса (для добавления в адресную книгу)</translation> - </message> - <message> - <location filename="../forms/sendcoinsentry.ui" line="75"/> - <source>&Label:</source> - <translation>&Метка:</translation> - </message> - <message> - <location filename="../forms/sendcoinsentry.ui" line="103"/> - <source>Choose address from address book</source> - <translation>Выберите адрес из адресной книги</translation> - </message> - <message> - <location filename="../forms/sendcoinsentry.ui" line="113"/> - <source>Alt+A</source> - <translation>Alt+A</translation> - </message> - <message> <location filename="../forms/sendcoinsentry.ui" line="29"/> <source>A&mount:</source> <translation>Ко&личество:</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="42"/> - <source>Pay &To:</source> - <translation>Полу&чатель:</translation> + <location filename="../sendcoinsentry.cpp" line="25"/> + <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>Введите Bitcoin-адрес (например 1LA5FtQhnnWnkK6zjFfutR7Stiit4wKd63)</translation> </message> <message> <location filename="../forms/sendcoinsentry.ui" line="93"/> @@ -1185,9 +1187,9 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="120"/> - <source>Paste address from clipboard</source> - <translation>Вставить адрес из буфера обмена</translation> + <location filename="../forms/sendcoinsentry.ui" line="113"/> + <source>Alt+A</source> + <translation>Alt+A</translation> </message> <message> <location filename="../forms/sendcoinsentry.ui" line="130"/> @@ -1200,148 +1202,169 @@ Address: %4 <translation>Удалить этого получателя</translation> </message> <message> - <location filename="../sendcoinsentry.cpp" line="25"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Введите Bitcoin-адрес (например 1LA5FtQhnnWnkK6zjFfutR7Stiit4wKd63)</translation> + <location filename="../forms/sendcoinsentry.ui" line="42"/> + <source>Pay &To:</source> + <translation>Полу&чатель:</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="66"/> + <location filename="../sendcoinsentry.cpp" line="26"/> + <source>Enter a label for this address to add it to your address book</source> + <translation>Введите метку для данного адреса (для добавления в адресную книгу)</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="75"/> + <source>&Label:</source> + <translation>&Метка:</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="103"/> + <source>Choose address from address book</source> + <translation>Выберите адрес из адресной книги</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="120"/> + <source>Paste address from clipboard</source> + <translation>Вставить адрес из буфера обмена</translation> </message> </context> <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="18"/> + <location filename="../transactiondesc.cpp" line="20"/> <source>Open for %1 blocks</source> <translation>Открыто до получения %1 блоков</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> + <location filename="../transactiondesc.cpp" line="22"/> <source>Open until %1</source> <translation>Открыто до %1</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation>%1/оффлайн?</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation><b>Статус:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> - <source>, has not been successfully broadcast yet</source> - <translation>, ещё не было успешно разослано</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>, разослано через %1 узел</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>, разослано через %1 узлов</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation><b>Дата:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>Источник:</b> [сгенерированно]<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>Отправитель:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation><b>Получатель:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation> (Ваш, метка: </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation> (ваш)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation><b>Кредит:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation>(%1 станет доступно через %2 блоков)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation>(не принято)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation><b>Дебет:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation><b>Комиссия:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>Общая сумма:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>Сообщение:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>Комментарий:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation>Идентификатор транзакции:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="28"/> + <location filename="../transactiondesc.cpp" line="30"/> <source>%1/unconfirmed</source> <translation>%1/не подтверждено</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation>%1 подтверждений</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="55"/> + <source>, has not been successfully broadcast yet</source> + <translation>, ещё не было успешно разослано</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="92"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation>Сгенерированные монеты должны подождать 120 блоков прежде, чем они смогут быть отправлены. Когда Вы сгенерировали этот блок он был отправлен в сеть, чтобы он был добавлен к цепочке блоков. Если данная процедура не удастся, статус изменится на «не подтверждено» и монеты будут непередаваемыми. Такое может случайно происходить в случае, если другой узел сгенерирует блок на несколько секунд раньше.</translation> </message> @@ -1363,8 +1386,8 @@ Address: %4 <name>TransactionTableModel</name> <message> <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Address</source> - <translation>Адрес</translation> + <source>Type</source> + <translation>Тип</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="214"/> @@ -1386,39 +1409,14 @@ Address: %4 <translation>Открыто до %1</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="283"/> - <source>Offline (%1 confirmations)</source> - <translation>Оффлайн (%1 подтверждений)</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="286"/> <source>Unconfirmed (%1 of %2 confirmations)</source> <translation>Не подтверждено (%1 из %2 подтверждений)</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="303"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Этот блок не был получен другими узлами и, возможно, не будет принят!</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="349"/> - <source>Received with</source> - <translation>Получено</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="351"/> - <source>Received from</source> - <translation>Получено от</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="354"/> - <source>Sent to</source> - <translation>Отправлено</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="356"/> - <source>Payment to yourself</source> - <translation>Отправлено себе</translation> + <location filename="../transactiontablemodel.cpp" line="289"/> + <source>Confirmed (%1 confirmations)</source> + <translation>Подтверждено (%1 подтверждений)</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="358"/> @@ -1457,8 +1455,8 @@ Address: %4 </message> <message> <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Type</source> - <translation>Тип</translation> + <source>Address</source> + <translation>Адрес</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="214"/> @@ -1466,9 +1464,39 @@ Address: %4 <translation>Дата</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="289"/> - <source>Confirmed (%1 confirmations)</source> - <translation>Подтверждено (%1 подтверждений)</translation> + <location filename="../transactiontablemodel.cpp" line="283"/> + <source>Offline (%1 confirmations)</source> + <translation>Оффлайн (%1 подтверждений)</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="303"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Этот блок не был получен другими узлами и, возможно, не будет принят!</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="306"/> + <source>Generated but not accepted</source> + <translation>Сгенерированно, но не подтверждено</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="351"/> + <source>Received from</source> + <translation>Получено от</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="354"/> + <source>Sent to</source> + <translation>Отправлено</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="349"/> + <source>Received with</source> + <translation>Получено</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="356"/> + <source>Payment to yourself</source> + <translation>Отправлено себе</translation> </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="297"/> @@ -1479,48 +1507,33 @@ Address: %4 <numerusform>Добытыми монетами можно будет воспользоваться через %n блоков</numerusform> </translation> </message> - <message> - <location filename="../transactiontablemodel.cpp" line="306"/> - <source>Generated but not accepted</source> - <translation>Сгенерированно, но не подтверждено</translation> - </message> </context> <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="90"/> - <source>Min amount</source> - <translation>Мин. сумма</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="270"/> - <source>Export Transaction Data</source> - <translation>Экспортировать данные транзакций</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="56"/> - <source>Today</source> - <translation>Сегодня</translation> + <location filename="../transactionview.cpp" line="76"/> + <source>To yourself</source> + <translation>Отправленные себе</translation> </message> <message> - <location filename="../transactionview.cpp" line="282"/> - <source>Label</source> - <translation>Метка</translation> + <location filename="../transactionview.cpp" line="61"/> + <source>Range...</source> + <translation>Промежуток...</translation> </message> <message> - <location filename="../transactionview.cpp" line="59"/> - <source>Last month</source> - <translation>За последний месяц</translation> + <location filename="../transactionview.cpp" line="84"/> + <source>Enter address or label to search</source> + <translation>Введите адрес или метку для поиска</translation> </message> <message> - <location filename="../transactionview.cpp" line="60"/> - <source>This year</source> - <translation>В этом году</translation> + <location filename="../transactionview.cpp" line="90"/> + <source>Min amount</source> + <translation>Мин. сумма</translation> </message> <message> - <location filename="../transactionview.cpp" line="289"/> - <source>Error exporting</source> - <translation>Ошибка экспорта</translation> + <location filename="../transactionview.cpp" line="78"/> + <source>Other</source> + <translation>Другое</translation> </message> <message> <location filename="../transactionview.cpp" line="55"/> @@ -1534,31 +1547,6 @@ Address: %4 <translation>Получено на</translation> </message> <message> - <location filename="../transactionview.cpp" line="74"/> - <source>Sent to</source> - <translation>Отправлено на</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="76"/> - <source>To yourself</source> - <translation>Отправленные себе</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="77"/> - <source>Mined</source> - <translation>Добытые</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="78"/> - <source>Other</source> - <translation>Другое</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="392"/> - <source>to</source> - <translation>до</translation> - </message> - <message> <location filename="../transactionview.cpp" line="125"/> <source>Copy label</source> <translation>Копировать метку</translation> @@ -1569,19 +1557,19 @@ Address: %4 <translation>Изменить метку</translation> </message> <message> - <location filename="../transactionview.cpp" line="124"/> - <source>Copy address</source> - <translation>Копировать адрес</translation> + <location filename="../transactionview.cpp" line="60"/> + <source>This year</source> + <translation>В этом году</translation> </message> <message> - <location filename="../transactionview.cpp" line="283"/> - <source>Address</source> - <translation>Адрес</translation> + <location filename="../transactionview.cpp" line="289"/> + <source>Error exporting</source> + <translation>Ошибка экспорта</translation> </message> <message> - <location filename="../transactionview.cpp" line="271"/> - <source>Comma separated file (*.csv)</source> - <translation>Текст, разделённый запятыми (*.csv)</translation> + <location filename="../transactionview.cpp" line="392"/> + <source>to</source> + <translation>до</translation> </message> <message> <location filename="../transactionview.cpp" line="284"/> @@ -1589,9 +1577,9 @@ Address: %4 <translation>Количество</translation> </message> <message> - <location filename="../transactionview.cpp" line="280"/> - <source>Date</source> - <translation>Дата</translation> + <location filename="../transactionview.cpp" line="270"/> + <source>Export Transaction Data</source> + <translation>Экспортировать данные транзакций</translation> </message> <message> <location filename="../transactionview.cpp" line="285"/> @@ -1599,9 +1587,14 @@ Address: %4 <translation>ID</translation> </message> <message> - <location filename="../transactionview.cpp" line="281"/> - <source>Type</source> - <translation>Тип</translation> + <location filename="../transactionview.cpp" line="279"/> + <source>Confirmed</source> + <translation>Подтверждено</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="280"/> + <source>Date</source> + <translation>Дата</translation> </message> <message> <location filename="../transactionview.cpp" line="289"/> @@ -1609,9 +1602,24 @@ Address: %4 <translation>Невозможно записать в файл %1.</translation> </message> <message> - <location filename="../transactionview.cpp" line="384"/> - <source>Range:</source> - <translation>Промежуток от:</translation> + <location filename="../transactionview.cpp" line="281"/> + <source>Type</source> + <translation>Тип</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="282"/> + <source>Label</source> + <translation>Метка</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="124"/> + <source>Copy address</source> + <translation>Копировать адрес</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="56"/> + <source>Today</source> + <translation>Сегодня</translation> </message> <message> <location filename="../transactionview.cpp" line="57"/> @@ -1624,14 +1632,19 @@ Address: %4 <translation>В этом месяце</translation> </message> <message> - <location filename="../transactionview.cpp" line="61"/> - <source>Range...</source> - <translation>Промежуток...</translation> + <location filename="../transactionview.cpp" line="59"/> + <source>Last month</source> + <translation>За последний месяц</translation> </message> <message> - <location filename="../transactionview.cpp" line="84"/> - <source>Enter address or label to search</source> - <translation>Введите адрес или метку для поиска</translation> + <location filename="../transactionview.cpp" line="74"/> + <source>Sent to</source> + <translation>Отправлено на</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="77"/> + <source>Mined</source> + <translation>Добытые</translation> </message> <message> <location filename="../transactionview.cpp" line="126"/> @@ -1644,15 +1657,25 @@ Address: %4 <translation>Показать детали...</translation> </message> <message> - <location filename="../transactionview.cpp" line="279"/> - <source>Confirmed</source> - <translation>Подтверждено</translation> + <location filename="../transactionview.cpp" line="283"/> + <source>Address</source> + <translation>Адрес</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="384"/> + <source>Range:</source> + <translation>Промежуток от:</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="271"/> + <source>Comma separated file (*.csv)</source> + <translation>Текст, разделённый запятыми (*.csv)</translation> </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>Отправка....</translation> </message> @@ -1660,402 +1683,495 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> - <source>Rescanning...</source> - <translation>Сканирование...</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Usage:</source> - <translation>Использование:</translation> + <location filename="../bitcoinstrings.cpp" line="41"/> + <source>Bitcoin version</source> + <translation>Версия</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> - <source>Loading block index...</source> - <translation>Загрузка индекса блоков...</translation> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Loading wallet...</source> + <translation>Загрузка бумажника...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> + <location filename="../bitcoinstrings.cpp" line="126"/> <source>Done loading</source> <translation>Загрузка завершена</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> - <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation>Необходимо перезаписать бумажник, перезапустите Bitcoin для завершения операции.</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="81"/> + <location filename="../bitcoinstrings.cpp" line="119"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> <translation>Ошибка загрузки wallet.dat: бумажник требует более новую версию Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation>Не удаётся понизить версию бумажника</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Options:</source> - <translation>Опции:</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="91"/> - <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> - <translation>ВНИМАНИЕ: Установлена слишком большая комиссия (-paytxfee=). Данный параметр отвечает за комиссию, которую Вы будете добавлять к сумме при осуществлении транзакций.</translation> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>Error loading wallet.dat</source> + <translation>Ошибка при загрузке wallet.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation>Ошибка: Созданиние потока (запуск узла) не удался</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> + <location filename="../bitcoinstrings.cpp" line="133"/> <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> <translation>Невозможно забиндить порт %d на данном компьютере. Возможно, бумажник ужк запущен.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> + <location filename="../bitcoinstrings.cpp" line="128"/> <source>Invalid amount for -paytxfee=<amount></source> <translation>Ошибка в сумме комиссии</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> + <location filename="../bitcoinstrings.cpp" line="38"/> <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> <translation>ВНИМАНИЕ: Проверьте дату и время, установленные на Вашем компьютере. Если Ваши часы идут не правильно Bitcoin может наботать не корректно.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> - <source>Invalid -proxy address</source> - <translation>Ошибка в адресе прокси</translation> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Warning: Disk space is low</source> + <translation>ВНИМАНИЕ: На диске заканчивается свободное пространство</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>Указать pid-файл (по умолчанию: bitcoin.pid)</translation> + <location filename="../bitcoinstrings.cpp" line="43"/> + <source>Send command to -server or bitcoind</source> + <translation>Отправить команду на -server или bitcoind</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> + <location filename="../bitcoinstrings.cpp" line="49"/> <source>Generate coins</source> <translation>Генерировать монеты</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> + <location filename="../bitcoinstrings.cpp" line="59"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Принимать входящие подключения на <port> (по умолчанию: 8333 или 18333 в тестовой сети)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Send command to -server or bitcoind</source> - <translation>Отправить команду на -server или bitcoind</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Get help for a command</source> - <translation>Получить помощь по команде</translation> + <location filename="../bitcoinstrings.cpp" line="47"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation>Указать конфигурационный файл (по умолчанию: bitcoin.conf)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> + <location filename="../bitcoinstrings.cpp" line="63"/> <source>Find peers using internet relay chat (default: 0)</source> <translation>Найти участников через IRC (по умолчанию: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> + <location filename="../bitcoinstrings.cpp" line="78"/> <source>Accept command line and JSON-RPC commands</source> <translation>Принимать командную строку и команды JSON-RPC</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> - <source>Run in the background as a daemon and accept commands</source> - <translation>Запускаться в фоне как демон и принимать команды</translation> + <location filename="../bitcoinstrings.cpp" line="80"/> + <source>Use the test network</source> + <translation>Использовать тестовую сеть</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Specify connection timeout (in milliseconds)</source> + <translation>Укажите таймаут соединения (в миллисекундах)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="85"/> <source>Username for JSON-RPC connections</source> <translation>Имя для подключений JSON-RPC</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> + <location filename="../bitcoinstrings.cpp" line="86"/> <source>Password for JSON-RPC connections</source> <translation>Пароль для подключений JSON-RPC</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="88"/> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation>Разрешить подключения JSON-RPC с указанного IP</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Upgrade wallet to latest format</source> + <translation>Обновить бумажник до последнего формата</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> + <location filename="../bitcoinstrings.cpp" line="114"/> <source>Error loading addr.dat</source> <translation>Ошибка загрузки addr.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation>Ожидать подключения JSON-RPC на <порт> (по умолчанию: 8332)</translation> + <location filename="../bitcoinstrings.cpp" line="118"/> + <source>Error loading wallet.dat: Wallet corrupted</source> + <translation>Ошибка загрузки wallet.dat: Бумажник поврежден</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> - <source>Upgrade wallet to latest format</source> - <translation>Обновить бумажник до последнего формата</translation> + <location filename="../bitcoinstrings.cpp" line="107"/> + <source>This help message</source> + <translation>Эта справка</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> - <source>Use the test network</source> - <translation>Использовать тестовую сеть</translation> + <location filename="../bitcoinstrings.cpp" line="77"/> + <source>Fee per KB to add to transactions you send</source> + <translation>Комиссия на килобайт, добавляемая к вашим транзакциям</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Allow JSON-RPC connections from specified IP address</source> - <translation>Разрешить подключения JSON-RPC с указанного IP</translation> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Prepend debug output with timestamp</source> + <translation>Дописывать отметки времени к отладочному выводу</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>Разрешённые алгоритмы (по умолчанию: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> + <location filename="../bitcoinstrings.cpp" line="83"/> + <source>Send trace/debug info to console instead of debug.log file</source> + <translation>Выводить информацию трассировки/отладки на консоль вместо файла debug.log</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> - <source>Server certificate file (default: server.cert)</source> - <translation>Файл серверного сертификата (по умолчанию: server.cert)</translation> + <location filename="../bitcoinstrings.cpp" line="84"/> + <source>Send trace/debug info to debugger</source> + <translation>Отправлять информацию трассировки/отладки в отладчик</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> - <source>This help message</source> - <translation>Эта справка</translation> + <location filename="../bitcoinstrings.cpp" line="90"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation>Выполнить команду, когда появляется новый блок (%s в команде заменяется на хэш блока)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>Посылать команды узлу, запущенному на <ip> (по умолчанию: 127.0.0.1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>Установить размер запаса ключей в <n> (по умолчанию: 100)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation>Перепроверить цепь блоков на предмет отсутствующих в бумажнике транзакций</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source>How many blocks to check at startup (default: 2500, 0 = all)</source> + <translation>Сколько блоков проверять при запуске (по умолчанию: 2500, 0 = все)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>How thorough the block verification is (0-6, default: 1)</source> + <translation>Насколько тщательно проверять блоки (0-6, по умолчанию: 1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="101"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>Использовать OpenSSL (https) для подключений JSON-RPC</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="103"/> + <source>Server private key (default: server.pem)</source> + <translation>Приватный ключ сервера (по умолчанию: server.pem)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation>Принимать подключения извне (по умолчанию: 1)</translation> </message> <message> + <location filename="../bitcoinstrings.cpp" line="66"/> + <source>Find peers using DNS lookup (default: 1)</source> + <translation>Искать узлы с помощью DNS (по умолчанию: 1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="57"/> + <source>Connect through socks4 proxy</source> + <translation>Подключаться через socks4 прокси</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Отправка...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>Неверное количество</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation>%s, вы должны установить опцию rpcpassword в конфигурационном файле: + %s +Рекомендуется использовать следующий случайный пароль: +rpcuser=bitcoinrpc +rpcpassword=%s +(вам не нужно запоминать этот пароль) +Если файл не существует, создайте его и установите право доступа только для чтения только для владельца. +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation>Чтобы использовать опцию %s</translation> + </message> + <message> <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Выберите язык, например "de_DE" (по умолчанию: как в системе)</translation> + <source>Error</source> + <translation>Ошибка</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Find peers using DNS lookup (default: 1)</source> - <translation>Искать узлы с помощью DNS (по умолчанию: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation>Вы должны установить rpcpassword=<password> в конфигурационном файле: +%s +Если файл не существует, создайте его и установите право доступа только для чтения только для владельца.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> - <source>Output extra debugging information</source> - <translation>Выводить дополнительную отладочную информацию</translation> + <location filename="../bitcoinstrings.cpp" line="42"/> + <source>Usage:</source> + <translation>Использование:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> - <source>Loading addresses...</source> - <translation>Загрузка адресов...</translation> + <location filename="../bitcoinstrings.cpp" line="129"/> + <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> + <translation>ВНИМАНИЕ: Установлена слишком большая комиссия (-paytxfee=). Данный параметр отвечает за комиссию, которую Вы будете добавлять к сумме при осуществлении транзакций.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> - <source>Loading wallet...</source> - <translation>Загрузка бумажника...</translation> + <location filename="../bitcoinstrings.cpp" line="127"/> + <source>Invalid -proxy address</source> + <translation>Ошибка в адресе прокси</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>бета</translation> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation>Установить размер лога базы данных в мегабайтах (по умолчанию: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> - <translation>ВНИМАНИЕ: На диске заканчивается свободное пространство</translation> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>Невозможно установить блокировку на рабочую директорию %s. Возможно, бумажник уже запущен.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Bitcoin version</source> - <translation>Версия</translation> + <location filename="../bitcoinstrings.cpp" line="113"/> + <source>Loading addresses...</source> + <translation>Загрузка адресов...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> - <source>Error loading blkindex.dat</source> - <translation>Ошибка чтения blkindex.dat</translation> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source>Rescanning...</source> + <translation>Сканирование...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> - <source>Error loading wallet.dat: Wallet corrupted</source> - <translation>Ошибка загрузки wallet.dat: Бумажник поврежден</translation> + <location filename="../bitcoinstrings.cpp" line="115"/> + <source>Loading block index...</source> + <translation>Загрузка индекса блоков...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> - <source>Error loading wallet.dat</source> - <translation>Ошибка при загрузке wallet.dat</translation> + <location filename="../bitcoinstrings.cpp" line="124"/> + <source>Cannot write default address</source> + <translation>Не удаётся записать адрес по умолчанию</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> + <location filename="../bitcoinstrings.cpp" line="120"/> + <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> + <translation>Необходимо перезаписать бумажник, перезапустите Bitcoin для завершения операции.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="123"/> <source>Cannot initialize keypool</source> <translation>Не удаётся инициализировать массив ключей</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> - <source>Cannot write default address</source> - <translation>Не удаётся записать адрес по умолчанию</translation> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>Биткоин</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> + <location filename="../bitcoinstrings.cpp" line="44"/> <source>List commands</source> <translation>Список команд </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify configuration file (default: bitcoin.conf)</source> - <translation>Указать конфигурационный файл (по умолчанию: bitcoin.conf)</translation> + <location filename="../bitcoinstrings.cpp" line="45"/> + <source>Get help for a command</source> + <translation>Получить помощь по команде</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> + <location filename="../bitcoinstrings.cpp" line="46"/> + <source>Options:</source> + <translation>Опции:</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>Указать pid-файл (по умолчанию: bitcoin.pid)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="50"/> <source>Don't generate coins</source> <translation>Не генерировать монеты</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> + <location filename="../bitcoinstrings.cpp" line="51"/> <source>Start minimized</source> <translation>Запускать свёрнутым</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>Разрешённые алгоритмы (по умолчанию: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="52"/> <source>Show splash screen on startup (default: 1)</source> <translation>Показывать сплэш при запуске (по умолчанию: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Specify data directory</source> - <translation>Укажите каталог данных</translation> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Установить размер кэша базы данных в мегабайтах (по умолчанию: 25)</translation> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Укажите таймаут соединения (в миллисекундах)</translation> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">Ошибка: не удалось создать транзакцию.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Connect through socks4 proxy</source> - <translation>Подключаться через socks4 прокси</translation> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">Ошибка: В транзакции отказано. Такое может произойти, если некоторые монеты уже были потрачены, например, если Вы используете одну копию файла wallet.dat, а монеты были потрачены из другой копии, но не были отмечены как потраченные в этой.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>Недостаточно монет</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation>Произошла ошибка при открытии RPC-порта %u для прослушивания: %s</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Specify data directory</source> + <translation>Укажите каталог данных</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="54"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation>Установить размер кэша базы данных в мегабайтах (по умолчанию: 25)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="58"/> <source>Allow DNS lookups for addnode and connect</source> <translation>Разрешить обращения к DNS для addnode и подключения</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> + <location filename="../bitcoinstrings.cpp" line="60"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>Поддерживать не более <n> подключений к узлам (по умолчанию: 125)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> + <location filename="../bitcoinstrings.cpp" line="61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Добавить узел для подключения и пытаться поддерживать соединение открытым</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> + <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation>Подключаться только к указанному узлу</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Threshold for disconnecting misbehaving peers (default: 100)</source> - <translation>Порог для отключения неправильно ведущих себя узлов (по умолчанию: 100)</translation> + <location filename="../bitcoinstrings.cpp" line="65"/> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Выберите язык, например "de_DE" (по умолчанию: как в системе)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Выполнить команду, когда появляется новый блок (%s в команде заменяется на хэш блока)</translation> + <location filename="../bitcoinstrings.cpp" line="67"/> + <source>Threshold for disconnecting misbehaving peers (default: 100)</source> + <translation>Порог для отключения неправильно ведущих себя узлов (по умолчанию: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> + <location filename="../bitcoinstrings.cpp" line="68"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Число секунд блокирования неправильно ведущих себя узлов (по умолчанию: 86400)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation>Максимальный размер буфера приёма на соединение, <n>*1000 байт (по умолчанию: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation>Максимальный размер буфера отправки на соединение, <n>*1000 байт (по умолчанию: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished">Использовать UPnP для проброса порта (по умолчанию: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished">Использовать UPnP для проброса порта (по умолчанию: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Комиссия на килобайт, добавляемая к вашим транзакциям</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="46"/> - <source>Prepend debug output with timestamp</source> - <translation>Дописывать отметки времени к отладочному выводу</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="47"/> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Выводить информацию трассировки/отладки на консоль вместо файла debug.log</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Send trace/debug info to debugger</source> - <translation>Отправлять информацию трассировки/отладки в отладчик</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>Посылать команды узлу, запущенному на <ip> (по умолчанию: 127.0.0.1)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="58"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation>Установить размер запаса ключей в <n> (по умолчанию: 100)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="59"/> - <source>Rescan the block chain for missing wallet transactions</source> - <translation>Перепроверить цепь блоков на предмет отсутствующих в бумажнике транзакций</translation> + <location filename="../bitcoinstrings.cpp" line="79"/> + <source>Run in the background as a daemon and accept commands</source> + <translation>Запускаться в фоне как демон и принимать команды</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> - <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation>Сколько блоков проверять при запуске (по умолчанию: 2500, 0 = все)</translation> + <location filename="../bitcoinstrings.cpp" line="81"/> + <source>Output extra debugging information</source> + <translation>Выводить дополнительную отладочную информацию</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> - <source>How thorough the block verification is (0-6, default: 1)</source> - <translation>Насколько тщательно проверять блоки (0-6, по умолчанию: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>Ожидать подключения JSON-RPC на <порт> (по умолчанию: 8332)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation> Параметры SSL: (см. Bitcoin Wiki для инструкций по настройке SSL)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> - <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>Использовать OpenSSL (https) для подключений JSON-RPC</translation> + <location filename="../bitcoinstrings.cpp" line="102"/> + <source>Server certificate file (default: server.cert)</source> + <translation>Файл серверного сертификата (по умолчанию: server.cert)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> - <source>Server private key (default: server.pem)</source> - <translation>Приватный ключ сервера (по умолчанию: server.pem)</translation> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation>Отключить базы данных блоков и адресов. Увеличивает время завершения работы (по умолчанию: 0)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Error loading blkindex.dat</source> + <translation>Ошибка чтения blkindex.dat</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation>Использование</translation> </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts index f8ddac5cb5..b90fce88d6 100644 --- a/src/qt/locale/bitcoin_sk.ts +++ b/src/qt/locale/bitcoin_sk.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> verzia</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -89,42 +89,42 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Zmazať</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>Kopírovať adresu</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation>Kopírovať popis</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation>Upraviť</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>Zmazať</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation>Exportovať dáta z adresára</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation>Čiarkou oddelený súbor (*.csv)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>Chyba exportu.</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation>Nedalo sa zapisovať do súboru %1.</translation> </message> @@ -293,163 +293,255 @@ Ste si istí, že si želáte zašifrovať peňaženku?</translation> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="73"/> + <location filename="../bitcoingui.cpp" line="71"/> <source>Bitcoin Wallet</source> <translation>Bitcoin peňaženka</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> + <location filename="../bitcoingui.cpp" line="506"/> <source>Synchronizing with network...</source> <translation>Synchronizácia so sieťou...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Prebieha synchronizácia blockchain.</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="187"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>&Overview</source> <translation>&Prehľad</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="186"/> <source>Show general overview of wallet</source> <translation>Zobraziť celkový prehľad o peňaženke</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> + <location filename="../bitcoingui.cpp" line="191"/> <source>&Transactions</source> <translation>&Transakcie</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="192"/> <source>Browse transaction history</source> <translation>Prechádzať históriu transakcií</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> + <location filename="../bitcoingui.cpp" line="197"/> <source>&Address Book</source> <translation>&Adresár</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> + <location filename="../bitcoingui.cpp" line="198"/> <source>Edit the list of stored addresses and labels</source> <translation>Editovať zoznam uložených adries a popisov</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation>&Prijať bitcoins</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation>Zobraziť zoznam adries pre prijímanie platieb.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> + <location filename="../bitcoingui.cpp" line="209"/> <source>&Send coins</source> <translation>&Poslať bitcoins</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> + <location filename="../bitcoingui.cpp" line="210"/> <source>Send coins to a bitcoin address</source> <translation>Poslať bitcoins na adresu</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> + <location filename="../bitcoingui.cpp" line="215"/> <source>Sign &message</source> <translation>Podpísať &správu</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> + <location filename="../bitcoingui.cpp" line="216"/> <source>Prove you control an address</source> <translation>Dokázať že kontrolujete adresu</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> + <location filename="../bitcoingui.cpp" line="235"/> <source>E&xit</source> <translation>U&končiť</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> + <location filename="../bitcoingui.cpp" line="236"/> <source>Quit application</source> <translation>Ukončiť program</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> + <location filename="../bitcoingui.cpp" line="239"/> <source>&About %1</source> <translation>&O %1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Zobraziť okno Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>Upraviť možnosti nastavenia pre bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation type="unfinished">Zobraziť okno Bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="251"/> <source>Export the data in the current tab to a file</source> <translation>Exportovať tento náhľad do súboru</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> + <location filename="../bitcoingui.cpp" line="252"/> <source>&Encrypt Wallet</source> <translation>&Zašifrovať Peňaženku</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> + <location filename="../bitcoingui.cpp" line="253"/> + <source>Encrypt or decrypt wallet</source> + <translation>Zašifrovať alebo dešifrovať peňaženku</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="255"/> <source>&Backup Wallet</source> <translation type="unfinished">&Backup peňaženku</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> + <location filename="../bitcoingui.cpp" line="256"/> <source>Backup wallet to another location</source> <translation>Zálohovať peňaženku na iné miesto</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> + <location filename="../bitcoingui.cpp" line="632"/> <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> + <location filename="../bitcoingui.cpp" line="240"/> <source>Show information about Bitcoin</source> <translation>Zobraziť informácie o Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> + <location filename="../bitcoingui.cpp" line="242"/> <source>About &Qt</source> <translation>O &Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> + <location filename="../bitcoingui.cpp" line="243"/> <source>Show information about Qt</source> <translation>Zobrazit informácie o Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> + <location filename="../bitcoingui.cpp" line="245"/> <source>&Options...</source> <translation>&Možnosti...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> + <location filename="../bitcoingui.cpp" line="257"/> <source>&Change Passphrase</source> <translation>&Zmena Hesla</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> + <location filename="../bitcoingui.cpp" line="258"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>Zmeniť heslo použité na šifrovanie peňaženky</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="281"/> + <source>&File</source> + <translation>&Súbor</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="314"/> + <source>Actions toolbar</source> + <translation>Lišta aktvivít</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation type="unfinished"></translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>Stiahnutých %1 (of %2) blokov transakčnej histórie (%3% done).</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="531"/> <source>Downloaded %1 blocks of transaction history.</source> <translation>Stiahnutých %1 blokov transakčnej histórie</translation> </message> + <message> + <location filename="../bitcoingui.cpp" line="564"/> + <source>Up to date</source> + <translation>Aktualizovaný</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="577"/> + <source>Last received block was generated %1.</source> + <translation>Posledný prijatý blok bol generovaný %1.</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="663"/> + <source>Sent transaction</source> + <translation>Odoslané transakcie</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="664"/> + <source>Incoming transaction</source> + <translation>Prijaté transakcie</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="790"/> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation>Peňaženka je <b>zašifrovaná</b> a momentálne <b>odomknutá</b></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="798"/> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation>Peňaženka je <b>zašifrovaná</b> a momentálne <b>zamknutá</b></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Wallet Data (*.dat)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="824"/> + <source>There was an error trying to save the wallet data to the new location.</source> + <translation>Nastala chyba pri pokuse uložiť peňaženku na nové miesto.</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="482"/> + <source>%n active connection(s) to Bitcoin network</source> + <translation> + <numerusform>%n aktívne spojenie v Bitcoin sieti</numerusform> + <numerusform>%n aktívne spojenia v Bitcoin sieti</numerusform> + <numerusform>%n aktívnych spojení v Bitconi sieti</numerusform> + </translation> + </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation> <numerusform>pred %n sekundou</numerusform> @@ -458,7 +550,7 @@ Ste si istí, že si želáte zašifrovať peňaženku?</translation> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation> <numerusform>pred %n minútou</numerusform> @@ -467,16 +559,7 @@ Ste si istí, že si želáte zašifrovať peňaženku?</translation> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> - <source>%n hour(s) ago</source> - <translation> - <numerusform>pred hodinou</numerusform> - <numerusform>pred %n hodinami</numerusform> - <numerusform>pred %n hodinami</numerusform> - </translation> - </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>včera</numerusform> @@ -485,32 +568,12 @@ Ste si istí, že si želáte zašifrovať peňaženku?</translation> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> - <source>Up to date</source> - <translation>Aktualizovaný</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>Sťahujem...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> - <source>Last received block was generated %1.</source> - <translation>Posledný prijatý blok bol generovaný %1.</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="646"/> - <source>Sent transaction</source> - <translation>Odoslané transakcie</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="647"/> - <source>Incoming transaction</source> - <translation>Prijaté transakcie</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -521,112 +584,57 @@ Suma: %2 Typ: %3 Adresa: %4</translation> </message> - <message> - <location filename="../bitcoingui.cpp" line="781"/> - <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation>Peňaženka je <b>zašifrovaná</b> a momentálne <b>zamknutá</b></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Wallet Data (*.dat)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="807"/> - <source>There was an error trying to save the wallet data to the new location.</source> - <translation>Nastala chyba pri pokuse uložiť peňaženku na nové miesto.</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>Upraviť možnosti nastavenia pre bitcoin</translation> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="554"/> + <source>%n hour(s) ago</source> + <translation> + <numerusform>pred hodinou</numerusform> + <numerusform>pred %n hodinami</numerusform> + <numerusform>pred %n hodinami</numerusform> + </translation> </message> <message> <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>Otvoriť &Bitcoin</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="252"/> <source>&Export...</source> <translation>&Export...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="255"/> - <source>Encrypt or decrypt wallet</source> - <translation>Zašifrovať alebo dešifrovať peňaženku</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="260"/> - <source>Change the passphrase used for wallet encryption</source> - <translation>Zmeniť heslo použité na šifrovanie peňaženky</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="283"/> - <source>&File</source> - <translation>&Súbor</translation> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Backup Wallet</source> + <translation>Zálohovať peňaženku</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> + <location filename="../bitcoingui.cpp" line="290"/> <source>&Settings</source> <translation>&Nastavenia</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> + <location filename="../bitcoingui.cpp" line="296"/> <source>&Help</source> <translation>&Pomoc</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> + <location filename="../bitcoingui.cpp" line="303"/> <source>Tabs toolbar</source> <translation>Lišta záložiek</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> - <source>Actions toolbar</source> - <translation>Lišta aktvivít</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation>[testovacia sieť]</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> - <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation>Peňaženka je <b>zašifrovaná</b> a momentálne <b>odomknutá</b></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="421"/> + <location filename="../bitcoingui.cpp" line="418"/> <source>bitcoin-qt</source> <translation>bitcoin-qt</translation> </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> - <source>%n active connection(s) to Bitcoin network</source> - <translation> - <numerusform>%n aktívne spojenie v Bitcoin sieti</numerusform> - <numerusform>%n aktívne spojenia v Bitcoin sieti</numerusform> - <numerusform>%n aktívnych spojení v Bitconi sieti</numerusform> - </translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation type="unfinished">Stiahnutých %1 (of %2) blokov transakčnej histórie</translation> - </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Backup Wallet</source> - <translation>Zálohovať peňaženku</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="619"/> + <location filename="../bitcoingui.cpp" line="636"/> <source>Sending...</source> <translation>Odosielanie...</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -634,22 +642,22 @@ Adresa: %4</translation> <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&Zobrazovať hodnoty v jednotkách:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&Zobraziť adresy zo zoznamu transakcií</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished"></translation> </message> @@ -702,11 +710,6 @@ Adresa: %4</translation> <translation>Upraviť prijímacie adresy</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="106"/> - <source>New key generation failed.</source> - <translation>Generovanie nového kľúča zlyhalo.</translation> - </message> - <message> <location filename="../editaddressdialog.cpp" line="91"/> <source>The entered address "%1" is already in the address book.</source> <translation>Vložená adresa "%1" sa už nachádza v adresári.</translation> @@ -721,86 +724,101 @@ Adresa: %4</translation> <source>Could not unlock wallet.</source> <translation>Nepodarilo sa odomknúť peňaženku.</translation> </message> + <message> + <location filename="../editaddressdialog.cpp" line="106"/> + <source>New key generation failed.</source> + <translation>Generovanie nového kľúča zlyhalo.</translation> + </message> </context> <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>&Spustiť Bitcoin pri spustení systému správy okien</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Automaticky spustiť Bitcoin po zapnutí počítača</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>Zobraziť len ikonu na lište po minimalizovaní okna.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>Zobraziť len ikonu na lište po minimalizovaní okna.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> + <location filename="../optionsdialog.cpp" line="185"/> <source>Map port using &UPnP</source> <translation>Mapovať port pomocou &UPnP</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="181"/> + <location filename="../optionsdialog.cpp" line="186"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Automaticky otvorit port pre Bitcoin na routeri. Toto funguje len ak router podporuje UPnP a je táto podpora aktivovaná.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="180"/> <source>M&inimize on close</source> <translation>M&inimalizovať pri zavretí</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="186"/> + <location filename="../optionsdialog.cpp" line="181"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>Minimalizovat namiesto ukončenia aplikácie keď sa okno zavrie. Keď je zvolená táto možnosť, aplikácia sa zavrie len po zvolení Ukončiť v menu.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>&Pripojiť cez SOCKS4 proxy:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Pripojiť do siete Bitcoin cez SOCKS4 proxy (napr. keď sa pripájate cez Tor)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>Proxy &IP: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>IP addresa proxy (napr. 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>&Port: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Port proxy (napr. 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>Zaplatiť transakčné &poplatky</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>Voliteľný transakčný poplatok za kB ktorý pomôže rýchlemu spracovaniu transakcie. Väčšina transakcií má 1 kB. Poplatok 0.01 je odporúčaný.</translation> </message> @@ -885,30 +903,30 @@ Adresa: %4</translation> <translation>%1 nieje platná adresa.</translation> </message> <message> - <location filename="../messagepage.cpp" line="89"/> - <source>Private key for %1 is not available.</source> - <translation>Súkromný kľúč pre %1 nieje k dispozícii.</translation> - </message> - <message> <location filename="../messagepage.cpp" line="101"/> <source>Sign failed</source> <translation>Podpisovanie neúspešné</translation> </message> + <message> + <location filename="../messagepage.cpp" line="89"/> + <source>Private key for %1 is not available.</source> + <translation>Súkromný kľúč pre %1 nieje k dispozícii.</translation> + </message> </context> <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>Možnosti</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>Hlavné</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>Displej</translation> </message> @@ -916,21 +934,6 @@ Adresa: %4</translation> <context> <name>OverviewPage</name> <message> - <location filename="../forms/overviewpage.ui" line="68"/> - <source>Unconfirmed:</source> - <translation>Nepotvrdené:</translation> - </message> - <message> - <location filename="../forms/overviewpage.ui" line="14"/> - <source>Form</source> - <translation>Forma</translation> - </message> - <message> - <location filename="../forms/overviewpage.ui" line="88"/> - <source>Wallet</source> - <translation>Peňaženka</translation> - </message> - <message> <location filename="../forms/overviewpage.ui" line="124"/> <source><b>Recent transactions</b></source> <translation><b>Nedávne transakcie</b></translation> @@ -946,14 +949,9 @@ Adresa: %4</translation> <translation>Suma transakcií ktoré ešte neboli potvrdené a nezapočítavaju sa do celkového zostatku.</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="61"/> - <source>0</source> - <translation>0</translation> - </message> - <message> - <location filename="../overviewpage.cpp" line="111"/> - <source>Total number of transactions in wallet</source> - <translation>Celkový počet transakcií v peňaženke</translation> + <location filename="../forms/overviewpage.ui" line="14"/> + <source>Form</source> + <translation>Forma</translation> </message> <message> <location filename="../forms/overviewpage.ui" line="40"/> @@ -965,30 +963,35 @@ Adresa: %4</translation> <source>Number of transactions:</source> <translation>Počet transakcií:</translation> </message> -</context> -<context> - <name>QRCodeDialog</name> <message> - <location filename="../forms/qrcodedialog.ui" line="55"/> - <source>Request Payment</source> - <translation>Vyžiadať platbu</translation> + <location filename="../forms/overviewpage.ui" line="61"/> + <source>0</source> + <translation>0</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="32"/> - <source>QR Code</source> - <translation>QR kód</translation> + <location filename="../forms/overviewpage.ui" line="68"/> + <source>Unconfirmed:</source> + <translation>Nepotvrdené:</translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="88"/> + <source>Wallet</source> + <translation>Peňaženka</translation> </message> <message> + <location filename="../overviewpage.cpp" line="111"/> + <source>Total number of transactions in wallet</source> + <translation>Celkový počet transakcií v peňaženke</translation> + </message> +</context> +<context> + <name>QRCodeDialog</name> + <message> <location filename="../forms/qrcodedialog.ui" line="70"/> <source>Amount:</source> <translation>Suma:</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="105"/> - <source>BTC</source> - <translation>BTC</translation> - </message> - <message> <location filename="../forms/qrcodedialog.ui" line="121"/> <source>Label:</source> <translation>Popis:</translation> @@ -999,6 +1002,21 @@ Adresa: %4</translation> <translation>Správa:</translation> </message> <message> + <location filename="../forms/qrcodedialog.ui" line="55"/> + <source>Request Payment</source> + <translation>Vyžiadať platbu</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="32"/> + <source>QR Code</source> + <translation>QR kód</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="105"/> + <source>BTC</source> + <translation>BTC</translation> + </message> + <message> <location filename="../forms/qrcodedialog.ui" line="186"/> <source>&Save As...</source> <translation>&Uložiť ako...</translation> @@ -1009,17 +1027,22 @@ Adresa: %4</translation> <translation>Dialóg</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation type="unfinished"></translation> </message> @@ -1032,16 +1055,6 @@ Adresa: %4</translation> <translation><b>%1</b> do %2 (%3)</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="100"/> - <source>Confirm send coins</source> - <translation>Potvrdiť odoslanie bitcoins</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="84"/> - <source>Remove all transaction fields</source> - <translation>Odobrať všetky políčka transakcie</translation> - </message> - <message> <location filename="../forms/sendcoinsdialog.ui" line="106"/> <source>Balance:</source> <translation>Zostatok:</translation> @@ -1057,9 +1070,9 @@ Adresa: %4</translation> <translation>Potvrďte odoslanie</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="147"/> - <source>S&end</source> - <translation>&Odoslať</translation> + <location filename="../sendcoinsdialog.cpp" line="100"/> + <source>Confirm send coins</source> + <translation>Potvrdiť odoslanie bitcoins</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="101"/> @@ -1089,16 +1102,36 @@ Adresa: %4</translation> <translation>&Pridať príjemcu...</translation> </message> <message> + <location filename="../forms/sendcoinsdialog.ui" line="84"/> + <source>Remove all transaction fields</source> + <translation>Odobrať všetky políčka transakcie</translation> + </message> + <message> <location filename="../forms/sendcoinsdialog.ui" line="87"/> <source>Clear all</source> <translation>Zmazať všetko</translation> </message> <message> + <location filename="../forms/sendcoinsdialog.ui" line="147"/> + <source>S&end</source> + <translation>&Odoslať</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="145"/> + <source>Duplicate address found, can only send to each address once per send operation.</source> + <translation>Duplikát adresy objavený, je možné poslať na každú adresu len raz v jednej odchádzajúcej transakcii.</translation> + </message> + <message> <location filename="../sendcoinsdialog.cpp" line="101"/> <source> and </source> <translation> a</translation> </message> <message> + <location filename="../sendcoinsdialog.cpp" line="124"/> + <source>The recipient address is not valid, please recheck.</source> + <translation>Adresa príjemcu je neplatná, prosím, overte ju.</translation> + </message> + <message> <location filename="../sendcoinsdialog.cpp" line="129"/> <source>The amount to pay must be larger than 0.</source> <translation>Suma na úhradu musí byť väčšia ako 0.</translation> @@ -1114,11 +1147,6 @@ Adresa: %4</translation> <translation>Suma celkom prevyšuje Váš zostatok ak sú započítané %1 transakčné poplatky.</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="145"/> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Duplikát adresy objavený, je možné poslať na každú adresu len raz v jednej odchádzajúcej transakcii.</translation> - </message> - <message> <location filename="../sendcoinsdialog.cpp" line="150"/> <source>Error: Transaction creation failed.</source> <translation>Chyba: Zlyhalo vytvorenie transakcie.</translation> @@ -1128,11 +1156,6 @@ Adresa: %4</translation> <source>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.</source> <translation>Chyba: Transakcia bola odmietnutá. Toto sa môže stať ak niektoré z mincí vo vašej peňaženke boli už utratené, napríklad ak používaš kópiu wallet.dat a mince označené v druhej kópií neboli označené ako utratené v tejto.</translation> </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="124"/> - <source>The recipient address is not valid, please recheck.</source> - <translation>Adresa príjemcu je neplatná, prosím, overte ju.</translation> - </message> </context> <context> <name>SendCoinsEntry</name> @@ -1201,143 +1224,143 @@ Adresa: %4</translation> <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="18"/> - <source>Open for %1 blocks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="20"/> + <location filename="../transactiondesc.cpp" line="22"/> <source>Open until %1</source> <translation>Otvorené do %1</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="28"/> + <location filename="../transactiondesc.cpp" line="30"/> <source>%1/unconfirmed</source> <translation>%1/nepotvrdené</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation>%1 potvrdení</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation><b>Stav:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation>, ešte nebola úspešne odoslaná</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>, odoslaná cez %1 nódu</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>, odoslaná cez %1 nód</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation><b>Dátum:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>Zdroj:</b> Generovaný<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>od:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="92"/> <source>unknown</source> <translation>neznámy</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation><b>Komu:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> - <source> (yours, label: </source> - <translation> (vaše, popis: </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation>(vaše)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation><b>Kredit:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> - <source>(%1 matures in %2 more blocks)</source> - <translation>(%1 dospeje o %2 blokov)</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation>(neprijaté)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation><b>Debet:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation><b>Transakčný poplatok:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>Suma netto:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>Správa:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>Komentár:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation>ID transakcie:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../transactiondesc.cpp" line="96"/> + <source> (yours, label: </source> + <translation> (vaše, popis: </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="20"/> + <source>Open for %1 blocks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="135"/> + <source>(%1 matures in %2 more blocks)</source> + <translation>(%1 dospeje o %2 blokov)</translation> + </message> </context> <context> <name>TransactionDescDialog</name> @@ -1355,9 +1378,33 @@ Adresa: %4</translation> <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="358"/> - <source>Mined</source> - <translation>Vyfárané</translation> + <location filename="../transactiontablemodel.cpp" line="599"/> + <source>Type of transaction.</source> + <translation>Typ transakcie.</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="356"/> + <source>Payment to yourself</source> + <translation>Platba sebe samému</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Date</source> + <translation>Dátum</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Type</source> + <translation>Typ</translation> + </message> + <message numerus="yes"> + <location filename="../transactiontablemodel.cpp" line="277"/> + <source>Open for %n block(s)</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="595"/> @@ -1370,16 +1417,6 @@ Adresa: %4</translation> <translation>Dátum a čas prijatia transakcie.</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="599"/> - <source>Type of transaction.</source> - <translation>Typ transakcie.</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="601"/> - <source>Destination address of transaction.</source> - <translation>Cieľová adresa transakcie.</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="603"/> <source>Amount removed from or added to balance.</source> <translation>Suma pridaná alebo odobraná k zostatku.</translation> @@ -1390,11 +1427,6 @@ Adresa: %4</translation> <translation>Adresa</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="349"/> - <source>Received with</source> - <translation>Prijaté s</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="351"/> <source>Received from</source> <translation>Prijaté od:</translation> @@ -1404,11 +1436,6 @@ Adresa: %4</translation> <source>Sent to</source> <translation>Odoslané na</translation> </message> - <message> - <location filename="../transactiontablemodel.cpp" line="356"/> - <source>Payment to yourself</source> - <translation>Platba sebe samému</translation> - </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="297"/> <source>Mined balance will be available in %n more blocks</source> @@ -1420,16 +1447,6 @@ Adresa: %4</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Date</source> - <translation>Dátum</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Type</source> - <translation>Typ</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="214"/> <source>Amount</source> <translation>Hodnota</translation> </message> @@ -1443,15 +1460,6 @@ Adresa: %4</translation> <source>Offline (%1 confirmations)</source> <translation>Offline (%1 potvrdení)</translation> </message> - <message numerus="yes"> - <location filename="../transactiontablemodel.cpp" line="277"/> - <source>Open for %n block(s)</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> - <numerusform></numerusform> - </translation> - </message> <message> <location filename="../transactiontablemodel.cpp" line="286"/> <source>Unconfirmed (%1 of %2 confirmations)</source> @@ -1473,33 +1481,47 @@ Adresa: %4</translation> <translation>Vypočítané ale neakceptované</translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="349"/> + <source>Received with</source> + <translation>Prijaté s</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="358"/> + <source>Mined</source> + <translation>Vyfárané</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="396"/> <source>(n/a)</source> <translation>(n/a)</translation> </message> + <message> + <location filename="../transactiontablemodel.cpp" line="601"/> + <source>Destination address of transaction.</source> + <translation>Cieľová adresa transakcie.</translation> + </message> </context> <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="55"/> - <location filename="../transactionview.cpp" line="71"/> - <source>All</source> - <translation>Všetko</translation> + <location filename="../transactionview.cpp" line="124"/> + <source>Copy address</source> + <translation>Kopírovať adresu</translation> </message> <message> - <location filename="../transactionview.cpp" line="56"/> - <source>Today</source> - <translation>Dnes</translation> + <location filename="../transactionview.cpp" line="61"/> + <source>Range...</source> + <translation>Rozsah...</translation> </message> <message> - <location filename="../transactionview.cpp" line="57"/> - <source>This week</source> - <translation>Tento týždeň</translation> + <location filename="../transactionview.cpp" line="72"/> + <source>Received with</source> + <translation>Prijaté s</translation> </message> <message> - <location filename="../transactionview.cpp" line="58"/> - <source>This month</source> - <translation>Tento mesiac</translation> + <location filename="../transactionview.cpp" line="74"/> + <source>Sent to</source> + <translation>Odoslané na</translation> </message> <message> <location filename="../transactionview.cpp" line="59"/> @@ -1512,9 +1534,9 @@ Adresa: %4</translation> <translation>Samému sebe</translation> </message> <message> - <location filename="../transactionview.cpp" line="78"/> - <source>Other</source> - <translation>Iné</translation> + <location filename="../transactionview.cpp" line="271"/> + <source>Comma separated file (*.csv)</source> + <translation>Čiarkou oddelovaný súbor (*.csv)</translation> </message> <message> <location filename="../transactionview.cpp" line="84"/> @@ -1522,6 +1544,11 @@ Adresa: %4</translation> <translation>Vložte adresu alebo popis pre vyhľadávanie</translation> </message> <message> + <location filename="../transactionview.cpp" line="58"/> + <source>This month</source> + <translation>Tento mesiac</translation> + </message> + <message> <location filename="../transactionview.cpp" line="279"/> <source>Confirmed</source> <translation>Potvrdené</translation> @@ -1537,51 +1564,21 @@ Adresa: %4</translation> <translation>Adresa</translation> </message> <message> - <location filename="../transactionview.cpp" line="289"/> - <source>Could not write to file %1.</source> - <translation>Nedalo sa zapisovať do súboru %1.</translation> - </message> - <message> <location filename="../transactionview.cpp" line="384"/> <source>Range:</source> <translation>Rozsah:</translation> </message> <message> - <location filename="../transactionview.cpp" line="392"/> - <source>to</source> - <translation>do</translation> - </message> - <message> <location filename="../transactionview.cpp" line="90"/> <source>Min amount</source> <translation>Min množstvo</translation> </message> <message> - <location filename="../transactionview.cpp" line="124"/> - <source>Copy address</source> - <translation>Kopírovať adresu</translation> - </message> - <message> <location filename="../transactionview.cpp" line="60"/> <source>This year</source> <translation>Tento rok</translation> </message> <message> - <location filename="../transactionview.cpp" line="61"/> - <source>Range...</source> - <translation>Rozsah...</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="72"/> - <source>Received with</source> - <translation>Prijaté s</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="74"/> - <source>Sent to</source> - <translation>Odoslané na</translation> - </message> - <message> <location filename="../transactionview.cpp" line="77"/> <source>Mined</source> <translation>Vyfárané</translation> @@ -1602,6 +1599,27 @@ Adresa: %4</translation> <translation>Kopírovať sumu</translation> </message> <message> + <location filename="../transactionview.cpp" line="55"/> + <location filename="../transactionview.cpp" line="71"/> + <source>All</source> + <translation>Všetko</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="56"/> + <source>Today</source> + <translation>Dnes</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="57"/> + <source>This week</source> + <translation>Tento týždeň</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="78"/> + <source>Other</source> + <translation>Iné</translation> + </message> + <message> <location filename="../transactionview.cpp" line="127"/> <source>Edit label</source> <translation>Editovať popis</translation> @@ -1612,11 +1630,6 @@ Adresa: %4</translation> <translation>Exportovať transakčné dáta</translation> </message> <message> - <location filename="../transactionview.cpp" line="271"/> - <source>Comma separated file (*.csv)</source> - <translation>Čiarkou oddelovaný súbor (*.csv)</translation> - </message> - <message> <location filename="../transactionview.cpp" line="281"/> <source>Type</source> <translation>Typ</translation> @@ -1641,11 +1654,21 @@ Adresa: %4</translation> <source>Error exporting</source> <translation>Chyba exportu</translation> </message> + <message> + <location filename="../transactionview.cpp" line="289"/> + <source>Could not write to file %1.</source> + <translation>Nedalo sa zapisovať do súboru %1.</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="392"/> + <source>to</source> + <translation>do</translation> + </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>Odosielanie...</translation> </message> @@ -1653,400 +1676,484 @@ Adresa: %4</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Password for JSON-RPC connections</source> - <translation>Heslo pre JSON-rPC spojenia</translation> + <location filename="../bitcoinstrings.cpp" line="107"/> + <source>This help message</source> + <translation>Táto pomocná správa</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation>Počúvať JSON-RPC spojeniam na <port> (predvolené: 8332)</translation> + <location filename="../bitcoinstrings.cpp" line="120"/> + <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> + <translation>Bolo potrebné prepísať peňaženku: dokončite reštartovaním Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> - <source>This help message</source> - <translation>Táto pomocná správa</translation> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>Error loading wallet.dat</source> + <translation>Chyba načítania wallet.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation>Chyba načítania wallet.dat: Peňaženka vyžaduje novšiu verziu Bitcoin</translation> + <location filename="../bitcoinstrings.cpp" line="42"/> + <source>Usage:</source> + <translation>Použitie:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> - <source>Loading addresses...</source> - <translation>Načítavanie adries...</translation> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="43"/> - <source>Run in the background as a daemon and accept commands</source> - <translation>Bežať na pozadí ako démon a prijímať príkazy</translation> + <source>Send command to -server or bitcoind</source> + <translation>Odoslať príkaz -server alebo bitcoind</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="44"/> - <source>Use the test network</source> - <translation>Použiť testovaciu sieť</translation> + <source>List commands</source> + <translation>Zoznam príkazov</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="45"/> + <source>Get help for a command</source> + <translation>Dostať pomoc pre príkaz</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="46"/> - <source>Prepend debug output with timestamp</source> - <translation>Pridať na začiatok ladiaceho výstupu časový údaj</translation> + <source>Options:</source> + <translation>Možnosti:</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="47"/> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Odoslať trace/debug informácie na konzolu namiesto debug.info žurnálu</translation> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation>Určiť súbor s nastaveniami (predvolené: bitcoin.conf)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Send trace/debug info to debugger</source> - <translation>Odoslať trace/debug informácie do ladiaceho programu</translation> + <location filename="../bitcoinstrings.cpp" line="52"/> + <source>Show splash screen on startup (default: 1)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> - <source>Username for JSON-RPC connections</source> - <translation>Užívateľské meno pre JSON-RPC spojenia</translation> + <location filename="../bitcoinstrings.cpp" line="54"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Allow JSON-RPC connections from specified IP address</source> - <translation>Povoliť JSON-RPC spojenia z určenej IP adresy.</translation> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>Poslať príkaz nóde bežiacej na <ip> (predvolené: 127.0.0.1)</translation> + <location filename="../bitcoinstrings.cpp" line="59"/> + <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> + <translation>Načúvať spojeniam na <port> (prednastavené: 8333 alebo testovacia sieť: 18333)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation>Nastaviť zásobu adries na <n> (predvolené: 100)</translation> + <location filename="../bitcoinstrings.cpp" line="60"/> + <source>Maintain at most <n> connections to peers (default: 125)</source> + <translation>Udržiavať maximálne <n> spojení (predvolené: 125)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="63"/> + <source>Find peers using internet relay chat (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="64"/> + <source>Accept connections from outside (default: 1)</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="65"/> - <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>Použiť OpenSSL (https) pre JSON-RPC spojenia</translation> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="66"/> - <source>Server certificate file (default: server.cert)</source> - <translation>Súbor s certifikátom servra (predvolené: server.cert)</translation> + <source>Find peers using DNS lookup (default: 1)</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="67"/> - <source>Server private key (default: server.pem)</source> - <translation>Súkromný kľúč servra (predvolené: server.pem)</translation> + <source>Threshold for disconnecting misbehaving peers (default: 100)</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>Prijateľné šifry (predvolené: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <location filename="../bitcoinstrings.cpp" line="71"/> + <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> - <source>Error loading wallet.dat: Wallet corrupted</source> - <translation>Chyba načítania wallet.dat: Peňaženka je poškodená</translation> + <location filename="../bitcoinstrings.cpp" line="72"/> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> - <source>Rescan the block chain for missing wallet transactions</source> - <translation>Znovu skenovať reťaz blokov pre chýbajúce transakcie</translation> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Bitcoin version</source> - <translation>Bitcoin verzia</translation> + <location filename="../bitcoinstrings.cpp" line="78"/> + <source>Accept command line and JSON-RPC commands</source> + <translation>Prijímať príkazy z príkazového riadku a JSON-RPC</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>Určiť súbor pid (predvolené: bitcoind.pid)</translation> + <location filename="../bitcoinstrings.cpp" line="90"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Generate coins</source> - <translation>Počítaj bitcoins</translation> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Upgrade wallet to latest format</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Don't generate coins</source> - <translation>Nepočítaj bitcoins</translation> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source>How many blocks to check at startup (default: 2500, 0 = all)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Specify data directory</source> - <translation>Určiť priečinok s dátami</translation> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>How thorough the block verification is (0-6, default: 1)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Určiť aut spojenia (v milisekundách)</translation> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> - <source>Loading wallet...</source> - <translation>Načítavam peňaženku...</translation> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> + <location filename="../bitcoinstrings.cpp" line="116"/> <source>Error loading blkindex.dat</source> <translation>Chyba načítania blkindex.dat</translation> </message> <message> + <location filename="../bitcoinstrings.cpp" line="118"/> + <source>Error loading wallet.dat: Wallet corrupted</source> + <translation>Chyba načítania wallet.dat: Peňaženka je poškodená</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="133"/> + <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../bitcoinstrings.cpp" line="82"/> - <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation>Bolo potrebné prepísať peňaženku: dokončite reštartovaním Bitcoin</translation> + <source>Prepend debug output with timestamp</source> + <translation>Pridať na začiatok ladiaceho výstupu časový údaj</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> - <source>Error loading wallet.dat</source> - <translation>Chyba načítania wallet.dat</translation> + <location filename="../bitcoinstrings.cpp" line="84"/> + <source>Send trace/debug info to debugger</source> + <translation>Odoslať trace/debug informácie do ladiaceho programu</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="88"/> - <source>Done loading</source> - <translation>Dokončené načítavanie</translation> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation>Povoliť JSON-RPC spojenia z určenej IP adresy.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> - <source>Loading block index...</source> - <translation>Načítavanie zoznamu blokov...</translation> + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>Username for JSON-RPC connections</source> + <translation>Užívateľské meno pre JSON-RPC spojenia</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Usage:</source> - <translation>Použitie:</translation> + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>Počúvať JSON-RPC spojeniam na <port> (predvolené: 8332)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Send command to -server or bitcoind</source> - <translation>Odoslať príkaz -server alebo bitcoind</translation> + <location filename="../bitcoinstrings.cpp" line="86"/> + <source>Password for JSON-RPC connections</source> + <translation>Heslo pre JSON-rPC spojenia</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> - <source>List commands</source> - <translation>Zoznam príkazov</translation> + <location filename="../bitcoinstrings.cpp" line="119"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> + <translation>Chyba načítania wallet.dat: Peňaženka vyžaduje novšiu verziu Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Get help for a command</source> - <translation>Dostať pomoc pre príkaz</translation> + <location filename="../bitcoinstrings.cpp" line="113"/> + <source>Loading addresses...</source> + <translation>Načítavanie adries...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Options:</source> - <translation>Možnosti:</translation> + <location filename="../bitcoinstrings.cpp" line="79"/> + <source>Run in the background as a daemon and accept commands</source> + <translation>Bežať na pozadí ako démon a prijímať príkazy</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify configuration file (default: bitcoin.conf)</source> - <translation>Určiť súbor s nastaveniami (predvolené: bitcoin.conf)</translation> + <location filename="../bitcoinstrings.cpp" line="80"/> + <source>Use the test network</source> + <translation>Použiť testovaciu sieť</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Start minimized</source> - <translation>Spustiť minimalizované</translation> + <location filename="../bitcoinstrings.cpp" line="83"/> + <source>Send trace/debug info to console instead of debug.log file</source> + <translation>Odoslať trace/debug informácie na konzolu namiesto debug.info žurnálu</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Show splash screen on startup (default: 1)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>Poslať príkaz nóde bežiacej na <ip> (predvolené: 127.0.0.1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>Nastaviť zásobu adries na <n> (predvolené: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation>Načúvať spojeniam na <port> (prednastavené: 8333 alebo testovacia sieť: 18333)</translation> + <location filename="../bitcoinstrings.cpp" line="101"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>Použiť OpenSSL (https) pre JSON-RPC spojenia</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Maintain at most <n> connections to peers (default: 125)</source> - <translation>Udržiavať maximálne <n> spojení (predvolené: 125)</translation> + <location filename="../bitcoinstrings.cpp" line="102"/> + <source>Server certificate file (default: server.cert)</source> + <translation>Súbor s certifikátom servra (predvolené: server.cert)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Add a node to connect to and attempt to keep the connection open</source> - <translation>Pridať nódu a pripojiť sa and attempt to keep the connection open</translation> + <location filename="../bitcoinstrings.cpp" line="103"/> + <source>Server private key (default: server.pem)</source> + <translation>Súkromný kľúč servra (predvolené: server.pem)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Connect only to the specified node</source> - <translation>Pripojiť sa len k určenej nóde</translation> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>Prijateľné šifry (predvolené: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Find peers using internet relay chat (default: 0)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation>Znovu skenovať reťaz blokov pre chýbajúce transakcie</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Accept connections from outside (default: 1)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="41"/> + <source>Bitcoin version</source> + <translation>Bitcoin verzia</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="49"/> + <source>Generate coins</source> + <translation>Počítaj bitcoins</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Find peers using DNS lookup (default: 1)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="50"/> + <source>Don't generate coins</source> + <translation>Nepočítaj bitcoins</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Threshold for disconnecting misbehaving peers (default: 100)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Specify data directory</source> + <translation>Určiť priečinok s dátami</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Specify connection timeout (in milliseconds)</source> + <translation>Určiť aut spojenia (v milisekundách)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation type="unfinished">Použitie</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Loading wallet...</source> + <translation>Načítavam peňaženku...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Use Universal Plug and Play to map the listening port (default: 1)</source> - <translation type="unfinished">Skúsiť použiť UPnP pre mapovanie počúvajúceho portu (default: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>Done loading</source> + <translation>Dokončené načítavanie</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Use Universal Plug and Play to map the listening port (default: 0)</source> - <translation type="unfinished">Skúsiť použiť UPnP pre mapovanie počúvajúceho portu (default: 0)</translation> + <location filename="../bitcoinstrings.cpp" line="115"/> + <source>Loading block index...</source> + <translation>Načítavanie zoznamu blokov...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Poplatok za kB ktorý treba pridať k odoslanej transakcii</translation> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> - <source>Accept command line and JSON-RPC commands</source> - <translation>Prijímať príkazy z príkazového riadku a JSON-RPC</translation> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> - <source>Output extra debugging information</source> - <translation>Produkovať extra ladiace informácie</translation> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">Chyba: Zlyhalo vytvorenie transakcie.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">Chyba: Transakcia bola odmietnutá. Toto sa môže stať ak niektoré z mincí vo vašej peňaženke boli už utratené, napríklad ak používaš kópiu wallet.dat a mince označené v druhej kópií neboli označené ako utratené v tejto.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> - <source>Upgrade wallet to latest format</source> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> - <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="51"/> + <source>Start minimized</source> + <translation>Spustiť minimalizované</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="61"/> - <source>How thorough the block verification is (0-6, default: 1)</source> - <translation type="unfinished"></translation> + <source>Add a node to connect to and attempt to keep the connection open</source> + <translation>Pridať nódu a pripojiť sa and attempt to keep the connection open</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="62"/> - <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation>SSL možnosť: (pozrite Bitcoin Wiki pre návod na nastavenie SSL)</translation> + <source>Connect only to the specified node</source> + <translation>Pripojiť sa len k určenej nóde</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> + <location filename="../bitcoinstrings.cpp" line="73"/> + <source>Use Universal Plug and Play to map the listening port (default: 1)</source> + <translation type="unfinished">Skúsiť použiť UPnP pre mapovanie počúvajúceho portu (default: 1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="74"/> + <source>Use Universal Plug and Play to map the listening port (default: 0)</source> + <translation type="unfinished">Skúsiť použiť UPnP pre mapovanie počúvajúceho portu (default: 0)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> + <source>Fee per KB to add to transactions you send</source> + <translation>Poplatok za kB ktorý treba pridať k odoslanej transakcii</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="81"/> + <source>Output extra debugging information</source> + <translation>Produkovať extra ladiace informácie</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="114"/> <source>Error loading addr.dat</source> <translation>Chyba načítania addr.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> + <location filename="../bitcoinstrings.cpp" line="123"/> <source>Cannot initialize keypool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> + <location filename="../bitcoinstrings.cpp" line="124"/> <source>Cannot write default address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> + <location filename="../bitcoinstrings.cpp" line="125"/> <source>Rescanning...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation>Neplatná adresa proxy</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> + <location filename="../bitcoinstrings.cpp" line="128"/> <source>Invalid amount for -paytxfee=<amount></source> <translation>Neplatná suma pre -paytxfee=<amount></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> - <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> - <translation>Varovanie: -paytxfee je nastavené veľmi vysoko. Toto sú transakčné poplatky ktoré zaplatíte ak odošlete transakciu.</translation> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Warning: Disk space is low</source> + <translation>Varovanie: Málo voľného miesta na disku</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation>Chyba: zlyhalo CreateThread(StartNode)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> - <translation>Varovanie: Málo voľného miesta na disku</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="23"/> + <location filename="../bitcoinstrings.cpp" line="57"/> <source>Connect through socks4 proxy</source> <translation>Pripojenie cez socks4 proxy</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> + <location filename="../bitcoinstrings.cpp" line="58"/> <source>Allow DNS lookups for addnode and connect</source> <translation>Povoliť vyhľadávanie DNS pre pridanie nódy a spojenie</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> - <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Odosielanie...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>Neplatná suma</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>beta</translation> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation>Chyba</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>Určiť súbor pid (predvolené: bitcoind.pid)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="98"/> + <source> +SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation>SSL možnosť: (pozrite Bitcoin Wiki pre návod na nastavenie SSL)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="129"/> + <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> + <translation>Varovanie: -paytxfee je nastavené veľmi vysoko. Toto sú transakčné poplatky ktoré zaplatíte ak odošlete transakciu.</translation> </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/bitcoin_sr.ts index ff6606bb6f..1de9a2660e 100644 --- a/src/qt/locale/bitcoin_sr.ts +++ b/src/qt/locale/bitcoin_sr.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> верзија</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -89,42 +89,42 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Избриши</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>Избриши</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation>Извоз података из адресара</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation>Зарезом одвојене вредности (*.csv)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>Грешка током извоза</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation>Није могуће писати у фајл %1.</translation> </message> @@ -293,158 +293,137 @@ Are you sure you wish to encrypt your wallet?</source> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="73"/> + <location filename="../bitcoingui.cpp" line="71"/> <source>Bitcoin Wallet</source> <translation>Bitcoin новчаник</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> - <source>Synchronizing with network...</source> - <translation>Синхронизација са мрежом у току...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Синхронизовање ланца блоква је у току</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="187"/> - <source>&Overview</source> - <translation>&Општи преглед</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="188"/> - <source>Show general overview of wallet</source> - <translation>Погледајте општи преглед новчаника</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="193"/> - <source>&Transactions</source> - <translation>&Трансакције</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="194"/> - <source>Browse transaction history</source> - <translation>Претражите историјат трансакција</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="199"/> + <location filename="../bitcoingui.cpp" line="197"/> <source>&Address Book</source> <translation>&Адресар</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> - <source>Edit the list of stored addresses and labels</source> - <translation>Уредите запамћене адресе и њихове етикете</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation>П&римање новца</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> - <translation>&Извоз...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation>Прегледајте листу адреса на којима прихватате уплате</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="255"/> - <source>Encrypt or decrypt wallet</source> - <translation>Шифровање и дешифровање новчаника</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="260"/> - <source>Change the passphrase used for wallet encryption</source> - <translation>Мењање лозинке којом се шифрује новчаник</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="211"/> - <source>&Send coins</source> - <translation>&Слање новца</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="217"/> + <location filename="../bitcoingui.cpp" line="215"/> <source>Sign &message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> + <location filename="../bitcoingui.cpp" line="216"/> <source>Prove you control an address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> + <location filename="../bitcoingui.cpp" line="235"/> <source>E&xit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Приказује прозор Bitcoin-а</translation> + <location filename="../bitcoingui.cpp" line="236"/> + <source>Quit application</source> + <translation>Напустите програм</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> + <location filename="../bitcoingui.cpp" line="240"/> + <source>Show information about Bitcoin</source> + <translation>Прегледајте информације о Bitcoin-у</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="245"/> + <source>&Options...</source> + <translation>П&оставке...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>Изаберите могућности bitcoin-а</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="251"/> <source>Export the data in the current tab to a file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> + <location filename="../bitcoingui.cpp" line="255"/> <source>&Backup Wallet</source> <translation type="unfinished">&Backup новчаника</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> + <location filename="../bitcoingui.cpp" line="256"/> <source>Backup wallet to another location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation>Промени &лозинку</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="281"/> <source>&File</source> <translation>&Фајл</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> + <location filename="../bitcoingui.cpp" line="290"/> <source>&Settings</source> <translation>&Подешавања</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> + <location filename="../bitcoingui.cpp" line="296"/> <source>&Help</source> <translation>П&омоћ</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> + <location filename="../bitcoingui.cpp" line="303"/> <source>Tabs toolbar</source> <translation>Трака са картицама</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> + <location filename="../bitcoingui.cpp" line="314"/> <source>Actions toolbar</source> <translation>Трака са алаткама</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>Преузето је %1 од укупно %2 блокова историјата трансакција.</translation> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="418"/> + <source>bitcoin-qt</source> + <translation>bitcoin-qt</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>Преузето је %1 од укупно %2 блокова историјата трансакција (%3% done).</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> + <location filename="../bitcoingui.cpp" line="531"/> <source>Downloaded %1 blocks of transaction history.</source> <translation>Преузето је %1 блокова историјата трансакција.</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation> <numerusform>пре %n секунд</numerusform> @@ -453,7 +432,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation> <numerusform>пре %n минут</numerusform> @@ -462,7 +441,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation> <numerusform>пре %n сат</numerusform> @@ -471,7 +450,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>пре %n дан</numerusform> @@ -480,121 +459,145 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> - <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="564"/> + <source>Up to date</source> + <translation>Ажурно</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Backup Wallet</source> - <translation>Backup новчаника</translation> + <location filename="../bitcoingui.cpp" line="569"/> + <source>Catching up...</source> + <translation>Ажурирање у току...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="632"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> - <source>Up to date</source> - <translation>Ажурно</translation> + <location filename="../bitcoingui.cpp" line="506"/> + <source>Synchronizing with network...</source> + <translation>Синхронизација са мрежом у току...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> - <source>Catching up...</source> - <translation>Ажурирање у току...</translation> + <location filename="../bitcoingui.cpp" line="664"/> + <source>Incoming transaction</source> + <translation>Придошла трансакција</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> - <source>Last received block was generated %1.</source> - <translation>Последњи примљени блок је направљен %1.</translation> + <location filename="../bitcoingui.cpp" line="185"/> + <source>&Overview</source> + <translation>&Општи преглед</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> - <source>Sent transaction</source> - <translation>Послана трансакција</translation> + <location filename="../bitcoingui.cpp" line="186"/> + <source>Show general overview of wallet</source> + <translation>Погледајте општи преглед новчаника</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="191"/> + <source>&Transactions</source> + <translation>&Трансакције</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> - <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation>Новчаник јс <b>шифрован</b> и тренутно <b>откључан</b></translation> + <location filename="../bitcoingui.cpp" line="192"/> + <source>Browse transaction history</source> + <translation>Претражите историјат трансакција</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> - <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation>Новчаник јс <b>шифрован</b> и тренутно <b>закључан</b></translation> + <location filename="../bitcoingui.cpp" line="250"/> + <source>&Export...</source> + <translation>&Извоз...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> - <source>Send coins to a bitcoin address</source> - <translation>Пошаљите новац на bitcoin адресу</translation> + <location filename="../bitcoingui.cpp" line="198"/> + <source>Edit the list of stored addresses and labels</source> + <translation>Уредите запамћене адресе и њихове етикете</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> - <source>Quit application</source> - <translation>Напустите програм</translation> + <location filename="../bitcoingui.cpp" line="253"/> + <source>Encrypt or decrypt wallet</source> + <translation>Шифровање и дешифровање новчаника</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>&О %1-у</translation> + <location filename="../bitcoingui.cpp" line="258"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>Мењање лозинке којом се шифрује новчаник</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> - <source>Show information about Bitcoin</source> - <translation>Прегледајте информације о Bitcoin-у</translation> + <location filename="../bitcoingui.cpp" line="636"/> + <source>Sending...</source> + <translation>Слање...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> - <source>About &Qt</source> - <translation>О &Qt-у</translation> + <location filename="../bitcoingui.cpp" line="665"/> + <source>Date: %1 +Amount: %2 +Type: %3 +Address: %4 +</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> - <source>Show information about Qt</source> - <translation>Прегледајте информације о Qt-у</translation> + <location filename="../bitcoingui.cpp" line="798"/> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation>Новчаник јс <b>шифрован</b> и тренутно <b>закључан</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> - <source>&Options...</source> - <translation>П&оставке...</translation> + <location filename="../bitcoingui.cpp" line="209"/> + <source>&Send coins</source> + <translation>&Слање новца</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>Изаберите могућности bitcoin-а</translation> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation type="unfinished">Приказује прозор Bitcoin-а</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>Отвори &Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="790"/> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation>Новчаник јс <b>шифрован</b> и тренутно <b>откључан</b></translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation>&Шифровање новчаника</translation> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Backup Wallet</source> + <translation>Backup новчаника</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="577"/> + <source>Last received block was generated %1.</source> + <translation>Последњи примљени блок је направљен %1.</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="663"/> + <source>Sent transaction</source> + <translation>Послана трансакција</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> + <location filename="../bitcoingui.cpp" line="482"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n активна веза са Bitcoin мрежом</numerusform> @@ -603,27 +606,32 @@ Address: %4 </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>Промени &лозинку</translation> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Send coins to a bitcoin address</source> + <translation>Пошаљите новац на bitcoin адресу</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> - <source>Incoming transaction</source> - <translation>Придошла трансакција</translation> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>&О %1-у</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> - <source>bitcoin-qt</source> - <translation>bitcoin-qt</translation> + <location filename="../bitcoingui.cpp" line="242"/> + <source>About &Qt</source> + <translation>О &Qt-у</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> - <source>Sending...</source> - <translation>Слање...</translation> + <location filename="../bitcoingui.cpp" line="243"/> + <source>Show information about Qt</source> + <translation>Прегледајте информације о Qt-у</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="252"/> + <source>&Encrypt Wallet</source> + <translation>&Шифровање новчаника</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -631,22 +639,22 @@ Address: %4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&Јединица за приказивање износа: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished"></translation> </message> @@ -722,85 +730,95 @@ Address: %4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="180"/> - <source>Map port using &UPnP</source> + <source>M&inimize on close</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="181"/> - <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="185"/> - <source>M&inimize on close</source> + <source>Map port using &UPnP</source> <translation type="unfinished"></translation> </message> <message> <location filename="../optionsdialog.cpp" line="186"/> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> + <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessagePage</name> @@ -895,17 +913,17 @@ Address: %4 <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>Поставке</translation> </message> @@ -1006,17 +1024,22 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation type="unfinished"></translation> </message> @@ -1198,140 +1221,140 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="18"/> + <location filename="../transactiondesc.cpp" line="20"/> <source>Open for %1 blocks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> + <location filename="../transactiondesc.cpp" line="22"/> <source>Open until %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="28"/> + <location filename="../transactiondesc.cpp" line="30"/> <source>%1/unconfirmed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="92"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation type="unfinished"></translation> </message> @@ -1478,6 +1501,16 @@ Address: %4 <context> <name>TransactionView</name> <message> + <location filename="../transactionview.cpp" line="289"/> + <source>Could not write to file %1.</source> + <translation>Није могуће писати у фајл %1.</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="271"/> + <source>Comma separated file (*.csv)</source> + <translation>Зарезом одвојене вредности (*.csv)</translation> + </message> + <message> <location filename="../transactionview.cpp" line="55"/> <location filename="../transactionview.cpp" line="71"/> <source>All</source> @@ -1579,11 +1612,6 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../transactionview.cpp" line="271"/> - <source>Comma separated file (*.csv)</source> - <translation>Зарезом одвојене вредности (*.csv)</translation> - </message> - <message> <location filename="../transactionview.cpp" line="279"/> <source>Confirmed</source> <translation type="unfinished"></translation> @@ -1624,11 +1652,6 @@ Address: %4 <translation>Грешка током извоза</translation> </message> <message> - <location filename="../transactionview.cpp" line="289"/> - <source>Could not write to file %1.</source> - <translation>Није могуће писати у фајл %1.</translation> - </message> - <message> <location filename="../transactionview.cpp" line="384"/> <source>Range:</source> <translation type="unfinished"></translation> @@ -1642,7 +1665,7 @@ Address: %4 <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>Слање у току...</translation> </message> @@ -1650,400 +1673,484 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> + <location filename="../bitcoinstrings.cpp" line="117"/> <source>Loading wallet...</source> <translation>Новчаник се учитава...</translation> </message> <message> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Слање у току...</translation> + </message> + <message> <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Warning: Disk space is low</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="41"/> <source>Bitcoin version</source> <translation>Bitcoin верзија</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> + <location filename="../bitcoinstrings.cpp" line="42"/> <source>Usage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> + <location filename="../bitcoinstrings.cpp" line="43"/> <source>Send command to -server or bitcoind</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> + <location filename="../bitcoinstrings.cpp" line="44"/> <source>List commands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> + <location filename="../bitcoinstrings.cpp" line="45"/> <source>Get help for a command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> + <location filename="../bitcoinstrings.cpp" line="46"/> <source>Options:</source> <translation>Поставке</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> + <location filename="../bitcoinstrings.cpp" line="47"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> + <location filename="../bitcoinstrings.cpp" line="48"/> <source>Specify pid file (default: bitcoind.pid)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> + <location filename="../bitcoinstrings.cpp" line="49"/> <source>Generate coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> + <location filename="../bitcoinstrings.cpp" line="50"/> <source>Don't generate coins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> + <location filename="../bitcoinstrings.cpp" line="51"/> <source>Start minimized</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> + <location filename="../bitcoinstrings.cpp" line="52"/> <source>Show splash screen on startup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> + <location filename="../bitcoinstrings.cpp" line="53"/> <source>Specify data directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> + <location filename="../bitcoinstrings.cpp" line="54"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="56"/> <source>Specify connection timeout (in milliseconds)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> + <location filename="../bitcoinstrings.cpp" line="57"/> <source>Connect through socks4 proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> + <location filename="../bitcoinstrings.cpp" line="58"/> <source>Allow DNS lookups for addnode and connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> + <location filename="../bitcoinstrings.cpp" line="59"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> + <location filename="../bitcoinstrings.cpp" line="60"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> + <location filename="../bitcoinstrings.cpp" line="61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> + <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> + <location filename="../bitcoinstrings.cpp" line="63"/> <source>Find peers using internet relay chat (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> + <location filename="../bitcoinstrings.cpp" line="65"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> + <location filename="../bitcoinstrings.cpp" line="66"/> <source>Find peers using DNS lookup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> + <location filename="../bitcoinstrings.cpp" line="67"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> + <location filename="../bitcoinstrings.cpp" line="68"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> <source>Fee per KB to add to transactions you send</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> + <location filename="../bitcoinstrings.cpp" line="78"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> + <location filename="../bitcoinstrings.cpp" line="79"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> + <location filename="../bitcoinstrings.cpp" line="80"/> <source>Use the test network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> + <location filename="../bitcoinstrings.cpp" line="81"/> <source>Output extra debugging information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> + <location filename="../bitcoinstrings.cpp" line="82"/> <source>Prepend debug output with timestamp</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> + <location filename="../bitcoinstrings.cpp" line="83"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> + <location filename="../bitcoinstrings.cpp" line="84"/> <source>Send trace/debug info to debugger</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> + <location filename="../bitcoinstrings.cpp" line="85"/> <source>Username for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> + <location filename="../bitcoinstrings.cpp" line="86"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> + <location filename="../bitcoinstrings.cpp" line="87"/> <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> + <location filename="../bitcoinstrings.cpp" line="88"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> + <location filename="../bitcoinstrings.cpp" line="89"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> + <location filename="../bitcoinstrings.cpp" line="90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> + <location filename="../bitcoinstrings.cpp" line="93"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> + <location filename="../bitcoinstrings.cpp" line="94"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> + <location filename="../bitcoinstrings.cpp" line="95"/> <source>Rescan the block chain for missing wallet transactions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> + <location filename="../bitcoinstrings.cpp" line="96"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> + <location filename="../bitcoinstrings.cpp" line="97"/> <source>How thorough the block verification is (0-6, default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> + <location filename="../bitcoinstrings.cpp" line="101"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> + <location filename="../bitcoinstrings.cpp" line="102"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> + <location filename="../bitcoinstrings.cpp" line="103"/> <source>Server private key (default: server.pem)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> + <location filename="../bitcoinstrings.cpp" line="104"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> + <location filename="../bitcoinstrings.cpp" line="107"/> <source>This help message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="113"/> <source>Loading addresses...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> + <location filename="../bitcoinstrings.cpp" line="114"/> <source>Error loading addr.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> + <location filename="../bitcoinstrings.cpp" line="115"/> <source>Loading block index...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> + <location filename="../bitcoinstrings.cpp" line="116"/> <source>Error loading blkindex.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> + <location filename="../bitcoinstrings.cpp" line="118"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> + <location filename="../bitcoinstrings.cpp" line="119"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> + <location filename="../bitcoinstrings.cpp" line="120"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> + <location filename="../bitcoinstrings.cpp" line="121"/> <source>Error loading wallet.dat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> + <location filename="../bitcoinstrings.cpp" line="123"/> <source>Cannot initialize keypool</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> + <location filename="../bitcoinstrings.cpp" line="124"/> <source>Cannot write default address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> + <location filename="../bitcoinstrings.cpp" line="125"/> <source>Rescanning...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> + <location filename="../bitcoinstrings.cpp" line="126"/> <source>Done loading</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> + <location filename="../bitcoinstrings.cpp" line="128"/> <source>Invalid amount for -paytxfee=<amount></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> + <location filename="../bitcoinstrings.cpp" line="129"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="96"/> + <location filename="../bitcoinstrings.cpp" line="133"/> <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../bitcoinstrings.cpp" line="99"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation type="unfinished"></translation> - </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts index 222e12c0b0..f5d48ce2b2 100644 --- a/src/qt/locale/bitcoin_sv.ts +++ b/src/qt/locale/bitcoin_sv.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b>-version</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -95,44 +95,44 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation>Visa &QR-kod</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> - <source>Copy address</source> - <translation>Kopiera adress</translation> + <location filename="../addressbookpage.cpp" line="66"/> + <source>Copy label</source> + <translation>Kopiera etikett</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation>Editera</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>Ta bort</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation>Exportera Adressbok</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation>Kommaseparerad fil (*.csv)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>Fel vid export</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation>Kunde inte skriva till filen %1.</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> - <source>Copy label</source> - <translation>Kopiera etikett</translation> + <location filename="../addressbookpage.cpp" line="65"/> + <source>Copy address</source> + <translation>Kopiera adress</translation> </message> </context> <context> @@ -156,6 +156,11 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <context> <name>AskPassphraseDialog</name> <message> + <location filename="../forms/askpassphrasedialog.ui" line="26"/> + <source>Dialog</source> + <translation>Dialog</translation> + </message> + <message> <location filename="../forms/askpassphrasedialog.ui" line="47"/> <source>Enter passphrase</source> <translation>Ange lösenord</translation> @@ -186,11 +191,6 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation>Kryptera plånbok</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="26"/> - <source>Dialog</source> - <translation>Dialog</translation> - </message> - <message> <location filename="../askpassphrasedialog.cpp" line="38"/> <source>This operation needs your wallet passphrase to unlock the wallet.</source> <translation>Denna operation behöver din plånboks lösenord för att låsa upp plånboken.</translation> @@ -298,220 +298,172 @@ Are you sure you wish to encrypt your wallet?</source> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="247"/> - <source>&Options...</source> - <translation>&Alternativ...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="255"/> + <location filename="../bitcoingui.cpp" line="253"/> <source>Encrypt or decrypt wallet</source> <translation>Kryptera eller dekryptera plånbok</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> + <location filename="../bitcoingui.cpp" line="506"/> <source>Synchronizing with network...</source> <translation>Synkroniserar med nätverk...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Synkronisering av blockkedja pågår</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="187"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>&Overview</source> <translation>&Översikt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="71"/> + <source>Bitcoin Wallet</source> + <translation>Bitcoin-plånbok</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="186"/> <source>Show general overview of wallet</source> <translation>Visa översiktsvy av plånbok</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="191"/> + <source>&Transactions</source> + <translation>&Transaktioner</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="192"/> <source>Browse transaction history</source> <translation>Bläddra i transaktionshistorik</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> + <location filename="../bitcoingui.cpp" line="203"/> + <source>&Receive coins</source> + <translation>&Ta emot bitcoins</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="209"/> + <source>&Send coins</source> + <translation>&Skicka bitcoins</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="210"/> <source>Send coins to a bitcoin address</source> <translation>Skicka bitcoins till en bitcoinadress</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> + <location filename="../bitcoingui.cpp" line="215"/> + <source>Sign &message</source> + <translation>Signera &meddelande</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="216"/> <source>Prove you control an address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>&Om %1</translation> + <location filename="../bitcoingui.cpp" line="235"/> + <source>E&xit</source> + <translation>&Avsluta</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>Öppna &Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="252"/> + <source>&Encrypt Wallet</source> + <translation>&Kryptera plånbok</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Visa Bitcoin-fönster</translation> + <location filename="../bitcoingui.cpp" line="255"/> + <source>&Backup Wallet</source> + <translation>&Säkerhetskopiera Plånbok</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>Laddat ner %1 av %2 block från transaktionshistoriken.</translation> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation>&Byt lösenfras</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> + <location filename="../bitcoingui.cpp" line="531"/> <source>Downloaded %1 blocks of transaction history.</source> <translation>Laddat ner %1 block från transaktionshistoriken.</translation> </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> - <source>%n second(s) ago</source> - <translation> - <numerusform>%n sekund sedan</numerusform> - <numerusform>%n sekunder sedan</numerusform> - </translation> + <message> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation>Visa/Göm &Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> + <location filename="../bitcoingui.cpp" line="256"/> <source>Backup wallet to another location</source> <translation>Säkerhetskopiera plånboken till en annan plats</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> - <source>&Help</source> - <translation>&Hjälp</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation>Visa listan med adresser för att ta emot betalningar</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> - <source>Backup Failed</source> - <translation>Säkerhetskopiering misslyckades</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="534"/> - <source>Up to date</source> - <translation>Uppdaterad</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="615"/> - <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="648"/> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Datum: %1 -Belopp: %2 -Typ: %3 -Adress: %4 -</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Denna plånbok är <b>krypterad</b> och för närvarande <b>olåst</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> - <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation>Denna plånbok är <b>krypterad</b> och för närvarande <b>låst</b></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="193"/> - <source>&Transactions</source> - <translation>&Transaktioner</translation> + <location filename="../bitcoingui.cpp" line="198"/> + <source>Edit the list of stored addresses and labels</source> + <translation>Redigera listan med lagrade adresser och etiketter</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> - <source>Quit application</source> - <translation>Avsluta programmet</translation> + <location filename="../bitcoingui.cpp" line="197"/> + <source>&Address Book</source> + <translation>&Adressbok</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> + <location filename="../bitcoingui.cpp" line="240"/> <source>Show information about Bitcoin</source> <translation>Visa information om Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> - <source>Show information about Qt</source> - <translation>Visa information om Qt</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="244"/> - <source>About &Qt</source> - <translation>Om &Qt</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> - <translation>&Exportera...</translation> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>&Om %1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> + <location filename="../bitcoingui.cpp" line="251"/> <source>Export the data in the current tab to a file</source> <translation>Exportera informationen i den nuvarande fliken till en fil</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> + <location filename="../bitcoingui.cpp" line="281"/> <source>&File</source> <translation>&Arkiv</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> + <location filename="../bitcoingui.cpp" line="303"/> <source>Tabs toolbar</source> <translation>Verktygsfält för Tabbar</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> + <location filename="../bitcoingui.cpp" line="258"/> <source>Change the passphrase used for wallet encryption</source> <translation>Byt lösenord för kryptering av plånbok</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> + <location filename="../bitcoingui.cpp" line="290"/> <source>&Settings</source> <translation>&Inställningar</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> + <location filename="../bitcoingui.cpp" line="314"/> <source>Actions toolbar</source> <translation>Verktygsfältet för Handlingar</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> + <location filename="../bitcoingui.cpp" line="327"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> - <source>%n active connection(s) to Bitcoin network</source> - <translation> - <numerusform>%n aktiv anslutning till Bitcoin-nätverket</numerusform> - <numerusform>%n aktiva anslutningar till Bitcoin-nätverket</numerusform> - </translation> - </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> - <source>%n minute(s) ago</source> - <translation> - <numerusform>%n minut sedan</numerusform> - <numerusform>%n minuter sedan</numerusform> - </translation> + <message> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation>Bitcoin-klient</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation> <numerusform>%n timme sedan</numerusform> @@ -519,7 +471,7 @@ Adress: %4 </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>%n dag sedan</numerusform> @@ -527,107 +479,162 @@ Adress: %4 </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> - <source>Catching up...</source> - <translation>Hämtar senaste...</translation> + <location filename="../bitcoingui.cpp" line="296"/> + <source>&Help</source> + <translation>&Hjälp</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> - <source>Last received block was generated %1.</source> - <translation>Senast mottagna block genererades %1.</translation> + <location filename="../bitcoingui.cpp" line="824"/> + <source>Backup Failed</source> + <translation>Säkerhetskopiering misslyckades</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> - <source>Sent transaction</source> - <translation>Transaktion skickad</translation> + <location filename="../bitcoingui.cpp" line="236"/> + <source>Quit application</source> + <translation>Avsluta programmet</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> + <location filename="../bitcoingui.cpp" line="632"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="664"/> <source>Incoming transaction</source> <translation>Inkommande transaktion</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Backup Wallet</source> <translation>Säkerhetskopiera Plånbok</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation>Plånboks-data (*.dat)</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation>Det inträffade ett fel när plånboken skulle sparas till den nya platsen.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> - <source>&Receive coins</source> - <translation>&Ta emot bitcoins</translation> + <location filename="../bitcoingui.cpp" line="242"/> + <source>About &Qt</source> + <translation>Om &Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> - <source>Edit the list of stored addresses and labels</source> - <translation>Redigera listan med lagrade adresser och etiketter</translation> + <location filename="../bitcoingui.cpp" line="243"/> + <source>Show information about Qt</source> + <translation>Visa information om Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> - <source>E&xit</source> - <translation>&Avsluta</translation> + <location filename="../bitcoingui.cpp" line="245"/> + <source>&Options...</source> + <translation>&Alternativ...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> - <source>&Send coins</source> - <translation>&Skicka bitcoins</translation> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation>Visa eller göm Bitcoin-fönstret</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>Ändra konfigurationsalternativ för bitcoin</translation> + <location filename="../bitcoingui.cpp" line="250"/> + <source>&Export...</source> + <translation>&Exportera...</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="482"/> + <source>%n active connection(s) to Bitcoin network</source> + <translation> + <numerusform>%n aktiv anslutning till Bitcoin-nätverket</numerusform> + <numerusform>%n aktiva anslutningar till Bitcoin-nätverket</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation> + <numerusform>~%n block återstår</numerusform> + <numerusform>~%n block återstår</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation>&Kryptera plånbok</translation> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>Laddat ner %1 av %2 block från transaktionshistoriken (%3% klart).</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="550"/> + <source>%n minute(s) ago</source> + <translation> + <numerusform>%n minut sedan</numerusform> + <numerusform>%n minuter sedan</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="546"/> + <source>%n second(s) ago</source> + <translation> + <numerusform>%n sekund sedan</numerusform> + <numerusform>%n sekunder sedan</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="73"/> - <source>Bitcoin Wallet</source> - <translation>Bitcoin-plånbok</translation> + <location filename="../bitcoingui.cpp" line="564"/> + <source>Up to date</source> + <translation>Uppdaterad</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> - <source>&Address Book</source> - <translation>&Adressbok</translation> + <location filename="../bitcoingui.cpp" line="569"/> + <source>Catching up...</source> + <translation>Hämtar senaste...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> - <source>Sign &message</source> - <translation>Signera &meddelande</translation> + <location filename="../bitcoingui.cpp" line="577"/> + <source>Last received block was generated %1.</source> + <translation>Senast mottagna block genererades %1.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>&Byt lösenfras</translation> + <location filename="../bitcoingui.cpp" line="663"/> + <source>Sent transaction</source> + <translation>Transaktion skickad</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> - <source>&Backup Wallet</source> - <translation>&Säkerhetskopiera Plånbok</translation> + <location filename="../bitcoingui.cpp" line="665"/> + <source>Date: %1 +Amount: %2 +Type: %3 +Address: %4 +</source> + <translation>Datum: %1 +Belopp: %2 +Typ: %3 +Adress: %4 +</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> + <location filename="../bitcoingui.cpp" line="798"/> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation>Denna plånbok är <b>krypterad</b> och för närvarande <b>låst</b></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>Ändra konfigurationsalternativ för bitcoin</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="418"/> <source>bitcoin-qt</source> <translation>bitcoin-qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> + <location filename="../bitcoingui.cpp" line="636"/> <source>Sending...</source> <translation>Skickar...</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Ett allvarligt fel har uppstått. Bitcoin kan inte längre köras säkert och kommer att avslutas.</translation> </message> @@ -635,22 +642,22 @@ Adress: %4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&Enhet att visa belopp i:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>Välj en standard för enhets mått, att visa när du skickar mynt</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&Visa adresser i transaktionslistan</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished">Anger om Bitcoin-adresser skall visas i transaktionslistan</translation> </message> @@ -726,85 +733,95 @@ Adress: %4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>&Starta Bitcoin vid systemstart</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Starta Bitcoin automatiskt när datorn startas.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>&Minimera till systemfältet istället för aktivitetsfältet</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>Visa endast en systemfältsikon vid minimering</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> + <location filename="../optionsdialog.cpp" line="185"/> <source>Map port using &UPnP</source> <translation>Tilldela port med hjälp av &UPnP</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="181"/> + <location filename="../optionsdialog.cpp" line="186"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Öppna automatiskt Bitcoin-klientens port på routern. Detta fungerar endast om din router har UPnP aktiverat.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="180"/> <source>M&inimize on close</source> <translation>M&inimera vid stängning</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="186"/> + <location filename="../optionsdialog.cpp" line="181"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>Minimera applikationen istället för att stänga ner den när fönstret stängs. Detta innebär att programmet fotrsätter att köras tills du väljer Avsluta i menyn.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>&Anslut via SOCKS4 proxy:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Anslut till Bitcoin-nätverket genom en SOCKS4-proxy (t.ex. när du ansluter genom Tor)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>Proxy &IP: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>Proxyns IP-adress (t.ex. 127.0.0.1).</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>&Port: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Proxyns port (t.ex. 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>Valfri transaktionsavgift per kB som ser till att dina transaktioner behandlas snabbt. De flesta transaktioner är 1 kB. Avgift 0.01 rekommenderas.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>Betala överförings &avgift</translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation>Frigör databaser vid nedstängning</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation>Frigör block- och adressdatabaser vid nedstängning. Detta innebär att de kan flyttas till en annan data katalog, men det saktar ner avstängningen. Plånboken är alltid frigjord.</translation> + </message> </context> <context> <name>MessagePage</name> @@ -899,17 +916,17 @@ Adress: %4 <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>Allmänt</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>Visa</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>Alternativ</translation> </message> @@ -1005,21 +1022,26 @@ Adress: %4 <translation>&Spara som...</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation>Fel vid skapande av QR-kod från URI.</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation>PNG-bilder (*.png)</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation type="unfinished">Spara QR-kod</translation> </message> <message> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>URI:n är för lång, försöka minska texten för etikett / meddelande.</translation> + </message> + <message> <location filename="../forms/qrcodedialog.ui" line="14"/> <source>Dialog</source> <translation>Dialog</translation> @@ -1055,6 +1077,11 @@ Adress: %4 <translation>Ta bort alla transaktions-fält</translation> </message> <message> + <location filename="../forms/sendcoinsdialog.ui" line="87"/> + <source>Clear all</source> + <translation>Rensa alla</translation> + </message> + <message> <location filename="../forms/sendcoinsdialog.ui" line="106"/> <source>Balance:</source> <translation>Balans:</translation> @@ -1062,7 +1089,7 @@ Adress: %4 <message> <location filename="../forms/sendcoinsdialog.ui" line="113"/> <source>123.456 BTC</source> - <translation>123,456 BTC</translation> + <translation>123.456 BTC</translation> </message> <message> <location filename="../forms/sendcoinsdialog.ui" line="144"/> @@ -1075,11 +1102,6 @@ Adress: %4 <translation>&Skicka</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="87"/> - <source>Clear all</source> - <translation>Rensa alla</translation> - </message> - <message> <location filename="../sendcoinsdialog.cpp" line="95"/> <source><b>%1</b> to %2 (%3)</source> <translation><b>%1</b> till %2 (%3)</translation> @@ -1138,6 +1160,11 @@ Adress: %4 <context> <name>SendCoinsEntry</name> <message> + <location filename="../forms/sendcoinsentry.ui" line="130"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> <location filename="../forms/sendcoinsentry.ui" line="14"/> <source>Form</source> <translation>Formulär</translation> @@ -1184,11 +1211,6 @@ Adress: %4 <translation>Klistra in adress från Urklipp</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="130"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> <location filename="../forms/sendcoinsentry.ui" line="137"/> <source>Remove this recipient</source> <translation>Ta bort denna mottagare</translation> @@ -1202,143 +1224,143 @@ Adress: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="18"/> + <location filename="../transactiondesc.cpp" line="92"/> + <source>unknown</source> + <translation>okänd</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="20"/> <source>Open for %1 blocks</source> <translation>Öppen för %1 block</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> + <location filename="../transactiondesc.cpp" line="22"/> <source>Open until %1</source> <translation>Öppet till %1</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation>%1/nerkopplad?</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="28"/> + <location filename="../transactiondesc.cpp" line="30"/> <source>%1/unconfirmed</source> <translation>%1/okonfirmerad</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> + <location filename="../transactiondesc.cpp" line="32"/> <source>%1 confirmations</source> <translation>%1 bekräftelser</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation><b>Status:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> + <location filename="../transactiondesc.cpp" line="55"/> <source>, has not been successfully broadcast yet</source> <translation>, har inte lyckats skickas ännu</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>, sänd genom %1 nod</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>, sänd genom %1 noder</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation><b>Datum:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> - <source><b>Source:</b> Generated<br></source> - <translation><b>Källa:</b> Genererade<br></translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> - <source><b>Debit:</b> </source> - <translation><b>Debet:</b></translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="194"/> - <source><b>Transaction fee:</b> </source> - <translation><b>Transaktionsavgift:</b></translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> - <source><b>From:</b> </source> - <translation><b>Från:</b></translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="89"/> - <source>unknown</source> - <translation>okänd</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> - <source><b>To:</b> </source> - <translation><b>Till:</b></translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation> (din, etikett: </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation>(dina)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation><b>Kredit:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation>(inte accepterad)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> + <source><b>Debit:</b> </source> + <translation><b>Debet:</b></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="197"/> + <source><b>Transaction fee:</b> </source> + <translation><b>Transaktionsavgift:</b></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>Nettobelopp:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>Meddelande:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> + <source><b>From:</b> </source> + <translation><b>Från:</b></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> + <source><b>To:</b> </source> + <translation><b>Till:</b></translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>Kommentar:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation>Transaktions-ID:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation>Genererade mynt måste vänta 120 block innan de kan användas. När du skapade detta block sändes det till nätverket för att läggas till i blockkedjan. Om blocket inte kommer in i kedjan kommer det att ändras till "accepteras inte" och kommer ej att gå att spendera. Detta kan ibland hända om en annan nod genererar ett block nästan samtidigt som dig.</translation> </message> + <message> + <location filename="../transactiondesc.cpp" line="70"/> + <source><b>Source:</b> Generated<br></source> + <translation><b>Källa:</b> Genererade<br></translation> + </message> </context> <context> <name>TransactionDescDialog</name> @@ -1356,14 +1378,29 @@ Adress: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="303"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Det här blocket togs inte emot av några andra noder och kommer antagligen inte att bli godkänt.</translation> + <location filename="../transactiontablemodel.cpp" line="280"/> + <source>Open until %1</source> + <translation>Öppet till %1</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="349"/> - <source>Received with</source> - <translation>Mottagen med</translation> + <location filename="../transactiontablemodel.cpp" line="283"/> + <source>Offline (%1 confirmations)</source> + <translation>Offline (%1 bekräftelser)</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="286"/> + <source>Unconfirmed (%1 of %2 confirmations)</source> + <translation>Obekräftad (%1 av %2 bekräftelser)</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="601"/> + <source>Destination address of transaction.</source> + <translation>Transaktionens destinationsadress.</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="595"/> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Transaktionsstatus. Håll muspekaren över för att se antal bekräftelser.</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="354"/> @@ -1376,11 +1413,6 @@ Adress: %4 <translation>Betalning till dig själv</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="396"/> - <source>(n/a)</source> - <translation>(n/a)</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="214"/> <source>Date</source> <translation>Datum</translation> @@ -1409,21 +1441,6 @@ Adress: %4 </translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="280"/> - <source>Open until %1</source> - <translation>Öppet till %1</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="283"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline (%1 bekräftelser)</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="286"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Obekräftad (%1 av %2 bekräftelser)</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="289"/> <source>Confirmed (%1 confirmations)</source> <translation>Bekräftad (%1 bekräftelser)</translation> @@ -1442,52 +1459,87 @@ Adress: %4 <translation>Genererad men inte accepterad</translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="303"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> + <translation>Det här blocket togs inte emot av några andra noder och kommer antagligen inte att bli godkänt.</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="351"/> <source>Received from</source> <translation>Mottaget från</translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="349"/> + <source>Received with</source> + <translation>Mottagen med</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="358"/> <source>Mined</source> <translation>Skapad</translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="396"/> + <source>(n/a)</source> + <translation>(n/a)</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="599"/> <source>Type of transaction.</source> <translation>Transaktionstyp.</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="601"/> - <source>Destination address of transaction.</source> - <translation>Transaktionens destinationsadress.</translation> + <location filename="../transactiontablemodel.cpp" line="597"/> + <source>Date and time that the transaction was received.</source> + <translation>Tidpunkt då transaktionen mottogs.</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="603"/> <source>Amount removed from or added to balance.</source> <translation>Belopp draget eller tillagt till balans.</translation> </message> +</context> +<context> + <name>TransactionView</name> <message> - <location filename="../transactiontablemodel.cpp" line="595"/> - <source>Transaction status. Hover over this field to show number of confirmations.</source> - <translation>Transaktionsstatus. Håll muspekaren över för att se antal bekräftelser.</translation> + <location filename="../transactionview.cpp" line="84"/> + <source>Enter address or label to search</source> + <translation>Sök efter adress eller etikett </translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="597"/> - <source>Date and time that the transaction was received.</source> - <translation>Tidpunkt då transaktionen mottogs.</translation> + <location filename="../transactionview.cpp" line="126"/> + <source>Copy amount</source> + <translation>Kopiera belopp</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="281"/> + <source>Type</source> + <translation>Typ</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="282"/> + <source>Label</source> + <translation>Etikett</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="285"/> + <source>ID</source> + <translation>ID</translation> </message> -</context> -<context> - <name>TransactionView</name> <message> <location filename="../transactionview.cpp" line="289"/> - <source>Error exporting</source> - <translation>Fel vid export</translation> + <source>Could not write to file %1.</source> + <translation>Kunde inte skriva till filen %1.</translation> </message> <message> - <location filename="../transactionview.cpp" line="280"/> - <source>Date</source> - <translation>Datum</translation> + <location filename="../transactionview.cpp" line="384"/> + <source>Range:</source> + <translation>Intervall:</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="392"/> + <source>to</source> + <translation>till</translation> </message> <message> <location filename="../transactionview.cpp" line="279"/> @@ -1500,6 +1552,11 @@ Adress: %4 <translation>Adress</translation> </message> <message> + <location filename="../transactionview.cpp" line="289"/> + <source>Error exporting</source> + <translation>Fel vid export</translation> + </message> + <message> <location filename="../transactionview.cpp" line="284"/> <source>Amount</source> <translation>Mängd</translation> @@ -1541,16 +1598,16 @@ Adress: %4 <translation>Period...</translation> </message> <message> - <location filename="../transactionview.cpp" line="72"/> - <source>Received with</source> - <translation>Mottagen med</translation> - </message> - <message> <location filename="../transactionview.cpp" line="74"/> <source>Sent to</source> <translation>Skickad till</translation> </message> <message> + <location filename="../transactionview.cpp" line="72"/> + <source>Received with</source> + <translation>Mottagen med</translation> + </message> + <message> <location filename="../transactionview.cpp" line="76"/> <source>To yourself</source> <translation>Till dig själv</translation> @@ -1566,11 +1623,6 @@ Adress: %4 <translation>Övriga</translation> </message> <message> - <location filename="../transactionview.cpp" line="84"/> - <source>Enter address or label to search</source> - <translation>Sök efter adress eller etikett </translation> - </message> - <message> <location filename="../transactionview.cpp" line="90"/> <source>Min amount</source> <translation>Minsta mängd</translation> @@ -1586,14 +1638,9 @@ Adress: %4 <translation>Kopiera etikett</translation> </message> <message> - <location filename="../transactionview.cpp" line="126"/> - <source>Copy amount</source> - <translation>Kopiera belopp</translation> - </message> - <message> <location filename="../transactionview.cpp" line="127"/> <source>Edit label</source> - <translation>Ändra etikett</translation> + <translation>Editera etikett</translation> </message> <message> <location filename="../transactionview.cpp" line="270"/> @@ -1606,447 +1653,515 @@ Adress: %4 <translation>Kommaseparerad fil (*. csv)</translation> </message> <message> - <location filename="../transactionview.cpp" line="281"/> - <source>Type</source> - <translation>Typ</translation> + <location filename="../transactionview.cpp" line="128"/> + <source>Show details...</source> + <translation>Visa detaljer...</translation> </message> <message> - <location filename="../transactionview.cpp" line="282"/> - <source>Label</source> - <translation>Etikett</translation> + <location filename="../transactionview.cpp" line="280"/> + <source>Date</source> + <translation>Datum</translation> </message> +</context> +<context> + <name>WalletModel</name> <message> - <location filename="../transactionview.cpp" line="285"/> - <source>ID</source> - <translation>ID</translation> + <location filename="../walletmodel.cpp" line="142"/> + <source>Sending...</source> + <translation>Skickar...</translation> </message> +</context> +<context> + <name>bitcoin-core</name> <message> - <location filename="../transactionview.cpp" line="289"/> - <source>Could not write to file %1.</source> - <translation>Kunde inte skriva till filen %1.</translation> + <location filename="../bitcoinstrings.cpp" line="86"/> + <source>Password for JSON-RPC connections</source> + <translation>Lösenord för JSON-RPC-anslutningar</translation> </message> <message> - <location filename="../transactionview.cpp" line="384"/> - <source>Range:</source> - <translation>Intervall:</translation> + <location filename="../bitcoinstrings.cpp" line="113"/> + <source>Loading addresses...</source> + <translation>Laddar adresser...</translation> </message> <message> - <location filename="../transactionview.cpp" line="392"/> - <source>to</source> - <translation>till</translation> + <location filename="../bitcoinstrings.cpp" line="61"/> + <source>Add a node to connect to and attempt to keep the connection open</source> + <translation>Lägg till en nod att koppla upp mot och försök att hålla anslutningen öppen</translation> </message> <message> - <location filename="../transactionview.cpp" line="128"/> - <source>Show details...</source> - <translation>Visa detaljer...</translation> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>Accepterade krypteringsalgoritmer (förval: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> -</context> -<context> - <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> - <source>Sending...</source> - <translation>Skickar...</translation> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> </message> -</context> -<context> - <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> - <source>Done loading</source> - <translation>Klar med laddning</translation> + <location filename="../bitcoinstrings.cpp" line="115"/> + <source>Loading block index...</source> + <translation>Laddar blockindex...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Bitcoin version</source> - <translation>Bitcoin version</translation> + <location filename="../bitcoinstrings.cpp" line="124"/> + <source>Cannot write default address</source> + <translation>Kan inte skriva standardadress</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Send command to -server or bitcoind</source> - <translation>Skicka kommando till -server eller bitcoind</translation> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>Error loading wallet.dat</source> + <translation>Fel vid inläsning av plånboksfilen wallet.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> - <source>List commands</source> - <translation>Lista kommandon</translation> + <location filename="../bitcoinstrings.cpp" line="122"/> + <source>Cannot downgrade wallet</source> + <translation>Kan inte nedgradera plånboken</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Options:</source> - <translation>Inställningar:</translation> + <location filename="../bitcoinstrings.cpp" line="123"/> + <source>Cannot initialize keypool</source> + <translation>Kan inte initiera keypool</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Generate coins</source> - <translation>Generera mynt</translation> + <location filename="../bitcoinstrings.cpp" line="102"/> + <source>Server certificate file (default: server.cert)</source> + <translation>Serverns certifikatfil (förval: server.cert)</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="54"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Exekvera kommando när bästa blocket ändras (%s i cmd är utbytt av blockhash)</translation> + <source>Set database cache size in megabytes (default: 25)</source> + <translation>Sätt databas cache storleken i megabyte (standard: 25)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> - <source>This help message</source> - <translation>Det här hjälp medelandet</translation> + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>Sätt storleken på nyckelpoolen till <n> (förval: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Password for JSON-RPC connections</source> - <translation>Lösenord för JSON-RPC-anslutningar</translation> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Upgrade wallet to latest format</source> + <translation>Uppgradera plånboken till senaste formatet</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> - <source>Prepend debug output with timestamp</source> - <translation>Skriv ut tid i felsökningsinformationen</translation> + <location filename="../bitcoinstrings.cpp" line="59"/> + <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> + <translation>Lyssna efter anslutningar på <port> (förval: 8333 eller testnet: 18333)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>How thorough the block verification is (0-6, default: 1)</source> + <translation>Hur grundlig blockverifikationen är (0-6, standardvärde: 1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>Kan inte låsa data-mappen %s. Bitcoin körs förmodligen redan.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Error loading blkindex.dat</source> + <translation>Fel vid inläsning av blkindex.dat</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> + <source>Fee per KB to add to transactions you send</source> + <translation>Avgift per KB att lägga till på transaktioner du skickar</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source>How many blocks to check at startup (default: 2500, 0 = all)</source> + <translation>Hur många block att kontrollera vid uppstart (standardvärde: 2500, 0 = alla)</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Ange timeout för uppkoppling (i millisekunder)</translation> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation>%s, du behöver sätta ett rpclösensord i konfigurationsfilen: + %s +Det är rekommenderat att använda följande slumpade lösenord: +rpcuser=bitcoinrpc +rpcpassword=%s +(du behöver inte komma ihåg lösenordet) +Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter. +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>Accepterade krypteringsalgoritmer (förval: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> + <location filename="../bitcoinstrings.cpp" line="43"/> + <source>Send command to -server or bitcoind</source> + <translation>Skicka kommando till -server eller bitcoind</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="50"/> + <source>Don't generate coins</source> + <translation>Generera inte mynt</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation>Du behöver välja ett rpclösensord i konfigurationsfilen: +%s +Om filen inte existerar, skapa den med filrättigheten endast läsbar för ägaren.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Skickar...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>Otillräckligt med bitcoins</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation>Fel</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation>Att använda %s alternativet</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="63"/> <source>Find peers using internet relay chat (default: 0)</source> <translation>Sök efter klienter med internet relay chat (standard: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> + <location filename="../bitcoinstrings.cpp" line="60"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>Ha som mest <n> anslutningar till andra klienter (förval: 125)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> - <source>Cannot write default address</source> - <translation>Kan inte skriva standardadress</translation> + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>Lyssna på JSON-RPC-anslutningar på <port> (förval: 8332)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> - <source>Error loading wallet.dat</source> - <translation>Fel vid inläsning av plånboksfilen wallet.dat</translation> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>Done loading</source> + <translation>Klar med laddning</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> - <source>Cannot downgrade wallet</source> - <translation>Kan inte nedgradera plånboken</translation> + <location filename="../bitcoinstrings.cpp" line="41"/> + <source>Bitcoin version</source> + <translation>Bitcoin version</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> - <source>Cannot initialize keypool</source> - <translation>Kan inte initiera keypool</translation> + <location filename="../bitcoinstrings.cpp" line="44"/> + <source>List commands</source> + <translation>Lista kommandon</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation>Lyssna på JSON-RPC-anslutningar på <port> (förval: 8332)</translation> + <location filename="../bitcoinstrings.cpp" line="46"/> + <source>Options:</source> + <translation>Inställningar:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Don't generate coins</source> - <translation>Generera inte mynt</translation> + <location filename="../bitcoinstrings.cpp" line="49"/> + <source>Generate coins</source> + <translation>Generera mynt</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> + <location filename="../bitcoinstrings.cpp" line="90"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation>Exekvera kommando när bästa blocket ändras (%s i cmd är utbytt av blockhash)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="107"/> + <source>This help message</source> + <translation>Det här hjälp medelandet</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="80"/> <source>Use the test network</source> <translation>Använd testnätverket</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> + <location filename="../bitcoinstrings.cpp" line="95"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>Sök i block-kedjan efter saknade wallet transaktioner</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> + <location filename="../bitcoinstrings.cpp" line="78"/> <source>Accept command line and JSON-RPC commands</source> <translation>Tillåt kommandon från kommandotolken och JSON-RPC-kommandon</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> - <source>Loading addresses...</source> - <translation>Laddar adresser...</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Add a node to connect to and attempt to keep the connection open</source> - <translation>Lägg till en nod att koppla upp mot och försök att hålla anslutningen öppen</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="52"/> + <location filename="../bitcoinstrings.cpp" line="88"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Tillåt JSON-RPC-anslutningar från specifika IP-adresser</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> + <location filename="../bitcoinstrings.cpp" line="118"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Fel vid inläsningen av wallet.dat: Plånboken är skadad</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> + <location filename="../bitcoinstrings.cpp" line="119"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> <translation>Fel vid inläsningen av wallet.dat: Plånboken kräver en senare version av Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> - <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation>Plånboken behöver skrivas om: Starta om Bitcoin för att färdigställa</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="77"/> - <source>Loading block index...</source> - <translation>Laddar blockindex...</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="79"/> + <location filename="../bitcoinstrings.cpp" line="117"/> <source>Loading wallet...</source> <translation>Laddar plånbok...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> + <location filename="../bitcoinstrings.cpp" line="125"/> <source>Rescanning...</source> <translation>Söker igen...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> + <location filename="../bitcoinstrings.cpp" line="79"/> <source>Run in the background as a daemon and accept commands</source> <translation>Kör i bakgrunden som tjänst och acceptera kommandon</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> + <location filename="../bitcoinstrings.cpp" line="89"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Skicka kommandon till klient på <ip> (förval: 127.0.0.1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> + <location filename="../bitcoinstrings.cpp" line="83"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Skicka trace-/debuginformation till terminalen istället för till debug.log</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> + <location filename="../bitcoinstrings.cpp" line="84"/> <source>Send trace/debug info to debugger</source> <translation>Skicka trace-/debuginformation till debugger</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> - <source>Server certificate file (default: server.cert)</source> - <translation>Serverns certifikatfil (förval: server.cert)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="67"/> + <location filename="../bitcoinstrings.cpp" line="103"/> <source>Server private key (default: server.pem)</source> <translation>Serverns privata nyckel (förval: server.pem)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Sätt databas cache storleken i megabyte (standard: 25)</translation> + <location filename="../bitcoinstrings.cpp" line="67"/> + <source>Threshold for disconnecting misbehaving peers (default: 100)</source> + <translation>Tröskelvärde för att koppla ifrån klienter som missköter sig (förval: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation>Sätt storleken på nyckelpoolen till <n> (förval: 100)</translation> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Threshold for disconnecting misbehaving peers (default: 100)</source> - <translation>Tröskelvärde för att koppla ifrån klienter som missköter sig (förval: 100)</translation> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> - <source>Upgrade wallet to latest format</source> - <translation>Uppgradera plånboken till senaste formatet</translation> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">Fel: Transaktionen gick inte att skapa.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> - <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>Använd OpenSSL (https) för JSON-RPC-anslutningar</translation> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">Fel: Transaktionen avslogs. Detta kan hända om några av mynten i plånboken redan spenderats, t.ex om du använt en kopia av wallet.dat och mynt spenderades i kopian men inte markerats som spenderas här.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> - <source>Username for JSON-RPC connections</source> - <translation>Användarnamn för JSON-RPC-anslutningar</translation> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation>Ett fel uppstod vid upprättandet av RPC port %u för att lyssna: %s</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> + <location filename="../bitcoinstrings.cpp" line="42"/> <source>Usage:</source> <translation>Användning:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> + <location filename="../bitcoinstrings.cpp" line="45"/> <source>Get help for a command</source> <translation>Få hjälp med ett kommando</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> + <location filename="../bitcoinstrings.cpp" line="47"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Ange konfigurationsfil (standard: bitcoin.conf)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> + <location filename="../bitcoinstrings.cpp" line="48"/> <source>Specify pid file (default: bitcoind.pid)</source> <translation>Ange pid fil (standard: bitcoind.pid)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Specify data directory</source> - <translation>Ange katalog för data</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Connect through socks4 proxy</source> - <translation>Koppla upp genom socks4 proxy</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Allow DNS lookups for addnode and connect</source> - <translation>Tillåt DNS-sökningar för -addnode och -connect</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="28"/> + <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation>Koppla enbart upp till den specifierade noden</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Show splash screen on startup (default: 1)</source> - <translation>Visa startbilden vid uppstart (standard: 1)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation>Acceptera anslutningar utifrån (standard: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation>Lyssna efter anslutningar på <port> (förval: 8333 eller testnet: 18333)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Ändra språk, till exempel "de_DE" (standard: systemets språk)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Find peers using DNS lookup (default: 1)</source> - <translation>Söl efter klienter med DNS sökningen (standard: 1)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="34"/> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation>Antal sekunder att hindra klienter som missköter sig från att ansluta (förval: 86400)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="91"/> + <location filename="../bitcoinstrings.cpp" line="129"/> <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> <translation>Varning: -paytxfee är satt väldigt hög. Detta är avgiften du kommer betala för varje transaktion.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> + <location filename="../bitcoinstrings.cpp" line="133"/> <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> <translation>Det går inte att binda till %s på den här datorn. Bitcoin är förmodligen redan igång.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> - <source>Use Universal Plug and Play to map the listening port (default: 1)</source> - <translation type="unfinished">Use UPnP to map the listening port (default: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="66"/> + <source>Find peers using DNS lookup (default: 1)</source> + <translation>Söl efter klienter med DNS sökningen (standard: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> + <location filename="../bitcoinstrings.cpp" line="20"/> <source>Warning: Disk space is low</source> <translation>Varning: Hårddiskutrymme är lågt</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> + <location filename="../bitcoinstrings.cpp" line="38"/> <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> <translation>Varning: Vänligen kolla så att din dators datum och tid är korrekt! Om din klocka går fel kommer Bitcoin inte fungera korrekt.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> + <location filename="../bitcoinstrings.cpp" line="81"/> <source>Output extra debugging information</source> <translation type="unfinished">Skriv ut extra felsökningsinformation</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> - <source>How thorough the block verification is (0-6, default: 1)</source> - <translation>Hur grundlig blockverifikationen är (0-6, standardvärde: 1)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation> SSL-inställningar: (se Bitcoin-wikin för SSL-setup instruktioner)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> + <location filename="../bitcoinstrings.cpp" line="114"/> <source>Error loading addr.dat</source> <translation>Fel vid inläsning av plånboksfilen addr.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> + <location filename="../bitcoinstrings.cpp" line="127"/> <source>Invalid -proxy address</source> <translation>Ogiltig proxyadress</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> - <source>Invalid amount for -paytxfee=<amount></source> - <translation>Ogiltigt belopp för -paytxfee=<belopp></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation type="unfinished">Maximal buffert för mottagning per anslutning, <n>*1000 byte (förval: 5000) {1000 ?} {10000)?}</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> - <translation type="unfinished">Maximal buffert för sändning per anslutning, <n>*1000 byte (förval: 5000) {1000 ?} {10000)?}</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished">Use UPnP to map the listening port (default: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Specify data directory</source> + <translation>Ange katalog för data</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="51"/> <source>Start minimized</source> <translation>Starta som minimerad</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> - <source>Error loading blkindex.dat</source> - <translation>Fel vid inläsning av blkindex.dat</translation> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation>Användning</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Avgift per KB att lägga till på transaktioner du skickar</translation> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>Ogiltig mängd</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> - <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation>Hur många block att kontrollera vid uppstart (standardvärde: 2500, 0 = alla)</translation> + <location filename="../bitcoinstrings.cpp" line="65"/> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Ändra språk, till exempel "de_DE" (standard: systemets språk)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>beta</translation> + <location filename="../bitcoinstrings.cpp" line="68"/> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> + <translation>Antal sekunder att hindra klienter som missköter sig från att ansluta (förval: 86400)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="52"/> + <source>Show splash screen on startup (default: 1)</source> + <translation>Visa startbilden vid uppstart (standard: 1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation>Sätt databasens loggfil storlek i megabyte (standard: 100)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Specify connection timeout (in milliseconds)</source> + <translation>Ange timeout för uppkoppling (i millisekunder)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="57"/> + <source>Connect through socks4 proxy</source> + <translation>Koppla upp genom socks4 proxy</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="58"/> + <source>Allow DNS lookups for addnode and connect</source> + <translation>Tillåt DNS-sökningar för -addnode och -connect</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation>Frigör block- och adressdatabaser vid nedstängning. Detta ökar tiden för nedstängning (standard: 0)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Prepend debug output with timestamp</source> + <translation>Skriv ut tid i felsökningsinformationen</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="101"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>Använd OpenSSL (https) för JSON-RPC-anslutningar</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>Username for JSON-RPC connections</source> + <translation>Användarnamn för JSON-RPC-anslutningar</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="120"/> + <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> + <translation>Plånboken behöver skrivas om: Starta om Bitcoin för att färdigställa</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="73"/> + <source>Use Universal Plug and Play to map the listening port (default: 1)</source> + <translation type="unfinished">Use UPnP to map the listening port (default: 1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="128"/> + <source>Invalid amount for -paytxfee=<amount></source> + <translation>Ogiltigt belopp för -paytxfee=<belopp></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="72"/> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> + <translation type="unfinished">Maximal buffert för sändning per anslutning, <n>*1000 byte (förval: 5000) {1000 ?} {10000)?}</translation> </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts index 9af782b877..9d1e842613 100644 --- a/src/qt/locale/bitcoin_tr.ts +++ b/src/qt/locale/bitcoin_tr.ts @@ -15,7 +15,7 @@ <translation><b>Bitcoin</b> sürüm</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -75,6 +75,11 @@ Bu ürün OpenSSL projesi tarafından OpenSSL Toolkit (http://www.openssl.org/) <translation>&QR kodunu göster</translation> </message> <message> + <location filename="../forms/addressbookpage.ui" line="96"/> + <source>Sign a message to prove you own this address</source> + <translation>Bu adresin sizin olduğunu ispatlamak için mesaj imzalayın</translation> + </message> + <message> <location filename="../forms/addressbookpage.ui" line="99"/> <source>Sign &Message</source> <translation>&Mesaj imzala</translation> @@ -90,47 +95,42 @@ Bu ürün OpenSSL projesi tarafından OpenSSL Toolkit (http://www.openssl.org/) <translation>&Sil</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="96"/> - <source>Sign a message to prove you own this address</source> - <translation>Bu adresin sizin olduğunu ispatlamak için mesaj imzalayın</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>Adresi kopyala</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation>Etiketi kopyala</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation>Düzenle</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>Sil</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation>Adres defteri verilerini dışa aktar</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation>Virgülle ayrılmış değerler dosyası (*.csv)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>Dışa aktarımda hata oluştu</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation>%1 dosyasına yazılamadı.</translation> </message> @@ -226,6 +226,13 @@ Bu ürün OpenSSL projesi tarafından OpenSSL Toolkit (http://www.openssl.org/) <translation>Cüzdan şifrelenmesini teyit eder</translation> </message> <message> + <location filename="../askpassphrasedialog.cpp" line="102"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! +Are you sure you wish to encrypt your wallet?</source> + <translation>UYARI: Eğer cüzdanınızı şifrelerseniz ve parolanızı kaybederseniz, <b>TÜM BİTCOİNLERİNİZİ KAYBEDERSİNİZ</b>! +Cüzdanınızı şifrelemek istediğinizden emin misiniz?</translation> + </message> + <message> <location filename="../askpassphrasedialog.cpp" line="111"/> <location filename="../askpassphrasedialog.cpp" line="169"/> <source>Wallet encrypted</source> @@ -288,299 +295,303 @@ Bu ürün OpenSSL projesi tarafından OpenSSL Toolkit (http://www.openssl.org/) <source>Warning: The Caps Lock key is on.</source> <translation>Uyarı: Caps Lock tuşu etkin durumda.</translation> </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="102"/> - <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! -Are you sure you wish to encrypt your wallet?</source> - <translation>UYARI: Eğer cüzdanınızı şifrelerseniz ve parolanızı kaybederseniz, <b>TÜM BİTCOİNLERİNİZİ KAYBEDERSİNİZ</b>! -Cüzdanınızı şifrelemek istediğinizden emin misiniz?</translation> - </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="200"/> - <source>Edit the list of stored addresses and labels</source> - <translation>Saklanan adres ve etiket listesini düzenle</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="245"/> + <location filename="../bitcoingui.cpp" line="243"/> <source>Show information about Qt</source> <translation>Qt hakkında bilgi görüntü</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> - <source>Actions toolbar</source> - <translation>Faaliyet araç çubuğu</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> + <location filename="../bitcoingui.cpp" line="506"/> <source>Synchronizing with network...</source> <translation>Şebeke ile senkronizasyon...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="73"/> - <source>Bitcoin Wallet</source> - <translation>Bitcoin cüzdanı</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Blok zinciri senkronizasyonu sürüyor</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="187"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>&Overview</source> <translation>&Genel bakış</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="71"/> + <source>Bitcoin Wallet</source> + <translation>Bitcoin cüzdanı</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="186"/> <source>Show general overview of wallet</source> <translation>Cüzdana genel bakışı göster</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> + <location filename="../bitcoingui.cpp" line="191"/> <source>&Transactions</source> <translation>&Muameleler</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="192"/> <source>Browse transaction history</source> <translation>Muamele tarihçesini tara</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> + <location filename="../bitcoingui.cpp" line="197"/> <source>&Address Book</source> <translation>&Adres defteri</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation>Bitcoin &al</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> + <location filename="../bitcoingui.cpp" line="204"/> <source>Show the list of addresses for receiving payments</source> <translation>Ödeme alma adreslerinin listesini göster</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>&Bitcoin'i aç</translation> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Send coins to a bitcoin address</source> + <translation>Bir bitcoin adresine para (bitcoin) yollar</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Bitcoin penceresini gösterir</translation> + <location filename="../bitcoingui.cpp" line="216"/> + <source>Prove you control an address</source> + <translation>Bu adresin kontrolünüz altında olduğunu ispatlayın</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>%1 &hakkında</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="245"/> + <source>&Options...</source> + <translation>&Seçenekler...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>Bitcoin seçeneklerinin yapılandırmasını değiştirir</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation>&Bitcoin'i Göster/Sakla</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="250"/> <source>&Export...</source> <translation>&Dışa aktar...</translation> </message> + <message> + <location filename="../bitcoingui.cpp" line="252"/> + <source>&Encrypt Wallet</source> + <translation>Cüzdanı &şifrele</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="255"/> + <source>&Backup Wallet</source> + <translation>Cüzdanı &yedekle</translation> + </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation> <numerusform>%n dakika önce</numerusform> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> + <location filename="../bitcoingui.cpp" line="209"/> <source>&Send coins</source> <translation>Bitcoin &yolla</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> - <source>[testnet]</source> - <translation>[testnet]</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="539"/> - <source>Catching up...</source> - <translation>Aralık kapatılıyor...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="247"/> - <source>&Options...</source> - <translation>&Seçenekler...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="255"/> + <location filename="../bitcoingui.cpp" line="253"/> <source>Encrypt or decrypt wallet</source> <translation>Cüzdanı şifrele ya da şifreyi aç</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> + <location filename="../bitcoingui.cpp" line="256"/> <source>Backup wallet to another location</source> <translation>Cüzdanı diğer bir konumda yedekle</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> - <source>bitcoin-qt</source> - <translation>bitcoin-qt</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="615"/> - <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="619"/> - <source>Sending...</source> - <translation>Yollanıyor...</translation> + <location filename="../bitcoingui.cpp" line="198"/> + <source>Edit the list of stored addresses and labels</source> + <translation>Saklanan adres ve etiket listesini düzenle</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation>Cüzdan verileri (*.dat)</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> - <source>Backup Failed</source> - <translation>Yedekleme başarısız oldu</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="298"/> + <location filename="../bitcoingui.cpp" line="296"/> <source>&Help</source> <translation>&Yardım</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Cüzdan <b>şifrelenmiştir</b> ve şu anda <b>kilidi açıktır</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> - <source>Up to date</source> - <translation>Güncel</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation>Son alınan blok şu vakit oluşturulmuştu: %1.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> - <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation>Cüzdan <b>şifrelenmiştir</b> ve şu anda <b>kilitlidir</b></translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>%1 &hakkında</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="253"/> + <location filename="../bitcoingui.cpp" line="251"/> <source>Export the data in the current tab to a file</source> <translation>Güncel sekmedeki verileri bir dosyaya aktar</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> - <source>Quit application</source> - <translation>Uygulamadan çık</translation> - </message> - <message> <location filename="../bitcoingui.cpp" line="257"/> - <source>&Backup Wallet</source> - <translation>Cüzdanı &yedekle</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="244"/> - <source>About &Qt</source> - <translation>&Qt hakkında</translation> + <source>&Change Passphrase</source> + <translation>&Parolayı değiştir</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> + <location filename="../bitcoingui.cpp" line="258"/> <source>Change the passphrase used for wallet encryption</source> <translation>Cüzdan şifrelemesi için kullanılan parolayı değiştir</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation> <numerusform>%n saniye önce</numerusform> </translation> </message> + <message> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation>Bitcoin penceresini göster ya da sakla</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation>Bitcoin istemcisi</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="482"/> + <source>%n active connection(s) to Bitcoin network</source> + <translation> + <numerusform>Bitcoin şebekesine %n faal bağlantı</numerusform> + </translation> + </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation> <numerusform>%n saat önce</numerusform> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Backup Wallet</source> - <translation>Cüzdanı yedekle</translation> + <location filename="../bitcoingui.cpp" line="564"/> + <source>Up to date</source> + <translation>Güncel</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> - <source>There was an error trying to save the wallet data to the new location.</source> - <translation>Cüzdan verilerinin başka bir konumda kaydedilmesi sırasında bir hata meydana geldi.</translation> + <location filename="../bitcoingui.cpp" line="636"/> + <source>Sending...</source> + <translation>Yollanıyor...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> + <location filename="../bitcoingui.cpp" line="663"/> + <source>Sent transaction</source> + <translation>Muamele yollandı</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="798"/> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation>Cüzdan <b>şifrelenmiştir</b> ve şu anda <b>kilitlidir</b></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="418"/> + <source>bitcoin-qt</source> + <translation>bitcoin-qt</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="235"/> + <source>E&xit</source> + <translation>&Çık</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="242"/> + <source>About &Qt</source> + <translation>&Qt hakkında</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="236"/> + <source>Quit application</source> + <translation>Uygulamadan çık</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="281"/> + <source>&File</source> + <translation>&Dosya</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="290"/> <source>&Settings</source> <translation>&Ayarlar</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> + <location filename="../bitcoingui.cpp" line="303"/> <source>Tabs toolbar</source> <translation>Sekme araç çubuğu</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>Muamele tarihçesinin %2 sayıda blokundan %1 adet blok indirildi.</translation> + <location filename="../bitcoingui.cpp" line="314"/> + <source>Actions toolbar</source> + <translation>Faaliyet araç çubuğu</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="327"/> + <source>[testnet]</source> + <translation>[testnet]</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> - <source>%n active connection(s) to Bitcoin network</source> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> <translation> - <numerusform>Bitcoin şebekesine %n faal bağlantı</numerusform> + <numerusform>~%n blok kaldı</numerusform> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> - <source>Sent transaction</source> - <translation>Muamele yollandı</translation> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>Muamele tarihçesinden %1 blok indirildi (toplam %2 blok, %%3 tamamlandı).</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> + <location filename="../bitcoingui.cpp" line="531"/> <source>Downloaded %1 blocks of transaction history.</source> <translation>Muamele tarihçesinin %1 adet bloku indirildi.</translation> </message> - <message> - <location filename="../bitcoingui.cpp" line="237"/> - <source>E&xit</source> - <translation>&Çık</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="242"/> - <source>Show information about Bitcoin</source> - <translation>Bitcoin hakkında bilgi göster</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="217"/> - <source>Sign &message</source> - <translation>&Mesaj imzala</translation> - </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>%n gün önce</numerusform> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> + <location filename="../bitcoingui.cpp" line="569"/> + <source>Catching up...</source> + <translation>Aralık kapatılıyor...</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="632"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="664"/> <source>Incoming transaction</source> <translation>Gelen muamele</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -593,37 +604,32 @@ Adres: %4 </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> - <source>Send coins to a bitcoin address</source> - <translation>Bir bitcoin adresine para (bitcoin) yollar</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="218"/> - <source>Prove you control an address</source> - <translation>Bu adresin kontrolünüz altında olduğunu ispatlayın</translation> + <location filename="../bitcoingui.cpp" line="824"/> + <source>There was an error trying to save the wallet data to the new location.</source> + <translation>Cüzdan verilerinin başka bir konumda kaydedilmesi sırasında bir hata meydana geldi.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>Bitcoin seçeneklerinin yapılandırmasını değiştirir</translation> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Backup Wallet</source> + <translation>Cüzdanı yedekle</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>&Parolayı değiştir</translation> + <location filename="../bitcoingui.cpp" line="824"/> + <source>Backup Failed</source> + <translation>Yedekleme başarısız oldu</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation>Cüzdanı &şifrele</translation> + <location filename="../bitcoingui.cpp" line="240"/> + <source>Show information about Bitcoin</source> + <translation>Bitcoin hakkında bilgi gösterir</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> - <source>&File</source> - <translation>&Dosya</translation> + <location filename="../bitcoingui.cpp" line="215"/> + <source>Sign &message</source> + <translation>&Mesaj imzala</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Ciddi bir hata oluştu. Bitcoin artık güvenli bir şekilde işlemeye devam edemez ve kapanacaktır.</translation> </message> @@ -631,22 +637,22 @@ Adres: %4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>Miktarı göstermek için &birim: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>Para (coin) gönderildiğinde arayüzde gösterilecek varsayılan alt birimi seçiniz</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>Muamele listesinde adresleri &göster</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished">Muamele listesinde Bitcoin adreslerinin gösterilip gösterilmeyeceklerini belirler</translation> </message> @@ -722,82 +728,92 @@ Adres: %4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>Bitcoin'i pencere sistemi ile &başlat</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Bitcoin'i bilgisayar başlatıldığında başlatır</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>İşlem çubuğu yerine sistem çekmesine &küçült</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>Küçültüldükten sonra sadece çekmece ikonu gösterir</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> + <location filename="../optionsdialog.cpp" line="185"/> <source>Map port using &UPnP</source> <translation>Portları &UPnP kullanarak haritala</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="181"/> + <location filename="../optionsdialog.cpp" line="186"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Yönlendiricide Bitcoin istemci portlarını otomatik olarak açar. Bu, sadece yönlendiricinizin UPnP desteği bulunuyorsa ve etkinse çalışabilir.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="180"/> <source>M&inimize on close</source> <translation>Kapatma sırasında k&üçült</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="186"/> + <location filename="../optionsdialog.cpp" line="181"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>Pencere kapatıldığında uygulamadan çıkmak yerine uygulamayı küçültür. Bu seçenek etkinleştirildiğinde, uygulama sadece menüden çıkış seçildiğinde kapanacaktır.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>SOCKS4 vekil sunucusu vasıtasıyla ba&ğlan:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Bitcoin şebekesine SOCKS4 vekil sunucusu vasıtasıyla bağlanır (mesela Tor ile bağlanıldığında)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>Vekil &İP: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>Vekil sunucunun İP adresi (mesela 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>&Port: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Vekil sunucun portu (örneğin 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>Muamele ücreti &öde</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation>Kapanışta veritabanlarını &ayır</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation>Çıkışta blok ve adres veri tabanlarını ayırır. Bu, kapanışı yavaşlatır ancak veri tabanlarının başka klasörlere taşınabilmelerine imkân sağlar. Cüzdan daima ayırılır.</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>Muamelelerin hızlı işlenmesini garantilemeye yardım eden, seçime dayalı kB başı muamele ücreti. Muamelelerin çoğunluğunun boyutu 1 kB'dir. 0.01 ücreti önerilir. </translation> </message> @@ -895,17 +911,17 @@ Adres: %4 <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>Ana menü</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>Görünüm</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>Seçenekler</translation> </message> @@ -923,6 +939,11 @@ Adres: %4 <translation>Bakiye:</translation> </message> <message> + <location filename="../forms/overviewpage.ui" line="61"/> + <source>0</source> + <translation>0</translation> + </message> + <message> <location filename="../forms/overviewpage.ui" line="88"/> <source>Wallet</source> <translation>Cüzdan</translation> @@ -957,30 +978,30 @@ Adres: %4 <source><b>Recent transactions</b></source> <translation><b>Son muameleler</b></translation> </message> - <message> - <location filename="../forms/overviewpage.ui" line="61"/> - <source>0</source> - <translation>0</translation> - </message> </context> <context> <name>QRCodeDialog</name> <message> - <location filename="../forms/qrcodedialog.ui" line="186"/> - <source>&Save As...</source> - <translation>&Farklı kaydet...</translation> + <location filename="../qrcodedialog.cpp" line="46"/> + <source>Error encoding URI into QR Code.</source> + <translation>URI'nin QR koduna kodlanmasında hata oluştu.</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>PNG Images (*.png)</source> <translation>PNG resimleri (*.png)</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation>Resmi kaydet...</translation> </message> <message> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>Sonuç URI çok uzun, etiket ya da mesaj metnini kısaltmayı deneyiniz.</translation> + </message> + <message> <location filename="../forms/qrcodedialog.ui" line="144"/> <source>Message:</source> <translation>Mesaj:</translation> @@ -1016,9 +1037,9 @@ Adres: %4 <translation>Etiket:</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> - <source>Error encoding URI into QR Code.</source> - <translation>URI'nin QR koduna kodlanmasında hata oluştu.</translation> + <location filename="../forms/qrcodedialog.ui" line="186"/> + <source>&Save As...</source> + <translation>&Farklı kaydet...</translation> </message> </context> <context> @@ -1046,16 +1067,21 @@ Adres: %4 <translation>&Alıcı ekle...</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="84"/> - <source>Remove all transaction fields</source> - <translation>Bütün muamele alanlarını kaldır</translation> - </message> - <message> <location filename="../forms/sendcoinsdialog.ui" line="87"/> <source>Clear all</source> <translation>Tümünü temizle</translation> </message> <message> + <location filename="../forms/sendcoinsdialog.ui" line="147"/> + <source>S&end</source> + <translation>&Gönder</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="84"/> + <source>Remove all transaction fields</source> + <translation>Bütün muamele alanlarını kaldır</translation> + </message> + <message> <location filename="../forms/sendcoinsdialog.ui" line="106"/> <source>Balance:</source> <translation>Bakiye:</translation> @@ -1071,11 +1097,6 @@ Adres: %4 <translation>Yollama etkinliğini teyit ediniz</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="147"/> - <source>S&end</source> - <translation>&Gönder</translation> - </message> - <message> <location filename="../sendcoinsdialog.cpp" line="95"/> <source><b>%1</b> to %2 (%3)</source> <translation><b>%1</b> şu adrese: %2 (%3)</translation> @@ -1087,13 +1108,13 @@ Adres: %4 </message> <message> <location filename="../sendcoinsdialog.cpp" line="101"/> - <source> and </source> - <translation> ve </translation> + <source>Are you sure you want to send %1?</source> + <translation>%1 tutarını göndermek istediğinizden emin misiniz?</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="101"/> - <source>Are you sure you want to send %1?</source> - <translation>%1 tutarını göndermek istediğinizden emin misiniz?</translation> + <source> and </source> + <translation> ve </translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="124"/> @@ -1101,6 +1122,11 @@ Adres: %4 <translation>Alıcı adresi geçerli değildir, lütfen denetleyiniz.</translation> </message> <message> + <location filename="../sendcoinsdialog.cpp" line="129"/> + <source>The amount to pay must be larger than 0.</source> + <translation>Ödeyeceğiniz tutarın sıfırdan yüksek olması gerekir.</translation> + </message> + <message> <location filename="../sendcoinsdialog.cpp" line="134"/> <source>The amount exceeds your balance.</source> <translation>Tutar bakiyenizden yüksektir.</translation> @@ -1125,15 +1151,15 @@ Adres: %4 <source>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.</source> <translation>Hata: Muamele reddedildi. Cüzdanınızdaki madenî paraların bazıları zaten harcanmış olduğunda bu meydana gelebilir. Örneğin wallet.dat dosyasının bir kopyasını kullandıysanız ve kopyada para harcandığında ancak burada harcandığı işaretlenmediğinde.</translation> </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="129"/> - <source>The amount to pay must be larger than 0.</source> - <translation>Ödeyeceğiniz tutarın sıfırdan yüksek olması gerekir.</translation> - </message> </context> <context> <name>SendCoinsEntry</name> <message> + <location filename="../forms/sendcoinsentry.ui" line="103"/> + <source>Choose address from address book</source> + <translation>Adres defterinden adres seç</translation> + </message> + <message> <location filename="../forms/sendcoinsentry.ui" line="14"/> <source>Form</source> <translation>Form</translation> @@ -1165,11 +1191,6 @@ Adres: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="103"/> - <source>Choose address from address book</source> - <translation>Adres defterinden adres seç</translation> - </message> - <message> <location filename="../forms/sendcoinsentry.ui" line="113"/> <source>Alt+A</source> <translation>Alt+A</translation> @@ -1199,142 +1220,142 @@ Adres: %4 <name>TransactionDesc</name> <message> <location filename="../transactiondesc.cpp" line="20"/> - <source>Open until %1</source> - <translation>%1 değerine dek açık</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="18"/> <source>Open for %1 blocks</source> <translation>%1 blok için açık</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="28"/> + <location filename="../transactiondesc.cpp" line="30"/> <source>%1/unconfirmed</source> <translation>%1/doğrulanmadı</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation>%1/çevrimdışı mı?</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> - <source>%1 confirmations</source> - <translation>%1 teyit</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="47"/> - <source><b>Status:</b> </source> - <translation><b>Durum:</b> </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="52"/> - <source>, has not been successfully broadcast yet</source> - <translation>, henüz başarılı bir şekilde yayınlanmadı</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="54"/> - <source>, broadcast through %1 node</source> - <translation>, %1 düğüm vasıtasıyla yayınlandı</translation> + <location filename="../transactiondesc.cpp" line="22"/> + <source>Open until %1</source> + <translation>%1 değerine dek açık</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>, %1 düğüm vasıtasıyla yayınlandı</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> - <source><b>Date:</b> </source> - <translation><b>Tarih:</b> </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>Kaynak:</b> Oluşturuldu<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>Gönderen:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="92"/> <source>unknown</source> <translation>bilinmiyor</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> - <source><b>To:</b> </source> - <translation><b>Alıcı:</b> </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation> (sizin, etiket: </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation> (sizin)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>Net miktar:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>Mesaj:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>Yorum:</translation> </message> <message> <location filename="../transactiondesc.cpp" line="223"/> + <source>Transaction ID:</source> + <translation>Muamele kimliği:</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation>Oluşturulan paraların (coin) harcanabilmelerinden önce 120 blok beklemeleri gerekmektedir. Bu blok, oluşturduğunuzda, blok zincirine eklenmesi için ağda yayınlandı. Zincire eklenmesi başarısız olursa, "kabul edilmedi" olarak değiştirilecek ve harcanamayacaktır. Bu, bazen başka bir düğüm sizden birkaç saniye önce ya da sonra blok oluşturursa meydana gelebilir.</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation><b>Gelir:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="32"/> + <source>%1 confirmations</source> + <translation>%1 teyit</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="50"/> + <source><b>Status:</b> </source> + <translation><b>Durum:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="55"/> + <source>, has not been successfully broadcast yet</source> + <translation>, henüz başarılı bir şekilde yayınlanmadı</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="57"/> + <source>, broadcast through %1 node</source> + <translation>, %1 düğüm vasıtasıyla yayınlandı</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="63"/> + <source><b>Date:</b> </source> + <translation><b>Tarih:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> + <source><b>To:</b> </source> + <translation><b>Alıcı:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation>(%1, %2 ek blok sonrasında olgunlaşacak)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation>(kabul edilmedi)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation><b>Gider:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation><b>Muamele ücreti:<b> </translation> </message> - <message> - <location filename="../transactiondesc.cpp" line="220"/> - <source>Transaction ID:</source> - <translation>Muamele kimliği:</translation> - </message> </context> <context> <name>TransactionDescDialog</name> @@ -1351,6 +1372,28 @@ Adres: %4 </context> <context> <name>TransactionTableModel</name> + <message numerus="yes"> + <location filename="../transactiontablemodel.cpp" line="277"/> + <source>Open for %n block(s)</source> + <translation> + <numerusform>%n blok için açık</numerusform> + </translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="280"/> + <source>Open until %1</source> + <translation>%1 değerine dek açık</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="283"/> + <source>Offline (%1 confirmations)</source> + <translation>Çevrimdışı (%1 teyit)</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="286"/> + <source>Unconfirmed (%1 of %2 confirmations)</source> + <translation>Doğrulanmadı (%1 (toplam %2 üzerinden) teyit)</translation> + </message> <message> <location filename="../transactiontablemodel.cpp" line="303"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> @@ -1362,11 +1405,6 @@ Adres: %4 <translation>Oluşturuldu ama kabul edilmedi</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="599"/> - <source>Type of transaction.</source> - <translation>Muamele türü.</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="214"/> <source>Date</source> <translation>Tarih</translation> @@ -1386,32 +1424,10 @@ Adres: %4 <source>Type</source> <translation>Tür</translation> </message> - <message numerus="yes"> - <location filename="../transactiontablemodel.cpp" line="277"/> - <source>Open for %n block(s)</source> - <translation> - <numerusform>%n blok için açık</numerusform> - </translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="280"/> - <source>Open until %1</source> - <translation>%1 değerine dek açık</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="283"/> - <source>Offline (%1 confirmations)</source> - <translation>Çevrimdışı (%1 doğrulama)</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="286"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Doğrulanmadı (%1 (toplam %2 üzerinden) doğrulama)</translation> - </message> <message> <location filename="../transactiontablemodel.cpp" line="289"/> <source>Confirmed (%1 confirmations)</source> - <translation>Doğrulandı (%1 teyit)</translation> + <translation>Doğrulandı (%1 doğrulama)</translation> </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="297"/> @@ -1470,18 +1486,28 @@ Adres: %4 <source>Amount removed from or added to balance.</source> <translation>Bakiyeden alınan ya da bakiyeye eklenen miktar.</translation> </message> + <message> + <location filename="../transactiontablemodel.cpp" line="599"/> + <source>Type of transaction.</source> + <translation>Muamele türü.</translation> + </message> </context> <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="289"/> - <source>Could not write to file %1.</source> - <translation>%1 dosyasına yazılamadı.</translation> + <location filename="../transactionview.cpp" line="56"/> + <source>Today</source> + <translation>Bugün</translation> </message> <message> - <location filename="../transactionview.cpp" line="289"/> - <source>Error exporting</source> - <translation>Dışa aktarımda hata oluştu</translation> + <location filename="../transactionview.cpp" line="279"/> + <source>Confirmed</source> + <translation>Doğrulandı</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="281"/> + <source>Type</source> + <translation>Tür</translation> </message> <message> <location filename="../transactionview.cpp" line="285"/> @@ -1489,9 +1515,34 @@ Adres: %4 <translation>Tanımlayıcı</translation> </message> <message> - <location filename="../transactionview.cpp" line="279"/> - <source>Confirmed</source> - <translation>Doğrulandı</translation> + <location filename="../transactionview.cpp" line="289"/> + <source>Error exporting</source> + <translation>Dışa aktarımda hata oluştu</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="90"/> + <source>Min amount</source> + <translation>Asgari miktar</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="125"/> + <source>Copy label</source> + <translation>Etiketi kopyala</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="128"/> + <source>Show details...</source> + <translation>Detayları göster...</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="270"/> + <source>Export Transaction Data</source> + <translation>Muamele verilerini dışa aktar</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="271"/> + <source>Comma separated file (*.csv)</source> + <translation>Virgülle ayrılmış değerler dosyası (*.csv)</translation> </message> <message> <location filename="../transactionview.cpp" line="384"/> @@ -1510,11 +1561,6 @@ Adres: %4 <translation>Hepsi</translation> </message> <message> - <location filename="../transactionview.cpp" line="56"/> - <source>Today</source> - <translation>Bugün</translation> - </message> - <message> <location filename="../transactionview.cpp" line="57"/> <source>This week</source> <translation>Bu hafta</translation> @@ -1555,16 +1601,31 @@ Adres: %4 <translation>Oluşturulan</translation> </message> <message> + <location filename="../transactionview.cpp" line="84"/> + <source>Enter address or label to search</source> + <translation>Aranacak adres ya da etiket giriniz</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="124"/> + <source>Copy address</source> + <translation>Adresi kopyala</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="126"/> + <source>Copy amount</source> + <translation>Miktarı kopyala</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="127"/> + <source>Edit label</source> + <translation>Etiketi düzenle</translation> + </message> + <message> <location filename="../transactionview.cpp" line="280"/> <source>Date</source> <translation>Tarih</translation> </message> <message> - <location filename="../transactionview.cpp" line="281"/> - <source>Type</source> - <translation>Tür</translation> - </message> - <message> <location filename="../transactionview.cpp" line="282"/> <source>Label</source> <translation>Etiket</translation> @@ -1580,9 +1641,9 @@ Adres: %4 <translation>Miktar</translation> </message> <message> - <location filename="../transactionview.cpp" line="84"/> - <source>Enter address or label to search</source> - <translation>Aranacak adres ya da etiket giriniz</translation> + <location filename="../transactionview.cpp" line="289"/> + <source>Could not write to file %1.</source> + <translation>%1 dosyasına yazılamadı.</translation> </message> <message> <location filename="../transactionview.cpp" line="60"/> @@ -1594,51 +1655,11 @@ Adres: %4 <source>Other</source> <translation>Diğer</translation> </message> - <message> - <location filename="../transactionview.cpp" line="90"/> - <source>Min amount</source> - <translation>Asgari miktar</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="124"/> - <source>Copy address</source> - <translation>Adresi kopyala</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="125"/> - <source>Copy label</source> - <translation>Etiketi kopyala</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="126"/> - <source>Copy amount</source> - <translation>Miktarı kopyala</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="127"/> - <source>Edit label</source> - <translation>Etiketi düzenle</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="128"/> - <source>Show details...</source> - <translation>Detayları göster...</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="270"/> - <source>Export Transaction Data</source> - <translation>Muamele verilerini dışa aktar</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="271"/> - <source>Comma separated file (*.csv)</source> - <translation>Virgülle ayrılmış değerler dosyası (*.csv)</translation> - </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>Gönderiliyor...</translation> </message> @@ -1646,401 +1667,494 @@ Adres: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> + <location filename="../bitcoinstrings.cpp" line="50"/> <source>Don't generate coins</source> <translation>Bitcoin oluşturmasını devre dışı bırak</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>En iyi blok değiştiğinde komutu çalıştır (komut için %s parametresi blok hash değeri ile değiştirilecektir)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="51"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation>JSON-RPC bağlantıları için dinlenecek <port> (varsayılan: 8332)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="75"/> + <location filename="../bitcoinstrings.cpp" line="113"/> <source>Loading addresses...</source> <translation>Adresler yükleniyor...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> + <location filename="../bitcoinstrings.cpp" line="116"/> <source>Error loading blkindex.dat</source> <translation>blkindex.dat dosyasının yüklenmesinde hata oluştu</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> - <source>Error loading wallet.dat: Wallet corrupted</source> - <translation>wallet.dat dosyasının yüklenmesinde hata oluştu: bozuk cüzdan</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="82"/> + <location filename="../bitcoinstrings.cpp" line="120"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Cüzdanın tekrar yazılması gerekiyordu: işlemi tamamlamak için Bitcoin'i yeniden başlatınız</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> + <location filename="../bitcoinstrings.cpp" line="121"/> <source>Error loading wallet.dat</source> <translation>wallet.dat dosyasının yüklenmesinde hata oluştu</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> + <location filename="../bitcoinstrings.cpp" line="122"/> <source>Cannot downgrade wallet</source> <translation>Cüzdan eski biçime geri alınamaz</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> - <source>Done loading</source> - <translation>Yükleme tamamlandı</translation> + <location filename="../bitcoinstrings.cpp" line="54"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation>Veritabanı önbellek boyutunu megabayt olarak belirt (varsayılan: 25)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Find peers using internet relay chat (default: 0)</source> - <translation>Eşleri Internet Relay Chat vasıtasıyla bul (varsayılan: 0)</translation> + <location filename="../bitcoinstrings.cpp" line="42"/> + <source>Usage:</source> + <translation>Kullanım:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> - <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation>Başlangıçta ne kadar blokun denetleneceği (varsayılan: 2500, 0 = tümü)</translation> + <location filename="../bitcoinstrings.cpp" line="84"/> + <source>Send trace/debug info to debugger</source> + <translation>Hata ayıklayıcıya -debugger- trace/hata ayıklama verileri gönder</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> - <source>How thorough the block verification is (0-6, default: 1)</source> - <translation>Blok kontrolünün derinliği (0 ilâ 6, varsayılan: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="86"/> + <source>Password for JSON-RPC connections</source> + <translation>JSON-RPC bağlantıları için parola</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> - <source>Loading wallet...</source> - <translation>Cüzdan yükleniyor...</translation> + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>Şu <ip> adresinde (varsayılan: 127.0.0.1) çalışan düğüme komut yolla</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> - <source>Cannot write default address</source> - <translation>Varsayılan adres yazılamadı</translation> + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>Username for JSON-RPC connections</source> + <translation>JSON-RPC bağlantıları için kullanıcı ismi</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Veritabanı önbellek boyutunu megabayt olarak belirt (varsayılan: 25)</translation> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> - <source>Upgrade wallet to latest format</source> - <translation>Cüzdanı en yeni biçime güncelle</translation> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Usage:</source> - <translation>Kullanım:</translation> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">Hata: Muamele oluşturması başarısız oldu.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>Kabul edilebilir şifreler (varsayılan: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">Hata: Muamele reddedildi. Cüzdanınızdaki madenî paraların bazıları zaten harcanmış olduğunda bu meydana gelebilir. Örneğin wallet.dat dosyasının bir kopyasını kullandıysanız ve kopyada para harcandığında ancak burada harcandığı işaretlenmediğinde.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> - <source>Run in the background as a daemon and accept commands</source> - <translation>Arka planda daemon (servis) olarak çalış ve komutları kabul et</translation> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation>%u RPC portunun dinleme için kurulması sırasında bir hata meydana geldi: %s</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Send trace/debug info to debugger</source> - <translation>Hata ayıklayıcıya -debugger- trace/hata ayıklama verileri gönder</translation> + <location filename="../bitcoinstrings.cpp" line="77"/> + <source>Fee per KB to add to transactions you send</source> + <translation>Yolladığınız muameleler için eklenecek KB başı ücret</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> - <source>Username for JSON-RPC connections</source> - <translation>JSON-RPC bağlantıları için kullanıcı ismi</translation> + <location filename="../bitcoinstrings.cpp" line="78"/> + <source>Accept command line and JSON-RPC commands</source> + <translation>Konut satırı ve JSON-RPC komutlarını kabul et</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Password for JSON-RPC connections</source> - <translation>JSON-RPC bağlantıları için parola</translation> + <location filename="../bitcoinstrings.cpp" line="80"/> + <source>Use the test network</source> + <translation>Deneme şebekesini kullan</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>Şu <ip> adresinde (varsayılan: 127.0.0.1) çalışan düğüme komut yolla</translation> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Prepend debug output with timestamp</source> + <translation>Hata ayıklama çıktısına tarih ön ekleri ilâve et</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation>Anahtar alan boyutunu <n> değerine ayarla (varsayılan: 100)</translation> + <location filename="../bitcoinstrings.cpp" line="83"/> + <source>Send trace/debug info to console instead of debug.log file</source> + <translation>Trace/hata ayıklama verilerini debug.log dosyası yerine konsola gönder</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> - <source>Rescan the block chain for missing wallet transactions</source> - <translation>Blok zincirini eksik cüzdan muameleleri için tekrar tara</translation> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>Kabul edilebilir şifreler (varsayılan: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> - <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>JSON-RPC bağlantıları için OpenSSL (https) kullan</translation> + <location filename="../bitcoinstrings.cpp" line="118"/> + <source>Error loading wallet.dat: Wallet corrupted</source> + <translation>wallet.dat dosyasının yüklenmesinde hata oluştu: bozuk cüzdan</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>Pid dosyası belirt (varsayılan: bitcoind.pid)</translation> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source>Rescanning...</source> + <translation>Yeniden tarama...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> - <source>Loading block index...</source> - <translation>Blok indeksi yükleniyor...</translation> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation>Hata</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>Yetersiz bakiye</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation>%s seçeneğini kullanmak için</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="56"/> <source>Specify connection timeout (in milliseconds)</source> <translation>Bağlantı zaman aşım süresini milisaniye olarak belirt</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Add a node to connect to and attempt to keep the connection open</source> - <translation>Bağlanılacak düğüm ekle ve bağlantıyı zinde tutmaya çalış</translation> + <location filename="../bitcoinstrings.cpp" line="90"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation>En iyi blok değiştiğinde komutu çalıştır (komut için %s parametresi blok hash değeri ile değiştirilecektir)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation>Blok ve adres veri tabanlarını ayır. Kapatma süresini arttırır (varsayılan: 0)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="63"/> + <source>Find peers using internet relay chat (default: 0)</source> + <translation>Eşleri Internet Relay Chat vasıtasıyla bul (varsayılan: 0)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="124"/> + <source>Cannot write default address</source> + <translation>Varsayılan adres yazılamadı</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>How thorough the block verification is (0-6, default: 1)</source> + <translation>Blok kontrolünün derinliği (0 ilâ 6, varsayılan: 1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="43"/> + <source>Send command to -server or bitcoind</source> + <translation>-server ya da bitcoind'ye komut gönder</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Upgrade wallet to latest format</source> + <translation>Cüzdanı en yeni biçime güncelle</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="102"/> + <source>Server certificate file (default: server.cert)</source> + <translation>Sunucu sertifika dosyası (varsayılan: server.cert)</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="41"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Yolladığınız muameleler için eklenecek KB başı ücret</translation> + <source>Bitcoin version</source> + <translation>Bitcoin sürümü</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> - <source>Accept command line and JSON-RPC commands</source> - <translation>Konut satırı ve JSON-RPC komutlarını kabul et</translation> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation>%s, şu yapılandırma dosyasında rpc parolası belirtmeniz gerekir: + %s +Aşağıdaki rastgele oluşturulan parolayı kullanmanız tavsiye edilir: +rpcuser=bitcoinrpc +rpcpassword=%s +(bu parolayı hatırlamanız gerekli değildir) +Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluşturunuz. +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> - <source>Use the test network</source> - <translation>Deneme şebekesini kullan</translation> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>Done loading</source> + <translation>Yükleme tamamlandı</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> - <source>Prepend debug output with timestamp</source> - <translation>Hata ayıklama çıktısına tarih ön ekleri ilâve et</translation> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Loading wallet...</source> + <translation>Cüzdan yükleniyor...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Trace/hata ayıklama verilerini debug.log dosyası yerine konsola gönder</translation> + <location filename="../bitcoinstrings.cpp" line="101"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>JSON-RPC bağlantıları için OpenSSL (https) kullan</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> + <location filename="../bitcoinstrings.cpp" line="88"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Belirtilen İP adresinden JSON-RPC bağlantılarını kabul et</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> - <source>Server private key (default: server.pem)</source> - <translation>Sunucu özel anahtarı (varsayılan: server.pem)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="71"/> + <location filename="../bitcoinstrings.cpp" line="107"/> <source>This help message</source> <translation>Bu yardım mesajı</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="45"/> + <source>Get help for a command</source> + <translation>Bir komut için yardım al</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation>wallet.dat dosyasının yüklenmesinde hata oluştu: cüzdanın daha yeni bir Bitcoin sürümüne ihtiyacı var</translation> + <location filename="../bitcoinstrings.cpp" line="51"/> + <source>Start minimized</source> + <translation>Küçültülmüş olarak başla</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> + <location filename="../bitcoinstrings.cpp" line="123"/> <source>Cannot initialize keypool</source> <translation>Keypool başlatılamadı</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Get help for a command</source> - <translation>Bir komut için yardım al</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Generate coins</source> - <translation>Madenî para (Bitcoin) oluştur</translation> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Gönderiliyor...</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Start minimized</source> - <translation>Küçültülmüş olarak başla</translation> + <source>Invalid amount</source> + <translation>Geçersiz miktar</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Specify data directory</source> - <translation>Veri dizinini belirt</translation> + <source>Warning: Disk space is low</source> + <translation>Uyarı: Disk alanı düşük</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> - <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation>Bağlantılar için dinlenecek <port> (varsayılan: 8333 ya da testnet: 18333)</translation> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>%s veri dizininde kilit elde edilemedi. Bitcoin muhtemelen hâlihazırda çalışmaktadır.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> - <source>Rescanning...</source> - <translation>Yeniden tarama...</translation> + <location filename="../bitcoinstrings.cpp" line="68"/> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> + <translation>Aksaklık gösteren eşlerle yeni bağlantıları engelleme süresi, saniye olarak (varsayılan: 86400)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> - <source>Maintain at most <n> connections to peers (default: 125)</source> - <translation>Eşler ile en çok <n> adet bağlantı kur (varsayılan: 125)</translation> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>Pid dosyası belirt (varsayılan: bitcoind.pid)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> - <source>Connect only to the specified node</source> - <translation>Sadece belirtilen düğüme bağlan</translation> + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Specify data directory</source> + <translation>Veri dizinini belirt</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Threshold for disconnecting misbehaving peers (default: 100)</source> - <translation>Aksaklık gösteren eşlerle bağlantıyı kesme sınırı (varsayılan: 100)</translation> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation>rpcpassword=<parola> şu yapılandırma dosyasında belirtilmelidir: +%s +Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluşturunuz.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation>Aksaklık gösteren eşlerle yeni bağlantıları engelleme süresi, saniye olarak (varsayılan: 86400)</translation> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation>Diskteki veritabanı kütüğü boyutunu megabayt olarak belirt (varsayılan: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="61"/> + <source>Add a node to connect to and attempt to keep the connection open</source> + <translation>Bağlanılacak düğüm ekle ve bağlantıyı zinde tutmaya çalış</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation>Her bağlantı için alım tamponu, <n>*1000 bayt (varsayılan: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation>Her bağlantı için yollama tamponu, <n>*1000 bayt (varsayılan: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> + <location filename="../bitcoinstrings.cpp" line="81"/> <source>Output extra debugging information</source> <translation>İlâve hata ayıklama verisi çıkar</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="119"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> + <translation>wallet.dat dosyasının yüklenmesinde hata oluştu: cüzdanın daha yeni bir Bitcoin sürümüne ihtiyacı var</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="49"/> + <source>Generate coins</source> + <translation>Madenî para (Bitcoin) oluştur</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source>How many blocks to check at startup (default: 2500, 0 = all)</source> + <translation>Başlangıçta ne kadar blokun denetleneceği (varsayılan: 2500, 0 = tümü)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation> SSL seçenekleri: (SSL kurulum bilgisi için Bitcoin vikisine bakınız)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> - <translation>Uyarı: Disk alanı düşük</translation> + <location filename="../bitcoinstrings.cpp" line="59"/> + <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> + <translation>Bağlantılar için dinlenecek <port> (varsayılan: 8333 ya da testnet: 18333)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> - <source>Error loading addr.dat</source> - <translation>addr.dat dosyasının yüklenmesinde hata oluştu</translation> + <location filename="../bitcoinstrings.cpp" line="115"/> + <source>Loading block index...</source> + <translation>Blok indeksi yükleniyor...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> - <source>Invalid -proxy address</source> - <translation>Geçersiz -proxy adresi</translation> + <location filename="../bitcoinstrings.cpp" line="60"/> + <source>Maintain at most <n> connections to peers (default: 125)</source> + <translation>Eşler ile en çok <n> adet bağlantı kur (varsayılan: 125)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> - <source>Invalid amount for -paytxfee=<amount></source> - <translation>-paytxfee=<miktar> için geçersiz miktar</translation> + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation>Blok zincirini eksik cüzdan muameleleri için tekrar tara</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> - <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> - <translation>Uyarı: -paytxfee çok yüksek bir değere ayarlanmış. Bu, muamele gönderirseniz ödeyeceğiniz muamele ücretidir.</translation> + <location filename="../bitcoinstrings.cpp" line="79"/> + <source>Run in the background as a daemon and accept commands</source> + <translation>Arka planda daemon (servis) olarak çalış ve komutları kabul et</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> - <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> - <translation>%d sayılı porta bu bilgisayarda bağlanılamadı. Bitcoin muhtemelen hâlihazırda çalışmaktadır.</translation> + <location filename="../bitcoinstrings.cpp" line="103"/> + <source>Server private key (default: server.pem)</source> + <translation>Sunucu özel anahtarı (varsayılan: server.pem)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> - <translation>Uyarı: Lütfen bilgisayarınızın tarih ve saatinin doğru olup olmadığını kontrol ediniz. Saatiniz doğru değilse Bitcoin gerektiği gibi çalışamaz.</translation> + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>Anahtar alan boyutunu <n> değerine ayarla (varsayılan: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> - <source>Error: CreateThread(StartNode) failed</source> - <translation>Hata: CreateThread(StartNode) başarısız oldu</translation> + <location filename="../bitcoinstrings.cpp" line="47"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation>Yapılandırma dosyası belirt (varsayılan: bitcoin.conf)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Send command to -server or bitcoind</source> - <translation>-server ya da bitcoind'ye komut gönder</translation> + <location filename="../bitcoinstrings.cpp" line="67"/> + <source>Threshold for disconnecting misbehaving peers (default: 100)</source> + <translation>Aksaklık gösteren eşlerle bağlantıyı kesme sınırı (varsayılan: 100)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>JSON-RPC bağlantıları için dinlenecek <port> (varsayılan: 8332)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> + <location filename="../bitcoinstrings.cpp" line="44"/> <source>List commands</source> <translation>Komutları listele</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> + <location filename="../bitcoinstrings.cpp" line="46"/> <source>Options:</source> <translation>Seçenekler:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify configuration file (default: bitcoin.conf)</source> - <translation>Yapılandırma dosyası belirt (varsayılan: bitcoin.conf)</translation> + <location filename="../bitcoinstrings.cpp" line="62"/> + <source>Connect only to the specified node</source> + <translation>Sadece belirtilen düğüme bağlan</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Show splash screen on startup (default: 1)</source> - <translation>Başlatıldığında başlangıç ekranını göster (varsayılan: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation>Kullanım</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Connect through socks4 proxy</source> - <translation>Socks4 vekil sunucusu vasıtasıyla bağlan</translation> + <location filename="../bitcoinstrings.cpp" line="114"/> + <source>Error loading addr.dat</source> + <translation>addr.dat dosyasının yüklenmesinde hata oluştu</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Allow DNS lookups for addnode and connect</source> - <translation>Düğüm ekleme ve bağlantı için DNS aramalarına izin ver</translation> + <location filename="../bitcoinstrings.cpp" line="127"/> + <source>Invalid -proxy address</source> + <translation>Geçersiz -proxy adresi</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Accept connections from outside (default: 1)</source> - <translation type="unfinished">Dışarıdan gelen bağlantıları kabul et (varsayılan: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="128"/> + <source>Invalid amount for -paytxfee=<amount></source> + <translation>-paytxfee=<miktar> için geçersiz miktar</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Lisan belirt, mesela "de_De" (varsayılan: sistem dili)</translation> + <location filename="../bitcoinstrings.cpp" line="129"/> + <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> + <translation>Uyarı: -paytxfee çok yüksek bir değere ayarlanmış. Bu, muamele gönderirseniz ödeyeceğiniz muamele ücretidir.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Bitcoin version</source> - <translation>Bitcoin sürümü</translation> + <location filename="../bitcoinstrings.cpp" line="133"/> + <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> + <translation>%d sayılı porta bu bilgisayarda bağlanılamadı. Bitcoin muhtemelen hâlihazırda çalışmaktadır.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> - <source>Server certificate file (default: server.cert)</source> - <translation>Sunucu sertifika dosyası (varsayılan: server.cert)</translation> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <translation>Uyarı: Lütfen bilgisayarınızın tarih ve saatinin doğru olup olmadığını kontrol ediniz. Saatiniz doğru değilse Bitcoin gerektiği gibi çalışamaz.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Find peers using DNS lookup (default: 1)</source> - <translation type="unfinished">Eşleri DNS araması vasıtasıyla bul (varsayılan: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="132"/> + <source>Error: CreateThread(StartNode) failed</source> + <translation>Hata: CreateThread(StartNode) başarısız oldu</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="64"/> + <source>Accept connections from outside (default: 1)</source> + <translation type="unfinished">Dışarıdan gelen bağlantıları kabul et (varsayılan: 1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="65"/> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Lisan belirt, mesela "de_De" (varsayılan: sistem dili)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="58"/> + <source>Allow DNS lookups for addnode and connect</source> + <translation>Düğüm ekleme ve bağlantı için DNS aramalarına izin ver</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished">Dinlenecek portu haritalamak için UPnP kullan (varsayılan: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished">Dinlenecek portu haritalamak için UPnP kullan (varsayılan: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>beta</translation> + <location filename="../bitcoinstrings.cpp" line="52"/> + <source>Show splash screen on startup (default: 1)</source> + <translation>Başlatıldığında başlangıç ekranını göster (varsayılan: 1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="57"/> + <source>Connect through socks4 proxy</source> + <translation>Socks4 vekil sunucusu vasıtasıyla bağlan</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="66"/> + <source>Find peers using DNS lookup (default: 1)</source> + <translation type="unfinished">Eşleri DNS araması vasıtasıyla bul (varsayılan: 1)</translation> </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts index 7e68c8dd0b..de03d586de 100644 --- a/src/qt/locale/bitcoin_uk.ts +++ b/src/qt/locale/bitcoin_uk.ts @@ -15,7 +15,7 @@ <translation>Версія <b>Bitcoin'a<b></translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -55,6 +55,16 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Створити нову адресу</translation> </message> <message> + <location filename="../addressbookpage.cpp" line="286"/> + <source>Comma separated file (*.csv)</source> + <translation>Файли відділені комами (*.csv)</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="299"/> + <source>Error exporting</source> + <translation>Помилка при експортуванні</translation> + </message> + <message> <location filename="../forms/addressbookpage.ui" line="60"/> <source>&New Address...</source> <translation>&Створити адресу...</translation> @@ -95,42 +105,32 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Видалити</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="299"/> + <source>Could not write to file %1.</source> + <translation>Неможливо записати у файл %1.</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>Скопіювати адресу</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation>Скопіювати мітку</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation>Редагувати</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>Видалити</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> - <source>Comma separated file (*.csv)</source> - <translation>Файли відділені комами (*.csv)</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="292"/> - <source>Could not write to file %1.</source> - <translation>Неможливо записати у файл %1.</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="292"/> - <source>Error exporting</source> - <translation>Помилка при експортуванні</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation>Експортувати адресну книгу</translation> </message> @@ -143,19 +143,29 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Назва</translation> </message> <message> - <location filename="../addresstablemodel.cpp" line="78"/> - <source>Address</source> - <translation>Адреса</translation> - </message> - <message> <location filename="../addresstablemodel.cpp" line="114"/> <source>(no label)</source> <translation>(немає назви)</translation> </message> + <message> + <location filename="../addresstablemodel.cpp" line="78"/> + <source>Address</source> + <translation>Адреса</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> <message> + <location filename="../askpassphrasedialog.cpp" line="145"/> + <source>Wallet unlock failed</source> + <translation>Не вдалося розблокувати гаманець</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="51"/> + <source>Decrypt wallet</source> + <translation>Дешифрувати гаманець</translation> + </message> + <message> <location filename="../askpassphrasedialog.cpp" line="55"/> <source>Enter the old and new passphrase to the wallet.</source> <translation>Ввести старий та новий паролі для гаманця.</translation> @@ -171,9 +181,14 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Новий пароль</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="75"/> - <source>Repeat new passphrase</source> - <translation>Повторіть пароль</translation> + <location filename="../forms/askpassphrasedialog.ui" line="94"/> + <source>TextLabel</source> + <translation>Текстова мітка</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="54"/> + <source>Change passphrase</source> + <translation>Змінити пароль</translation> </message> <message> <location filename="../forms/askpassphrasedialog.ui" line="26"/> @@ -181,32 +196,14 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Діалог</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="146"/> - <location filename="../askpassphrasedialog.cpp" line="157"/> - <location filename="../askpassphrasedialog.cpp" line="176"/> - <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation>Введений пароль є невірним.</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="156"/> - <source>Wallet decryption failed</source> - <translation>Не вдалося розшифрувати гаманець</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="111"/> - <location filename="../askpassphrasedialog.cpp" line="169"/> - <source>Wallet encrypted</source> - <translation>Гаманець зашифровано</translation> - </message> - <message> - <location filename="../forms/askpassphrasedialog.ui" line="94"/> - <source>TextLabel</source> - <translation>Текстова мітка</translation> + <location filename="../askpassphrasedialog.cpp" line="101"/> + <source>Confirm wallet encryption</source> + <translation>Підтвердити шифрування гаманця</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="51"/> - <source>Decrypt wallet</source> - <translation>Дешифрувати гаманець</translation> + <location filename="../forms/askpassphrasedialog.ui" line="75"/> + <source>Repeat new passphrase</source> + <translation>Повторіть пароль</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="38"/> @@ -214,11 +211,6 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Ця операція потребує пароль для розблокування гаманця.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="145"/> - <source>Wallet unlock failed</source> - <translation>Не вдалося розблокувати гаманець</translation> - </message> - <message> <location filename="../askpassphrasedialog.cpp" line="43"/> <source>Unlock wallet</source> <translation>Розблокувати гаманець</translation> @@ -229,27 +221,26 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Введіть новий пароль для гаманця.<br/>Будь ласка, використовуйте паролі що містять <b> як мінімум 10 випадкових символів </b> або <b> як мінімум 8 слів</b>.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="54"/> - <source>Change passphrase</source> - <translation>Змінити пароль</translation> + <location filename="../askpassphrasedialog.cpp" line="156"/> + <source>Wallet decryption failed</source> + <translation>Не вдалося розшифрувати гаманець</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="127"/> - <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>Виникла помилка під час шифрування гаманця. Ваш гаманець не було зашифровано.</translation> + <location filename="../askpassphrasedialog.cpp" line="35"/> + <source>Encrypt wallet</source> + <translation>Зашифрувати гаманець</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="126"/> - <location filename="../askpassphrasedialog.cpp" line="133"/> - <location filename="../askpassphrasedialog.cpp" line="175"/> - <location filename="../askpassphrasedialog.cpp" line="181"/> - <source>Wallet encryption failed</source> - <translation>Не вдалося зашифрувати гаманець</translation> + <location filename="../askpassphrasedialog.cpp" line="46"/> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Ця операція потребує пароль для дешифрування гаманця.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="101"/> - <source>Confirm wallet encryption</source> - <translation>Підтвердити шифрування гаманця</translation> + <location filename="../askpassphrasedialog.cpp" line="146"/> + <location filename="../askpassphrasedialog.cpp" line="157"/> + <location filename="../askpassphrasedialog.cpp" line="176"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Введений пароль є невірним.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="102"/> @@ -259,9 +250,10 @@ Are you sure you wish to encrypt your wallet?</source> Ви дійсно хочете зашифрувати свій гаманець?</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="113"/> - <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> - <translation>Біткоін-клієнт буде закрито для завершення процесу шифрування. Пам’ятайте, що шифрування гаманця не може повністю захистити ваші біткоіни від кражі, у випадку якщо ваш комп’ютер буде інфіковано шкідливими програмами.</translation> + <location filename="../askpassphrasedialog.cpp" line="111"/> + <location filename="../askpassphrasedialog.cpp" line="169"/> + <source>Wallet encrypted</source> + <translation>Гаманець зашифровано</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="117"/> @@ -269,25 +261,33 @@ Are you sure you wish to encrypt your wallet?</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../askpassphrasedialog.cpp" line="126"/> + <location filename="../askpassphrasedialog.cpp" line="133"/> + <location filename="../askpassphrasedialog.cpp" line="175"/> + <location filename="../askpassphrasedialog.cpp" line="181"/> + <source>Wallet encryption failed</source> + <translation>Не вдалося зашифрувати гаманець</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="170"/> + <source>Wallet passphrase was successfully changed.</source> + <translation>Пароль було успішно змінено.</translation> + </message> + <message> <location filename="../askpassphrasedialog.cpp" line="217"/> <location filename="../askpassphrasedialog.cpp" line="241"/> <source>Warning: The Caps Lock key is on.</source> <translation>Увага: Ввімкнено Caps Lock</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="35"/> - <source>Encrypt wallet</source> - <translation>Зашифрувати гаманець</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="46"/> - <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>Ця операція потребує пароль для дешифрування гаманця.</translation> + <location filename="../askpassphrasedialog.cpp" line="113"/> + <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>Біткоін-клієнт буде закрито для завершення процесу шифрування. Пам’ятайте, що шифрування гаманця не може повністю захистити ваші біткоіни від кражі, у випадку якщо ваш комп’ютер буде інфіковано шкідливими програмами.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="170"/> - <source>Wallet passphrase was successfully changed.</source> - <translation>Пароль було успішно змінено.</translation> + <location filename="../askpassphrasedialog.cpp" line="127"/> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Виникла помилка під час шифрування гаманця. Ваш гаманець не було зашифровано.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="134"/> @@ -299,246 +299,259 @@ Are you sure you wish to encrypt your wallet?</source> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="255"/> - <source>Encrypt or decrypt wallet</source> - <translation>Зашифрувати чи розшифрувати гаманець</translation> + <location filename="../bitcoingui.cpp" line="235"/> + <source>E&xit</source> + <translation>&Вихід</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> - <source>Show information about Bitcoin</source> - <translation>Показати інформацію про Bitcoin</translation> + <location filename="../bitcoingui.cpp" line="258"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>Змінити пароль, який використовується для шифрування гаманця</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> + <location filename="../bitcoingui.cpp" line="242"/> <source>About &Qt</source> <translation>&Про Qt</translation> </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> - <source>%n active connection(s) to Bitcoin network</source> - <translation> - <numerusform>%n активне з’єднання з мережею</numerusform> - <numerusform>%n активні з’єднання з мережею</numerusform> - <numerusform>%n активних з’єднань з мережею</numerusform> - </translation> - </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> - <source>Downloaded %1 blocks of transaction history.</source> - <translation>Завантажено %1 блоків історії транзакцій.</translation> - </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> - <source>%n second(s) ago</source> - <translation> - <numerusform>%n секунду тому</numerusform> - <numerusform>%n секунди тому</numerusform> - <numerusform>%n секунд тому</numerusform> - </translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> - <source>Synchronizing with network...</source> - <translation>Синхронізація з мережею...</translation> + <location filename="../bitcoingui.cpp" line="71"/> + <source>Bitcoin Wallet</source> + <translation>Гаманець</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> - <source>&Transactions</source> - <translation>Пе&реклади</translation> + <location filename="../bitcoingui.cpp" line="245"/> + <source>&Options...</source> + <translation>&Параметри...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> - <source>&Send coins</source> - <translation>В&ідправити</translation> + <location filename="../bitcoingui.cpp" line="290"/> + <source>&Settings</source> + <translation>&Налаштування</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> - <source>Tabs toolbar</source> - <translation>Панель вкладок</translation> + <location filename="../bitcoingui.cpp" line="253"/> + <source>Encrypt or decrypt wallet</source> + <translation>Зашифрувати чи розшифрувати гаманець</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="73"/> - <source>Bitcoin Wallet</source> - <translation>Гаманець</translation> + <location filename="../bitcoingui.cpp" line="240"/> + <source>Show information about Bitcoin</source> + <translation>Показати інформацію про Bitcoin</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>Відбувається синхронізація ланцюжка блоків...</translation> + <location filename="../bitcoingui.cpp" line="506"/> + <source>Synchronizing with network...</source> + <translation>Синхронізація з мережею...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> + <location filename="../bitcoingui.cpp" line="186"/> <source>Show general overview of wallet</source> <translation>Показати загальний огляд гаманця</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> + <location filename="../bitcoingui.cpp" line="191"/> + <source>&Transactions</source> + <translation>Пе&реклади</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="192"/> <source>Browse transaction history</source> <translation>Переглянути історію переказів</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="199"/> + <location filename="../bitcoingui.cpp" line="197"/> <source>&Address Book</source> <translation>&Адресна книга</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> + <location filename="../bitcoingui.cpp" line="198"/> <source>Edit the list of stored addresses and labels</source> <translation>Редагувати список збережених адрес та міток</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> - <source>Send coins to a bitcoin address</source> - <translation>Відправити монети на вказану адресу</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>П&ро %1</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="247"/> - <source>&Options...</source> - <translation>&Параметри...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>Редагувати параметри</translation> + <location filename="../bitcoingui.cpp" line="209"/> + <source>&Send coins</source> + <translation>В&ідправити</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="245"/> - <source>Show information about Qt</source> - <translation>Показати інформацію про Qt</translation> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Send coins to a bitcoin address</source> + <translation>Відправити монети на вказану адресу</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="187"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>&Overview</source> <translation>&Огляд</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> + <location filename="../bitcoingui.cpp" line="281"/> <source>&File</source> <translation>&Файл</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> - <source>&Settings</source> - <translation>&Налаштування</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> - <translation>&Експорт...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="329"/> - <source>[testnet]</source> - <translation>[тестова мережа]</translation> + <location filename="../bitcoingui.cpp" line="204"/> + <source>Show the list of addresses for receiving payments</source> + <translation>Показати список адрес для отримання платежів</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>Змінити парол&ь</translation> + <location filename="../bitcoingui.cpp" line="303"/> + <source>Tabs toolbar</source> + <translation>Панель вкладок</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> - <source>E&xit</source> - <translation>&Вихід</translation> + <location filename="../bitcoingui.cpp" line="250"/> + <source>&Export...</source> + <translation>&Експорт...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation>О&тримати</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>Показати &гаманець</translation> + <location filename="../bitcoingui.cpp" line="236"/> + <source>Quit application</source> + <translation>Вийти</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="482"/> + <source>%n active connection(s) to Bitcoin network</source> + <translation> + <numerusform>%n активне з’єднання з мережею</numerusform> + <numerusform>%n активні з’єднання з мережею</numerusform> + <numerusform>%n активних з’єднань з мережею</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>Показати вікно гаманця</translation> + <location filename="../bitcoingui.cpp" line="531"/> + <source>Downloaded %1 blocks of transaction history.</source> + <translation>Завантажено %1 блоків історії транзакцій.</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="546"/> + <source>%n second(s) ago</source> + <translation> + <numerusform>%n секунду тому</numerusform> + <numerusform>%n секунди тому</numerusform> + <numerusform>%n секунд тому</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> + <location filename="../bitcoingui.cpp" line="632"/> <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Backup Wallet</source> <translation>Резервне копіювання гаманця</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Wallet Data (*.dat)</source> <translation>Дані гаманця (*.dat)</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>Backup Failed</source> <translation>Резервне копіювання не вдалося</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> + <location filename="../bitcoingui.cpp" line="824"/> <source>There was an error trying to save the wallet data to the new location.</source> <translation>Виникла помилка при спробі зберегти гаманець в новому місці</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> - <source>Show the list of addresses for receiving payments</source> - <translation>Показати список адрес для отримання платежів</translation> + <location filename="../bitcoingui.cpp" line="296"/> + <source>&Help</source> + <translation>&Довідка</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> - <source>Export the data in the current tab to a file</source> - <translation>Експортувати дані з поточної вкладки в файл</translation> + <location filename="../bitcoingui.cpp" line="314"/> + <source>Actions toolbar</source> + <translation>Панель дій</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> + <location filename="../bitcoingui.cpp" line="215"/> <source>Sign &message</source> <translation>&Підписати повідомлення</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> - <source>Prove you control an address</source> - <translation>Доведіть, що це ваша адреса</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="258"/> + <location filename="../bitcoingui.cpp" line="256"/> <source>Backup wallet to another location</source> <translation>Резервне копіювання гаманця в інше місце</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> - <source>Quit application</source> - <translation>Вийти</translation> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>П&ро %1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> + <location filename="../bitcoingui.cpp" line="243"/> + <source>Show information about Qt</source> + <translation>Показати інформацію про Qt</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>Редагувати параметри</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation type="unfinished">Показати вікно гаманця</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="251"/> + <source>Export the data in the current tab to a file</source> + <translation>Експортувати дані з поточної вкладки в файл</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="255"/> + <source>&Backup Wallet</source> + <translation>&Резервне копіювання гаманця</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="216"/> + <source>Prove you control an address</source> + <translation>Доведіть, що це ваша адреса</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="252"/> <source>&Encrypt Wallet</source> <translation>&Шифрування гаманця</translation> </message> <message> <location filename="../bitcoingui.cpp" line="257"/> - <source>&Backup Wallet</source> - <translation>&Резервне копіювання гаманця</translation> + <source>&Change Passphrase</source> + <translation>Змінити парол&ь</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> - <source>Change the passphrase used for wallet encryption</source> - <translation>Змінити пароль, який використовується для шифрування гаманця</translation> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> + <location filename="../bitcoingui.cpp" line="418"/> <source>bitcoin-qt</source> <translation>bitcoin-qt</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation> <numerusform>%n хвилину тому</numerusform> @@ -547,7 +560,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation> <numerusform>%n годину тому</numerusform> @@ -556,7 +569,7 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>%n день тому</numerusform> @@ -565,37 +578,37 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation>Синхронізовано</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>Синхронізується...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation>Останній отриманий блок було згенеровано %1.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>Завантажено %1 з %2 блоків історії переказів.</translation> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>Завантажено %1 з %2 блоків історії переказів (%3% done).</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> + <location filename="../bitcoingui.cpp" line="663"/> <source>Sent transaction</source> <translation>Надіслані перекази</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> + <location filename="../bitcoingui.cpp" line="664"/> <source>Incoming transaction</source> <translation>Отримані перекази</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -608,32 +621,27 @@ Address: %4 </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation><b>Зашифрований</b> гаманець <b>розблоковано</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation><b>Зашифрований</b> гаманець <b>заблоковано</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> + <location filename="../bitcoingui.cpp" line="636"/> <source>Sending...</source> <translation>Відправлення...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> - <source>&Help</source> - <translation>&Довідка</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="316"/> - <source>Actions toolbar</source> - <translation>Панель дій</translation> + <location filename="../bitcoingui.cpp" line="327"/> + <source>[testnet]</source> + <translation>[тестова мережа]</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"></translation> </message> @@ -641,22 +649,22 @@ Address: %4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>В&имірювати монети в: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>Виберіть одиницю вимірювання монет, яка буде відображатись в гаманці та при відправленні.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&Відображати адресу в списку переказів</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished"></translation> </message> @@ -732,85 +740,95 @@ Address: %4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>&Запускати гаманець при вході в систему</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>Автоматично запускати гаманець при вмиканні комп’ютера</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>Мінімізувати &у трей</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>Показувати лише іконку в треї після згортання вікна</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> + <location filename="../optionsdialog.cpp" line="185"/> <source>Map port using &UPnP</source> <translation>Відображення порту через &UPnP</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="180"/> <source>M&inimize on close</source> <translation>Згортати замість закритт&я</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="181"/> + <location filename="../optionsdialog.cpp" line="186"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Автоматично відкривати порт для клієнту біткоін на роутері. Працює лише якщо ваш роутер підтримує UPnP і ця функція увімкнена.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="186"/> + <location filename="../optionsdialog.cpp" line="181"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>Згортати замість закриття. Якщо ця опція включена, програма закриється лише після вибору відповідного пункту в меню.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>Підключатись через &SOCKS4-проксі:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>Підключатись до мережі Bitcoin через SOCKS4-проксі (наприклад при використанні Tor)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>&IP проксі: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>IP-адреса проксі-сервера (наприклад 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>&Порт: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>Порт проксі-сервера (наприклад 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>Добровільна комісія за кожен Кб переказу, яка дозволяє бути впевненим у тому, що ваш переказ буде оброблено швидко. Розмір більшості переказів рівен 1 Кб. Рекомендована комісія: 0,01.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>Заплатити комісі&ю</translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessagePage</name> @@ -830,36 +848,14 @@ Address: %4 <translation>&Копіювати</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="93"/> - <source>Enter the message you want to sign here</source> - <translation>Введіть повідомлення, яке ви хочете підписати тут</translation> - </message> - <message> - <location filename="../forms/messagepage.ui" line="105"/> - <source>Click "Sign Message" to get signature</source> - <translation>Натисніть кнопку "Підписати повідомлення", для отриманя підпису</translation> - </message> - <message> - <location filename="../forms/messagepage.ui" line="120"/> - <source>&Sign Message</source> - <translation>&Підписати повідомлення</translation> - </message> - <message> - <location filename="../messagepage.cpp" line="74"/> - <location filename="../messagepage.cpp" line="89"/> - <location filename="../messagepage.cpp" line="101"/> - <source>Error signing</source> - <translation>Помилка при підписуванні</translation> - </message> - <message> <location filename="../messagepage.cpp" line="89"/> <source>Private key for %1 is not available.</source> <translation>Приватний ключ для %1 недоступний.</translation> </message> <message> - <location filename="../messagepage.cpp" line="101"/> - <source>Sign failed</source> - <translation>Не вдалось підписати</translation> + <location filename="../messagepage.cpp" line="74"/> + <source>%1 is not a valid address.</source> + <translation>"%1" не є коректною адресою в мережі Bitcoin.</translation> </message> <message> <location filename="../forms/messagepage.ui" line="14"/> @@ -897,28 +893,50 @@ Address: %4 <translation>Alt+P</translation> </message> <message> + <location filename="../forms/messagepage.ui" line="93"/> + <source>Enter the message you want to sign here</source> + <translation>Введіть повідомлення, яке ви хочете підписати тут</translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="105"/> + <source>Click "Sign Message" to get signature</source> + <translation>Натисніть кнопку "Підписати повідомлення", для отриманя підпису</translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="120"/> + <source>&Sign Message</source> + <translation>&Підписати повідомлення</translation> + </message> + <message> <location filename="../messagepage.cpp" line="74"/> - <source>%1 is not a valid address.</source> - <translation>"%1" не є коректною адресою в мережі Bitcoin.</translation> + <location filename="../messagepage.cpp" line="89"/> + <location filename="../messagepage.cpp" line="101"/> + <source>Error signing</source> + <translation>Помилка при підписуванні</translation> + </message> + <message> + <location filename="../messagepage.cpp" line="101"/> + <source>Sign failed</source> + <translation>Не вдалось підписати</translation> </message> </context> <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>Головні</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> - <source>Options</source> - <translation>Параметри</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>Відображення</translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="105"/> + <source>Options</source> + <translation>Параметри</translation> + </message> </context> <context> <name>OverviewPage</name> @@ -981,19 +999,29 @@ Address: %4 <translation>Повідомлення:</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> - <source>Error encoding URI into QR Code.</source> - <translation type="unfinished"></translation> + <location filename="../forms/qrcodedialog.ui" line="55"/> + <source>Request Payment</source> + <translation>Запросити Платіж</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> - <source>PNG Images (*.png)</source> - <translation>PNG-зображення (*.png)</translation> + <location filename="../forms/qrcodedialog.ui" line="186"/> + <source>&Save As...</source> + <translation>&Зберегти як...</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> - <source>Save Image...</source> - <translation type="unfinished"></translation> + <location filename="../forms/qrcodedialog.ui" line="105"/> + <source>BTC</source> + <translation>BTC</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="70"/> + <source>Amount:</source> + <translation>Кількість:</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="121"/> + <source>Label:</source> + <translation>Мітка:</translation> </message> <message> <location filename="../forms/qrcodedialog.ui" line="14"/> @@ -1001,34 +1029,29 @@ Address: %4 <translation>Діалог</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="105"/> - <source>BTC</source> - <translation>BTC</translation> - </message> - <message> <location filename="../forms/qrcodedialog.ui" line="32"/> <source>QR Code</source> <translation>QR-Код</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="55"/> - <source>Request Payment</source> - <translation>Запросити Платіж</translation> + <location filename="../qrcodedialog.cpp" line="46"/> + <source>Error encoding URI into QR Code.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="70"/> - <source>Amount:</source> - <translation>Кількість:</translation> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="121"/> - <source>Label:</source> - <translation>Мітка:</translation> + <location filename="../qrcodedialog.cpp" line="121"/> + <source>PNG Images (*.png)</source> + <translation>PNG-зображення (*.png)</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="186"/> - <source>&Save As...</source> - <translation>&Зберегти як...</translation> + <location filename="../qrcodedialog.cpp" line="121"/> + <source>Save Image...</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -1086,6 +1109,11 @@ Address: %4 <translation> і </translation> </message> <message> + <location filename="../sendcoinsdialog.cpp" line="100"/> + <source>Confirm send coins</source> + <translation>Підтвердіть відправлення</translation> + </message> + <message> <location filename="../forms/sendcoinsdialog.ui" line="67"/> <source>&Add recipient...</source> <translation>Дод&ати одержувача... </translation> @@ -1096,11 +1124,6 @@ Address: %4 <translation>Очистити все</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="100"/> - <source>Confirm send coins</source> - <translation>Підтвердіть відправлення</translation> - </message> - <message> <location filename="../sendcoinsdialog.cpp" line="101"/> <source>Are you sure you want to send %1?</source> <translation>Ви впевнені що хочете відправити %1</translation> @@ -1144,14 +1167,29 @@ Address: %4 <context> <name>SendCoinsEntry</name> <message> + <location filename="../forms/sendcoinsentry.ui" line="14"/> + <source>Form</source> + <translation>Форма</translation> + </message> + <message> <location filename="../forms/sendcoinsentry.ui" line="29"/> <source>A&mount:</source> <translation>&Кількість:</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="42"/> - <source>Pay &To:</source> - <translation>&Отримувач:</translation> + <location filename="../forms/sendcoinsentry.ui" line="93"/> + <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="103"/> + <source>Choose address from address book</source> + <translation>Вибрати адресу з адресної книги</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="137"/> + <source>Remove this recipient</source> + <translation>Видалити цього отримувача</translation> </message> <message> <location filename="../forms/sendcoinsentry.ui" line="66"/> @@ -1160,29 +1198,19 @@ Address: %4 <translation>Введіть мітку для цієї адреси для додавання її в адресну книгу</translation> </message> <message> + <location filename="../forms/sendcoinsentry.ui" line="42"/> + <source>Pay &To:</source> + <translation>&Отримувач:</translation> + </message> + <message> <location filename="../forms/sendcoinsentry.ui" line="75"/> <source>&Label:</source> <translation>&Мітка:</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> - <location filename="../forms/sendcoinsentry.ui" line="93"/> - <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../forms/sendcoinsentry.ui" line="103"/> - <source>Choose address from address book</source> - <translation>Вибрати адресу з адресної книги</translation> - </message> - <message> - <location filename="../forms/sendcoinsentry.ui" line="120"/> - <source>Paste address from clipboard</source> - <translation>Вставити адресу</translation> + <location filename="../forms/sendcoinsentry.ui" line="113"/> + <source>Alt+A</source> + <translation>Alt+A</translation> </message> <message> <location filename="../forms/sendcoinsentry.ui" line="130"/> @@ -1190,14 +1218,9 @@ Address: %4 <translation>Alt+P</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="113"/> - <source>Alt+A</source> - <translation>Alt+A</translation> - </message> - <message> - <location filename="../forms/sendcoinsentry.ui" line="137"/> - <source>Remove this recipient</source> - <translation>Видалити цього отримувача</translation> + <location filename="../forms/sendcoinsentry.ui" line="120"/> + <source>Paste address from clipboard</source> + <translation>Вставити адресу</translation> </message> <message> <location filename="../sendcoinsentry.cpp" line="25"/> @@ -1208,142 +1231,142 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="28"/> + <location filename="../transactiondesc.cpp" line="30"/> <source>%1/unconfirmed</source> <translation>%1/не підтверджено</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="30"/> - <source>%1 confirmations</source> - <translation>%1 підтверджень</translation> + <location filename="../transactiondesc.cpp" line="55"/> + <source>, has not been successfully broadcast yet</source> + <translation>, ще не було успішно розіслано</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="20"/> + <source>Open for %1 blocks</source> + <translation>Відкрити для %1 блоків</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="22"/> + <source>Open until %1</source> + <translation>Відкрити до %1</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation>%1/поза інтернетом?</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="18"/> - <source>Open for %1 blocks</source> - <translation>Відкрити для %1 блоків</translation> + <location filename="../transactiondesc.cpp" line="32"/> + <source>%1 confirmations</source> + <translation>%1 підтверджень</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="63"/> + <source><b>Date:</b> </source> + <translation><b>Дата:</b> </translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="92"/> + <source>unknown</source> + <translation>невідомий</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation><b>Статус:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>, розіслано через %1 вузол</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>, розіслано через %1 вузлів</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> - <source><b>Date:</b> </source> - <translation><b>Дата:</b> </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>Джерело:</b> згенеровано<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>Відправник:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation><b>Одержувач:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> - <source> (yours)</source> - <translation> (ваша)</translation> + <location filename="../transactiondesc.cpp" line="96"/> + <source> (yours, label: </source> + <translation> (Ваша, мітка: </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> - <source><b>Credit:</b> </source> - <translation><b>Кредит:</b> </translation> + <location filename="../transactiondesc.cpp" line="98"/> + <source> (yours)</source> + <translation> (ваша)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation>(%1 «дозріє» через %2 блоків)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> - <source>(not accepted)</source> - <translation>(не прийнято)</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation><b>Дебет:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation><b>Комісія за переказ:</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>Загальна сума:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>Повідомлення:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>Коментар:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation>ID транзакції:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation>Після генерації монет, потрібно зачекати 120 блоків, перш ніж їх можна буде використати. Коли ви згенерували цей блок, його було відправлено в мережу для того, щоб він був доданий до ланцюжка блоків. Якщо ця процедура не вдасться, статус буде змінено на «не підтверджено» і ви не зможете потратити згенеровані монету. Таке може статись, якщо хтось інший згенерував блок на декілька секунд раніше.</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> - <source>, has not been successfully broadcast yet</source> - <translation>, ще не було успішно розіслано</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="20"/> - <source>Open until %1</source> - <translation>Відкрити до %1</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="89"/> - <source>unknown</source> - <translation>невідомий</translation> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> + <source><b>Credit:</b> </source> + <translation><b>Кредит:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="93"/> - <source> (yours, label: </source> - <translation> (Ваша, мітка: </translation> + <location filename="../transactiondesc.cpp" line="139"/> + <source>(not accepted)</source> + <translation>(не прийнято)</translation> </message> </context> <context> @@ -1488,14 +1511,9 @@ Address: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="124"/> - <source>Copy address</source> - <translation>Скопіювати адресу</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="270"/> - <source>Export Transaction Data</source> - <translation>Експортувати дані переказів</translation> + <location filename="../transactionview.cpp" line="127"/> + <source>Edit label</source> + <translation>Редагувати мітку</translation> </message> <message> <location filename="../transactionview.cpp" line="56"/> @@ -1503,11 +1521,26 @@ Address: %4 <translation>Сьогодні</translation> </message> <message> + <location filename="../transactionview.cpp" line="59"/> + <source>Last month</source> + <translation>Минулого місяця</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="282"/> + <source>Label</source> + <translation>Мітка</translation> + </message> + <message> <location filename="../transactionview.cpp" line="76"/> <source>To yourself</source> <translation>Відправлені собі</translation> </message> <message> + <location filename="../transactionview.cpp" line="78"/> + <source>Other</source> + <translation>Інше</translation> + </message> + <message> <location filename="../transactionview.cpp" line="279"/> <source>Confirmed</source> <translation>Підтверджені</translation> @@ -1529,29 +1562,24 @@ Address: %4 <translation>Мінімальна сума</translation> </message> <message> + <location filename="../transactionview.cpp" line="270"/> + <source>Export Transaction Data</source> + <translation>Експортувати дані переказів</translation> + </message> + <message> <location filename="../transactionview.cpp" line="280"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../transactionview.cpp" line="271"/> - <source>Comma separated file (*.csv)</source> - <translation>Файли, розділені комою (*.csv)</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="60"/> - <source>This year</source> - <translation>Цього року</translation> - </message> - <message> <location filename="../transactionview.cpp" line="61"/> <source>Range...</source> <translation>Проміжок</translation> </message> <message> - <location filename="../transactionview.cpp" line="392"/> - <source>to</source> - <translation>до</translation> + <location filename="../transactionview.cpp" line="72"/> + <source>Received with</source> + <translation>Отримані на</translation> </message> <message> <location filename="../transactionview.cpp" line="74"/> @@ -1559,11 +1587,21 @@ Address: %4 <translation>Відправлені на</translation> </message> <message> + <location filename="../transactionview.cpp" line="392"/> + <source>to</source> + <translation>до</translation> + </message> + <message> <location filename="../transactionview.cpp" line="84"/> <source>Enter address or label to search</source> <translation>Введіть адресу чи мітку для пошуку</translation> </message> <message> + <location filename="../transactionview.cpp" line="124"/> + <source>Copy address</source> + <translation>Скопіювати адресу</translation> + </message> + <message> <location filename="../transactionview.cpp" line="125"/> <source>Copy label</source> <translation>Скопіювати мітку</translation> @@ -1584,11 +1622,6 @@ Address: %4 <translation>Ідентифікатор</translation> </message> <message> - <location filename="../transactionview.cpp" line="282"/> - <source>Label</source> - <translation>Мітка</translation> - </message> - <message> <location filename="../transactionview.cpp" line="283"/> <source>Address</source> <translation>Адреса</translation> @@ -1609,6 +1642,11 @@ Address: %4 <translation>Діапазон від:</translation> </message> <message> + <location filename="../transactionview.cpp" line="271"/> + <source>Comma separated file (*.csv)</source> + <translation>Файли, розділені комою (*.csv)</translation> + </message> + <message> <location filename="../transactionview.cpp" line="57"/> <source>This week</source> <translation>На цьому тижні</translation> @@ -1619,24 +1657,9 @@ Address: %4 <translation>На цьому місяці</translation> </message> <message> - <location filename="../transactionview.cpp" line="59"/> - <source>Last month</source> - <translation>Минулого місяця</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="72"/> - <source>Received with</source> - <translation>Отримані на</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="78"/> - <source>Other</source> - <translation>Інше</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="127"/> - <source>Edit label</source> - <translation>Редагувати мітку</translation> + <location filename="../transactionview.cpp" line="60"/> + <source>This year</source> + <translation>Цього року</translation> </message> <message> <location filename="../transactionview.cpp" line="128"/> @@ -1652,7 +1675,7 @@ Address: %4 <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>Відправка...</translation> </message> @@ -1660,415 +1683,476 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> + <location filename="../bitcoinstrings.cpp" line="42"/> <source>Usage:</source> <translation>Вкористання:</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> - <source>Done loading</source> - <translation>Завантаження завершене</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="87"/> - <source>Rescanning...</source> - <translation>Сканування...</translation> + <location filename="../bitcoinstrings.cpp" line="113"/> + <source>Loading addresses...</source> + <translation>Завантаження адрес...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> - <source>Invalid amount for -paytxfee=<amount></source> - <translation>Помилка у величині комісії</translation> + <location filename="../bitcoinstrings.cpp" line="41"/> + <source>Bitcoin version</source> + <translation>Версія</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> - <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> - <translation>Неможливо прив’язати до порту %d на цьому комп’ютері. Молживо гаманець вже запущено.</translation> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Loading wallet...</source> + <translation>Завантаження гаманця...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> - <source>Invalid -proxy address</source> - <translation>Помилка в адресі проксі-сервера</translation> + <location filename="../bitcoinstrings.cpp" line="115"/> + <source>Loading block index...</source> + <translation>Завантаження індексу блоків...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> - <source>Cannot downgrade wallet</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="46"/> + <source>Options:</source> + <translation>Параметри: +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> - <source>Cannot initialize keypool</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> - <source>Cannot write default address</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="133"/> + <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> + <translation>Неможливо прив’язати до порту %d на цьому комп’ютері. Молживо гаманець вже запущено.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> - <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> - <translation>Увага: встановлено занадто велику комісію (-paytxfee). Комісія зніматиметься кожен раз коли ви проводитимете перекази.</translation> + <location filename="../bitcoinstrings.cpp" line="127"/> + <source>Invalid -proxy address</source> + <translation>Помилка в адресі проксі-сервера</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> + <location filename="../bitcoinstrings.cpp" line="20"/> <source>Warning: Disk space is low</source> <translation>Увага: На диску мало вільного місця</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Options:</source> - <translation>Параметри: -</translation> + <location filename="../bitcoinstrings.cpp" line="119"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> + <translation>Помилка при завантаженні wallet.dat: Гаманець потребує новішої версії Біткоін-клієнта</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> + <location filename="../bitcoinstrings.cpp" line="43"/> <source>Send command to -server or bitcoind</source> <translation>Відправити команду серверу -server чи демону </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> - <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation>Потрібно перезаписати гаманець: перезапустіть Біткоін-клієнт для завершення</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="83"/> - <source>Error loading wallet.dat</source> - <translation>Помилка при завантаженні wallet.dat</translation> + <location filename="../bitcoinstrings.cpp" line="44"/> + <source>List commands</source> + <translation>Список команд +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> + <location filename="../bitcoinstrings.cpp" line="45"/> <source>Get help for a command</source> <translation>Отримати довідку по команді </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> - <source>List commands</source> - <translation>Список команд -</translation> + <location filename="../bitcoinstrings.cpp" line="114"/> + <source>Error loading addr.dat</source> + <translation>Помилка при завантаженні addr.dat</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> + <location filename="../bitcoinstrings.cpp" line="47"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Вкажіть файл конфігурації (за промовчуванням: bitcoin.conf) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>Вкажіть pid-файл (за промовчуванням: bitcoind.pid) -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Generate coins</source> - <translation>Генерувати монети -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Don't generate coins</source> - <translation>Не генерувати монети -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="19"/> - <source>Show splash screen on startup (default: 1)</source> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Find peers using internet relay chat (default: 0)</source> + <source>To use the %s option</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Accept connections from outside (default: 1)</source> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> <translation type="unfinished"></translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Set language, for example "de_DE" (default: system locale)</source> + <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Find peers using DNS lookup (default: 1)</source> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>Вкажіть pid-файл (за промовчуванням: bitcoind.pid) +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> - <source>Upgrade wallet to latest format</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="49"/> + <source>Generate coins</source> + <translation>Генерувати монети +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> - <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="50"/> + <source>Don't generate coins</source> + <translation>Не генерувати монети +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> - <source>How thorough the block verification is (0-6, default: 1)</source> + <location filename="../bitcoinstrings.cpp" line="52"/> + <source>Show splash screen on startup (default: 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Specify data directory</source> + <translation>Вкажіть робочий каталог +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> - <source>Error loading addr.dat</source> - <translation>Помилка при завантаженні addr.dat</translation> + <location filename="../bitcoinstrings.cpp" line="54"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Specify data directory</source> - <translation>Вкажіть робочий каталог -</translation> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> + <location filename="../bitcoinstrings.cpp" line="56"/> <source>Specify connection timeout (in milliseconds)</source> <translation>Вкажіть таймаут з’єднання (в мілісекундах) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> + <location filename="../bitcoinstrings.cpp" line="59"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Чекати на з'єднання на порту (по замовченню 8333 або тестова мережа 18333)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> + <location filename="../bitcoinstrings.cpp" line="60"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>Підтримувати не більше <n> зв'язків з колегами (за замовчуванням: 125)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation>Максимальній розмір вхідного буферу на одне з'єднання (за замовчуванням 86400)</translation> + <location filename="../bitcoinstrings.cpp" line="63"/> + <source>Find peers using internet relay chat (default: 0)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> - <source>Accept command line and JSON-RPC commands</source> - <translation>Приймати команди із командного рядка та команди JSON-RPC -</translation> + <location filename="../bitcoinstrings.cpp" line="64"/> + <source>Accept connections from outside (default: 1)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> - <source>Fee per KB to add to transactions you send</source> - <translation>Комісія за Кб -</translation> + <location filename="../bitcoinstrings.cpp" line="65"/> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Start minimized</source> - <translation>Запускати згорнутим -</translation> + <location filename="../bitcoinstrings.cpp" line="66"/> + <source>Find peers using DNS lookup (default: 1)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Відсилаті налагоджувальну інформацію на консоль, а не у файл debug.log</translation> + <location filename="../bitcoinstrings.cpp" line="68"/> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> + <translation>Максимальній розмір вхідного буферу на одне з'єднання (за замовчуванням 86400)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> - <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>Використовувати OpenSSL (https) для JSON-RPC-з’єднань -</translation> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> - <source>Server private key (default: server.pem)</source> - <translation>Закритий ключ сервера (за промовчуванням: server.pem) + <location filename="../bitcoinstrings.cpp" line="77"/> + <source>Fee per KB to add to transactions you send</source> + <translation>Комісія за Кб </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>Допустимі шифри (за промовчуванням: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) + <location filename="../bitcoinstrings.cpp" line="51"/> + <source>Start minimized</source> + <translation>Запускати згорнутим </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="23"/> + <location filename="../bitcoinstrings.cpp" line="57"/> <source>Connect through socks4 proxy</source> <translation>Підключитись через SOCKS4-проксі </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Allow DNS lookups for addnode and connect</source> - <translation>Дозволити пошук в DNS для команд «addnode» і «connect» + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation>Пересканувати ланцюжок блоків, в пошуку втрачених переказів </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation>Прослуховувати <port> для JSON-RPC-з’єднань (за промовчуванням: 8332) + <location filename="../bitcoinstrings.cpp" line="58"/> + <source>Allow DNS lookups for addnode and connect</source> + <translation>Дозволити пошук в DNS для команд «addnode» і «connect» </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>Відправляти команди на вузол, запущений на <ip> (за промовчуванням: 127.0.0.1) -</translation> + <location filename="../bitcoinstrings.cpp" line="61"/> + <source>Add a node to connect to and attempt to keep the connection open</source> + <translation>Додати вузол для підключення and attempt to keep the connection open</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> + <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation>Підключитись лише до вказаного вузла </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> - <source>Rescan the block chain for missing wallet transactions</source> - <translation>Пересканувати ланцюжок блоків, в пошуку втрачених переказів + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>Username for JSON-RPC connections</source> + <translation>Ім’я користувача для JSON-RPC-з’єднань </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> - <source>Add a node to connect to and attempt to keep the connection open</source> - <translation>Додати вузол для підключення and attempt to keep the connection open</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="37"/> + <location filename="../bitcoinstrings.cpp" line="71"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> <translation>Максимальоий буфер , <n> * 1000 байт (за умовчанням: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> - <source>Loading addresses...</source> - <translation>Завантаження адрес...</translation> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>Неможливо встановити блокування на робочий каталог %s. Можливо, гаманець вже запущено.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Bitcoin version</source> - <translation>Версія</translation> + <location filename="../bitcoinstrings.cpp" line="122"/> + <source>Cannot downgrade wallet</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> - <source>Loading wallet...</source> - <translation>Завантаження гаманця...</translation> + <location filename="../bitcoinstrings.cpp" line="123"/> + <source>Cannot initialize keypool</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> + <location filename="../bitcoinstrings.cpp" line="124"/> + <source>Cannot write default address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>Done loading</source> + <translation>Завантаження завершене</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="128"/> + <source>Invalid amount for -paytxfee=<amount></source> + <translation>Помилка у величині комісії</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="132"/> <source>Error: CreateThread(StartNode) failed</source> <translation>Помилка: CreateThread(StartNode) дала збій</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> + <location filename="../bitcoinstrings.cpp" line="38"/> <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> <translation>Увага: будь ласка, перевірте дату і час на свому комп’ютері. Якщо ваш годинник йде неправильно, Bitcoin може працювати некоректно.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> - <source>Loading block index...</source> - <translation>Завантаження індексу блоків...</translation> + <location filename="../bitcoinstrings.cpp" line="129"/> + <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> + <translation>Увага: встановлено занадто велику комісію (-paytxfee). Комісія зніматиметься кожен раз коли ви проводитимете перекази.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>бета</translation> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source>Rescanning...</source> + <translation>Сканування...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>Відправлення...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>Недостатньо коштів</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="116"/> <source>Error loading blkindex.dat</source> <translation>Помилка при завантаженні blkindex.dat </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> + <location filename="../bitcoinstrings.cpp" line="118"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Помилка при завантаженні wallet.dat: Гаманець пошкоджено </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation>Помилка при завантаженні wallet.dat: Гаманець потребує новішої версії Біткоін-клієнта</translation> + <location filename="../bitcoinstrings.cpp" line="120"/> + <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> + <translation>Потрібно перезаписати гаманець: перезапустіть Біткоін-клієнт для завершення</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>Error loading wallet.dat</source> + <translation>Помилка при завантаженні wallet.dat</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="67"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Поріг відключення неправильно підєднаних пірів (за замовчуванням: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">Помилка: не вдалося створити переказ.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">Помилка: переказ було відхилено. Це може статись, якщо декілька монет з вашого гаманця вже використані, наприклад, якщо ви використовуєте одну копію гаманця (wallet.dat), а монети були використані з іншої копії, але не позначені як використані в цій.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation>Максимальній розмір виіхідного буферу на одне з'єднання (за замовчуванням 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished">Намагатись використовувати UPnP для відображення порту що прослуховується на роутері (default: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished">Намагатись використовувати UPnP для відображення порту що прослуховується на роутері (default: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> + <location filename="../bitcoinstrings.cpp" line="78"/> + <source>Accept command line and JSON-RPC commands</source> + <translation>Приймати команди із командного рядка та команди JSON-RPC +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="79"/> <source>Run in the background as a daemon and accept commands</source> <translation>Запустити в фоновому режимі (як демон) та приймати команди </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> + <location filename="../bitcoinstrings.cpp" line="80"/> <source>Use the test network</source> <translation>Використовувати тестову мережу </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> + <location filename="../bitcoinstrings.cpp" line="81"/> <source>Output extra debugging information</source> <translation>Виводити більше налагоджувальної інформації</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> + <location filename="../bitcoinstrings.cpp" line="82"/> <source>Prepend debug output with timestamp</source> <translation>Доповнювати налагоджувальний вивід відміткою часу</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> + <location filename="../bitcoinstrings.cpp" line="83"/> + <source>Send trace/debug info to console instead of debug.log file</source> + <translation>Відсилаті налагоджувальну інформацію на консоль, а не у файл debug.log</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="84"/> <source>Send trace/debug info to debugger</source> <translation>Відсилаті налагоджувальну інформацію до налагоджувача</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> - <source>Username for JSON-RPC connections</source> - <translation>Ім’я користувача для JSON-RPC-з’єднань + <location filename="../bitcoinstrings.cpp" line="86"/> + <source>Password for JSON-RPC connections</source> + <translation>Пароль для JSON-RPC-з’єднань </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Password for JSON-RPC connections</source> - <translation>Пароль для JSON-RPC-з’єднань + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>Прослуховувати <port> для JSON-RPC-з’єднань (за промовчуванням: 8332) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> + <location filename="../bitcoinstrings.cpp" line="88"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Дозволити JSON-RPC-з’єднання з вказаної IP-адреси </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>Відправляти команди на вузол, запущений на <ip> (за промовчуванням: 127.0.0.1) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="90"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Upgrade wallet to latest format</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="94"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Встановити розмір пулу ключів <n> (за промовчуванням: 100) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="96"/> + <source>How many blocks to check at startup (default: 2500, 0 = all)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>How thorough the block verification is (0-6, default: 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation> @@ -2076,16 +2160,39 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> + <location filename="../bitcoinstrings.cpp" line="101"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>Використовувати OpenSSL (https) для JSON-RPC-з’єднань +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="102"/> <source>Server certificate file (default: server.cert)</source> <translation>Сертифікату сервера (за промовчуванням: server.cert) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> + <location filename="../bitcoinstrings.cpp" line="103"/> + <source>Server private key (default: server.pem)</source> + <translation>Закритий ключ сервера (за промовчуванням: server.pem) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>Допустимі шифри (за промовчуванням: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="107"/> <source>This help message</source> <translation>Дана довідка </translation> </message> + <message> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation>Вкористання</translation> + </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts index 9feeb546ad..e98dbcdd5b 100644 --- a/src/qt/locale/bitcoin_zh_CN.ts +++ b/src/qt/locale/bitcoin_zh_CN.ts @@ -15,7 +15,7 @@ <translation><b>比特币</b>版本</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -55,6 +55,21 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>创建新地址</translation> </message> <message> + <location filename="../forms/addressbookpage.ui" line="96"/> + <source>Sign a message to prove you own this address</source> + <translation>发送签名消息以证明您是该比特币地址的拥有者</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="99"/> + <source>Sign &Message</source> + <translation>发送签名 &消息</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="110"/> + <source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source> + <translation>从列表中删除当前选中地址。只有发送地址可以被删除。</translation> + </message> + <message> <location filename="../forms/addressbookpage.ui" line="60"/> <source>&New Address...</source> <translation>&新地址...</translation> @@ -70,19 +85,9 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&复制到剪贴板</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="85"/> - <source>Show &QR Code</source> - <translation>显示二维码</translation> - </message> - <message> - <location filename="../forms/addressbookpage.ui" line="96"/> - <source>Sign a message to prove you own this address</source> - <translation>发送签名消息以证明您是该比特币地址的拥有者</translation> - </message> - <message> - <location filename="../forms/addressbookpage.ui" line="99"/> - <source>Sign &Message</source> - <translation>发送签名 &消息</translation> + <location filename="../addressbookpage.cpp" line="286"/> + <source>Comma separated file (*.csv)</source> + <translation>逗号分隔文件 (*.csv)</translation> </message> <message> <location filename="../forms/addressbookpage.ui" line="113"/> @@ -90,55 +95,55 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&删除</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="110"/> - <source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source> - <translation>从列表中删除当前选中地址。只有发送地址可以被删除。</translation> + <location filename="../forms/addressbookpage.ui" line="85"/> + <source>Show &QR Code</source> + <translation>显示二维码</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>复制地址</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="285"/> + <source>Export Address Book Data</source> + <translation>导出地址簿数据</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation>复制标签</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation>编辑</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="64"/> + <location filename="../addressbookpage.cpp" line="68"/> <source>Delete</source> <translation>删除</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> - <source>Export Address Book Data</source> - <translation>导出地址簿数据</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="292"/> - <source>Could not write to file %1.</source> - <translation>无法写入文件 %1。</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Error exporting</source> <translation>导出错误</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> - <source>Comma separated file (*.csv)</source> - <translation>逗号分隔文件 (*.csv)</translation> + <location filename="../addressbookpage.cpp" line="299"/> + <source>Could not write to file %1.</source> + <translation>无法写入文件 %1。</translation> </message> </context> <context> <name>AddressTableModel</name> <message> <location filename="../addresstablemodel.cpp" line="78"/> + <source>Address</source> + <translation>地址</translation> + </message> + <message> + <location filename="../addresstablemodel.cpp" line="78"/> <source>Label</source> <translation>标签</translation> </message> @@ -147,23 +152,48 @@ This product includes software developed by the OpenSSL Project for use in the O <source>(no label)</source> <translation>(没有标签)</translation> </message> - <message> - <location filename="../addresstablemodel.cpp" line="78"/> - <source>Address</source> - <translation>地址</translation> - </message> </context> <context> <name>AskPassphraseDialog</name> <message> + <location filename="../forms/askpassphrasedialog.ui" line="61"/> + <source>New passphrase</source> + <translation>新口令</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="101"/> + <source>Confirm wallet encryption</source> + <translation>确认加密钱包</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="145"/> + <source>Wallet unlock failed</source> + <translation>钱包解锁失败</translation> + </message> + <message> <location filename="../forms/askpassphrasedialog.ui" line="26"/> <source>Dialog</source> <translation>会话</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="35"/> - <source>Encrypt wallet</source> - <translation>加密钱包</translation> + <location filename="../forms/askpassphrasedialog.ui" line="47"/> + <source>Enter passphrase</source> + <translation>输入口令</translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="75"/> + <source>Repeat new passphrase</source> + <translation>重复新口令</translation> + </message> + <message> + <location filename="../forms/askpassphrasedialog.ui" line="94"/> + <source>TextLabel</source> + <translation>文本标签</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="156"/> + <source>Wallet decryption failed</source> + <translation>钱包解密失败。</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="46"/> @@ -171,9 +201,14 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>该操作需要您首先使用口令解密钱包。</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="75"/> - <source>Repeat new passphrase</source> - <translation>重复新口令</translation> + <location filename="../askpassphrasedialog.cpp" line="113"/> + <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>将关闭软件以完成加密过程。 请您谨记：钱包加密并不是万能的，电脑中毒，您的比特币还是有可能丢失。</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="127"/> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>由于一个本地错误，加密钱包操作已经失败。您的钱包没有被加密。</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="111"/> @@ -182,34 +217,39 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>钱包已加密</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="43"/> - <source>Unlock wallet</source> - <translation>解锁钱包</translation> + <location filename="../askpassphrasedialog.cpp" line="34"/> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>输入钱包的新口令。<br/>使用的口令请至少包含<b>10个以上随机字符</>，或者是<b>8个以上的单词</b>。</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="47"/> - <source>Enter passphrase</source> - <translation>输入口令</translation> + <location filename="../askpassphrasedialog.cpp" line="38"/> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>该操作需要您首先使用口令解锁钱包。</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="61"/> - <source>New passphrase</source> - <translation>新口令</translation> + <location filename="../askpassphrasedialog.cpp" line="35"/> + <source>Encrypt wallet</source> + <translation>加密钱包</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="38"/> - <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>该操作需要您首先使用口令解锁钱包。</translation> + <location filename="../askpassphrasedialog.cpp" line="43"/> + <source>Unlock wallet</source> + <translation>解锁钱包</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="94"/> - <source>TextLabel</source> - <translation>文本标签</translation> + <location filename="../askpassphrasedialog.cpp" line="51"/> + <source>Decrypt wallet</source> + <translation>解密钱包</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="113"/> - <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> - <translation>将关闭软件以完成加密过程。 请您谨记：钱包加密并不是万能的，电脑中毒，您的比特币还是有可能丢失。</translation> + <location filename="../askpassphrasedialog.cpp" line="54"/> + <source>Change passphrase</source> + <translation>修改口令</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="55"/> + <source>Enter the old and new passphrase to the wallet.</source> + <translation>请输入钱包的旧口令与新口令。</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="102"/> @@ -219,9 +259,9 @@ Are you sure you wish to encrypt your wallet?</source> 确定要加密钱包吗？</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="156"/> - <source>Wallet decryption failed</source> - <translation>钱包解密失败。</translation> + <location filename="../askpassphrasedialog.cpp" line="117"/> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>重要提示：您以前备份的钱包文件应该替换成最新生成的加密钱包文件（重新备份）。从安全性上考虑，您以前备份的未加密的钱包文件，在您使用新的加密钱包后将无效，请重新备份。</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="126"/> @@ -232,35 +272,17 @@ Are you sure you wish to encrypt your wallet?</source> <translation>钱包加密失败</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="34"/> - <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>输入钱包的新口令。<br/>使用的口令请至少包含<b>10个以上随机字符</>，或者是<b>8个以上的单词</b>。</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="55"/> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>请输入钱包的旧口令与新口令。</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="101"/> - <source>Confirm wallet encryption</source> - <translation>确认加密钱包</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="117"/> - <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation>重要提示：您以前备份的钱包文件应该替换成最新生成的加密钱包文件（重新备份）。从安全性上考虑，您以前备份的未加密的钱包文件，在您使用新的加密钱包后将无效，请重新备份。</translation> - </message> - <message> <location filename="../askpassphrasedialog.cpp" line="134"/> <location filename="../askpassphrasedialog.cpp" line="182"/> <source>The supplied passphrases do not match.</source> <translation>口令不匹配。</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="145"/> - <source>Wallet unlock failed</source> - <translation>钱包解锁失败</translation> + <location filename="../askpassphrasedialog.cpp" line="146"/> + <location filename="../askpassphrasedialog.cpp" line="157"/> + <location filename="../askpassphrasedialog.cpp" line="176"/> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>用于解密钱包的口令不正确。</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="217"/> @@ -269,361 +291,345 @@ Are you sure you wish to encrypt your wallet?</source> <translation>警告：大写锁定键CapsLock开启</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="127"/> - <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>由于一个本地错误，加密钱包操作已经失败。您的钱包没有被加密。</translation> - </message> - <message> <location filename="../askpassphrasedialog.cpp" line="170"/> <source>Wallet passphrase was successfully changed.</source> <translation>钱包口令修改成功</translation> </message> +</context> +<context> + <name>BitcoinGUI</name> <message> - <location filename="../askpassphrasedialog.cpp" line="54"/> - <source>Change passphrase</source> - <translation>修改口令</translation> + <location filename="../bitcoingui.cpp" line="198"/> + <source>Edit the list of stored addresses and labels</source> + <translation>修改存储的地址和标签列表</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="146"/> - <location filename="../askpassphrasedialog.cpp" line="157"/> - <location filename="../askpassphrasedialog.cpp" line="176"/> - <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation>用于解密钱包的口令不正确。</translation> + <location filename="../bitcoingui.cpp" line="186"/> + <source>Show general overview of wallet</source> + <translation>显示钱包概况</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="51"/> - <source>Decrypt wallet</source> - <translation>解密钱包</translation> + <location filename="../bitcoingui.cpp" line="192"/> + <source>Browse transaction history</source> + <translation>查看交易历史</translation> </message> -</context> -<context> - <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="187"/> - <source>&Overview</source> - <translation>&概况</translation> + <location filename="../bitcoingui.cpp" line="197"/> + <source>&Address Book</source> + <translation>&地址簿</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> - <source>Show general overview of wallet</source> - <translation>显示钱包概况</translation> + <location filename="../bitcoingui.cpp" line="204"/> + <source>Show the list of addresses for receiving payments</source> + <translation>显示接收支付的地址列表</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> + <location filename="../bitcoingui.cpp" line="209"/> <source>&Send coins</source> <translation>&发送货币</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> - <source>Sign &message</source> - <translation>发送签名 &消息</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>&关于 %1</translation> + <location filename="../bitcoingui.cpp" line="240"/> + <source>Show information about Bitcoin</source> + <translation>显示比特币的相关信息</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="244"/> - <source>About &Qt</source> - <translation>关于 &Qt</translation> + <location filename="../bitcoingui.cpp" line="243"/> + <source>Show information about Qt</source> + <translation>显示Qt相关信息</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="248"/> + <location filename="../bitcoingui.cpp" line="246"/> <source>Modify configuration options for bitcoin</source> <translation>修改比特币配置选项</translation> </message> <message> <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>显示比特币窗口</translation> + <source>Export the data in the current tab to a file</source> + <translation>导出当前数据到文件</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> + <location filename="../bitcoingui.cpp" line="252"/> + <source>&Encrypt Wallet</source> + <translation>&加密钱包</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="255"/> <source>&Backup Wallet</source> <translation>&备份钱包</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> - <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> - <translation type="unfinished"></translation> + <location filename="../bitcoingui.cpp" line="506"/> + <source>Synchronizing with network...</source> + <translation>正在与网络同步...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> - <source>Incoming transaction</source> - <translation>流入交易</translation> + <location filename="../bitcoingui.cpp" line="281"/> + <source>&File</source> + <translation>&文件</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> + <location filename="../bitcoingui.cpp" line="821"/> <source>Backup Wallet</source> <translation>备份钱包</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Wallet Data (*.dat)</source> - <translation>钱包文件(*.dat)</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="200"/> - <source>Edit the list of stored addresses and labels</source> - <translation>修改存储的地址和标签列表</translation> + <location filename="../bitcoingui.cpp" line="253"/> + <source>Encrypt or decrypt wallet</source> + <translation>加密或解密钱包</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation>&收款地址</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> - <source>Synchronizing with network...</source> - <translation>正在与网络同步...</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>正在同步区域锁链</translation> + <location filename="../bitcoingui.cpp" line="185"/> + <source>&Overview</source> + <translation>&概况</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> + <location filename="../bitcoingui.cpp" line="191"/> <source>&Transactions</source> <translation>&交易记录</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> - <source>Browse transaction history</source> - <translation>查看交易历史</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="199"/> - <source>&Address Book</source> - <translation>&地址簿</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="255"/> - <source>Encrypt or decrypt wallet</source> - <translation>加密或解密钱包</translation> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>&关于 %1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> - <source>[testnet]</source> - <translation>[testnet]</translation> + <location filename="../bitcoingui.cpp" line="303"/> + <source>Tabs toolbar</source> + <translation>分页工具栏</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> - <source>Prove you control an address</source> - <translation>证明您拥有某个比特币地址</translation> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation>显示或隐藏比特币客户端窗口</translation> </message> <message> <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>打开 &比特币</translation> + <source>&Export...</source> + <translation>&导出...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> - <source>Downloaded %1 blocks of transaction history.</source> - <translation>%1 个交易历史数据区块已下载</translation> + <location filename="../bitcoingui.cpp" line="235"/> + <source>E&xit</source> + <translation>退出</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> - <source>&Options...</source> - <translation>&选项...</translation> + <location filename="../bitcoingui.cpp" line="236"/> + <source>Quit application</source> + <translation>退出程序</translation> </message> <message> <location filename="../bitcoingui.cpp" line="245"/> - <source>Show information about Qt</source> - <translation>显示Qt相关信息</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="73"/> - <source>Bitcoin Wallet</source> - <translation>比特币钱包</translation> + <source>&Options...</source> + <translation>&选项...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> - <source>Export the data in the current tab to a file</source> - <translation>导出当前数据到文件</translation> + <location filename="../bitcoingui.cpp" line="242"/> + <source>About &Qt</source> + <translation>关于 &Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> + <location filename="../bitcoingui.cpp" line="296"/> <source>&Help</source> <translation>&帮助</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> - <source>Backup wallet to another location</source> - <translation>备份钱包到其它文件夹</translation> + <location filename="../bitcoingui.cpp" line="314"/> + <source>Actions toolbar</source> + <translation>动作工具栏</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="248"/> + <source>Show/Hide &Bitcoin</source> + <translation>显示/隐藏 比特币客户端</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> + <location filename="../bitcoingui.cpp" line="482"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>您连接到比特币网络的连接数量共有%n条</numerusform> </translation> </message> - <message> - <location filename="../bitcoingui.cpp" line="206"/> - <source>Show the list of addresses for receiving payments</source> - <translation>显示接收支付的地址列表</translation> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="558"/> + <source>%n day(s) ago</source> + <translation> + <numerusform>%n 天前</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> - <source>Tabs toolbar</source> - <translation>分页工具栏</translation> + <location filename="../bitcoingui.cpp" line="290"/> + <source>&Settings</source> + <translation>&设置</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> - <source>Send coins to a bitcoin address</source> - <translation>将货币发送到一个比特币地址</translation> + <location filename="../bitcoingui.cpp" line="71"/> + <source>Bitcoin Wallet</source> + <translation>比特币钱包</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> - <source>&File</source> - <translation>&文件</translation> + <location filename="../bitcoingui.cpp" line="258"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>修改钱包加密口令</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> - <source>Quit application</source> - <translation>退出程序</translation> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation>比特币客户端</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="242"/> - <source>Show information about Bitcoin</source> - <translation>显示比特币的相关信息</translation> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Send coins to a bitcoin address</source> + <translation>将货币发送到一个比特币地址</translation> </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> - <source>%n second(s) ago</source> - <translation> - <numerusform>%n 秒前</numerusform> - </translation> + <message> + <location filename="../bitcoingui.cpp" line="215"/> + <source>Sign &message</source> + <translation>发送签名 &消息</translation> </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> - <source>%n minute(s) ago</source> - <translation> - <numerusform>%n 分种前</numerusform> - </translation> + <message> + <location filename="../bitcoingui.cpp" line="216"/> + <source>Prove you control an address</source> + <translation>证明您拥有某个比特币地址</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> - <source>%n hour(s) ago</source> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> <translation> - <numerusform>%n 小时前</numerusform> + <numerusform>~还剩 %n 个区块</numerusform> </translation> </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> - <source>%n day(s) ago</source> - <translation> - <numerusform>%n 天前</numerusform> - </translation> + <message> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>已下载 %2 个交易历史区块中的 %1 个 (完成率 %3% ).</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation>最新状态</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>更新中...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation>最新收到的区块产生于 %1。</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> - <source>&Settings</source> - <translation>&设置</translation> + <location filename="../bitcoingui.cpp" line="663"/> + <source>Sent transaction</source> + <translation>已发送交易</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="316"/> - <source>Actions toolbar</source> - <translation>动作工具栏</translation> + <location filename="../bitcoingui.cpp" line="664"/> + <source>Incoming transaction</source> + <translation>流入交易</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> - <source>Sent transaction</source> - <translation>已发送交易</translation> + <location filename="../bitcoingui.cpp" line="824"/> + <source>Backup Failed</source> + <translation>备份失败</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>日期: %1 -金额: %2 -类别: %3 -地址: %4 -</translation> + <location filename="../bitcoingui.cpp" line="824"/> + <source>There was an error trying to save the wallet data to the new location.</source> + <translation>备份钱包到其它文件夹失败.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> - <source>E&xit</source> - <translation>退出</translation> + <location filename="../bitcoingui.cpp" line="256"/> + <source>Backup wallet to another location</source> + <translation>备份钱包到其它文件夹</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation>&修改口令</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="632"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>钱包已被<b>加密</b>，当前为<b>解锁</b>状态</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>钱包已被<b>加密</b>，当前为<b>锁定</b>状态</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>&修改口令</translation> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Wallet Data (*.dat)</source> + <translation>钱包文件(*.dat)</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> - <source>Change the passphrase used for wallet encryption</source> - <translation>修改钱包加密口令</translation> + <location filename="../bitcoingui.cpp" line="327"/> + <source>[testnet]</source> + <translation>[testnet]</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> - <source>&Export...</source> - <translation>&导出...</translation> + <location filename="../bitcoingui.cpp" line="531"/> + <source>Downloaded %1 blocks of transaction history.</source> + <translation>%1 个交易历史数据区块已下载</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="546"/> + <source>%n second(s) ago</source> + <translation> + <numerusform>%n 秒前</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="550"/> + <source>%n minute(s) ago</source> + <translation> + <numerusform>%n 分种前</numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="554"/> + <source>%n hour(s) ago</source> + <translation> + <numerusform>%n 小时前</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="421"/> + <location filename="../bitcoingui.cpp" line="418"/> <source>bitcoin-qt</source> <translation>bitcoin-qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> - <source>There was an error trying to save the wallet data to the new location.</source> - <translation>备份钱包到其它文件夹失败.</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="619"/> + <location filename="../bitcoingui.cpp" line="636"/> <source>Sending...</source> <translation>发送中</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> - <source>Backup Failed</source> - <translation>备份失败</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation>&加密钱包</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>%1 / %2 个交易历史的区块已下载</translation> + <location filename="../bitcoingui.cpp" line="665"/> + <source>Date: %1 +Amount: %2 +Type: %3 +Address: %4 +</source> + <translation>日期: %1 +金额: %2 +类别: %3 +地址: %4 +</translation> </message> <message> - <location filename="../bitcoin.cpp" line="144"/> + <location filename="../bitcoin.cpp" line="127"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>发生严重错误。</translation> </message> @@ -631,22 +637,22 @@ Address: %4 <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>&金额显示单位：</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>选择显示及发送比特币时使用的最小单位</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&在交易列表中显示地址</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation>是否需要在交易清单中显示比特币地址。</translation> </message> @@ -674,11 +680,6 @@ Address: %4 <translation>该地址与地址簿中的条目已关联，无法作为发送地址编辑。</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="24"/> - <source>New sending address</source> - <translation>新发送地址</translation> - </message> - <message> <location filename="../editaddressdialog.cpp" line="27"/> <source>Edit receiving address</source> <translation>编辑接收地址</translation> @@ -689,9 +690,14 @@ Address: %4 <translation>编辑发送地址</translation> </message> <message> - <location filename="../forms/editaddressdialog.ui" line="42"/> - <source>&Address</source> - <translation>&地址</translation> + <location filename="../editaddressdialog.cpp" line="91"/> + <source>The entered address "%1" is already in the address book.</source> + <translation>输入的地址 "%1" 已经存在于地址簿。</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="101"/> + <source>Could not unlock wallet.</source> + <translation>无法解锁钱包</translation> </message> <message> <location filename="../editaddressdialog.cpp" line="106"/> @@ -704,103 +710,113 @@ Address: %4 <translation>新接收地址</translation> </message> <message> - <location filename="../editaddressdialog.cpp" line="91"/> - <source>The entered address "%1" is already in the address book.</source> - <translation>输入的地址 "%1" 已经存在于地址簿。</translation> + <location filename="../forms/editaddressdialog.ui" line="42"/> + <source>&Address</source> + <translation>&地址</translation> + </message> + <message> + <location filename="../editaddressdialog.cpp" line="24"/> + <source>New sending address</source> + <translation>新发送地址</translation> </message> <message> <location filename="../editaddressdialog.cpp" line="96"/> <source>The entered address "%1" is not a valid bitcoin address.</source> <translation>输入的地址 "%1" 并不是一个有效的比特币地址</translation> </message> - <message> - <location filename="../editaddressdialog.cpp" line="101"/> - <source>Could not unlock wallet.</source> - <translation>无法解锁钱包</translation> - </message> </context> <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="175"/> + <location filename="../optionsdialog.cpp" line="176"/> <source>&Minimize to the tray instead of the taskbar</source> <translation>&最小化到托盘</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> + <location filename="../optionsdialog.cpp" line="185"/> <source>Map port using &UPnP</source> <translation>使用 &UPnP 映射端口</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="186"/> + <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> + <translation>自动在路由器中打开比特币端口。只有当您的路由器开启 UPnP 选项时此功能才有效。</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>&开机启动比特币</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>在计算机启动后自动运行比特币</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>最小化窗口后只显示一个托盘标志</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="181"/> - <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> - <translation>自动在路由器中打开比特币端口。只有当您的路由器开启 UPnP 选项时此功能才有效。</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="180"/> <source>M&inimize on close</source> <translation>关闭时最小化</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="186"/> + <location filename="../optionsdialog.cpp" line="181"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>当窗口关闭时程序最小化而不是退出。当使用该选项时，程序只能通过在菜单中选择退出来关闭</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>&通过SOCKS4代理连接</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>通过一个SOCKS4代理连接到比特币网络 (如使用Tor连接时)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>代理 &IP：</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>代理服务器IP (如 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>&端口：</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>代理端口 (比如 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>建议支付交易费用，有助于您的交易得到尽快处理. 绝大多数交易的字节数为 1 kB. 建议支付0.01个比特币.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>支付交易 &费用</translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation>关闭客户端时分离数据库</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation>关闭时分开区块数据库和地址数据库. 这意味着您可以将数据库文件移动至其他文件夹. 钱包文件始终是分开的.</translation> + </message> </context> <context> <name>MessagePage</name> @@ -820,9 +836,26 @@ Address: %4 <translation>发送签名消息以证明您是该比特币地址的拥有者</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="134"/> - <source>&Copy to Clipboard</source> - <translation>&复制到剪贴板</translation> + <location filename="../forms/messagepage.ui" line="48"/> + <source>Choose adress from address book</source> + <translation>从地址簿选择地址</translation> + </message> + <message> + <location filename="../messagepage.cpp" line="74"/> + <location filename="../messagepage.cpp" line="89"/> + <location filename="../messagepage.cpp" line="101"/> + <source>Error signing</source> + <translation>签名错误</translation> + </message> + <message> + <location filename="../messagepage.cpp" line="89"/> + <source>Private key for %1 is not available.</source> + <translation>%1 的秘钥不可用。</translation> + </message> + <message> + <location filename="../messagepage.cpp" line="101"/> + <source>Sign failed</source> + <translation>签名失败</translation> </message> <message> <location filename="../forms/messagepage.ui" line="20"/> @@ -835,11 +868,6 @@ Address: %4 <translation type="unfinished">请输入比特币地址 (例如: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="48"/> - <source>Choose adress from address book</source> - <translation>从地址簿选择地址</translation> - </message> - <message> <location filename="../forms/messagepage.ui" line="58"/> <source>Alt+A</source> <translation>Alt+A</translation> @@ -870,42 +898,30 @@ Address: %4 <translation>复制当前签名至剪切板</translation> </message> <message> - <location filename="../messagepage.cpp" line="74"/> - <location filename="../messagepage.cpp" line="89"/> - <location filename="../messagepage.cpp" line="101"/> - <source>Error signing</source> - <translation>签名错误</translation> + <location filename="../forms/messagepage.ui" line="134"/> + <source>&Copy to Clipboard</source> + <translation>&复制到剪贴板</translation> </message> <message> <location filename="../messagepage.cpp" line="74"/> <source>%1 is not a valid address.</source> <translation>%1 不是合法的比特币地址。</translation> </message> - <message> - <location filename="../messagepage.cpp" line="89"/> - <source>Private key for %1 is not available.</source> - <translation>%1 的秘钥不可用。</translation> - </message> - <message> - <location filename="../messagepage.cpp" line="101"/> - <source>Sign failed</source> - <translation>签名失败</translation> - </message> </context> <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>主要的</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>显示</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> + <location filename="../optionsdialog.cpp" line="105"/> <source>Options</source> <translation>选项</translation> </message> @@ -913,11 +929,26 @@ Address: %4 <context> <name>OverviewPage</name> <message> + <location filename="../forms/overviewpage.ui" line="124"/> + <source><b>Recent transactions</b></source> + <translation><b>最近交易记录</b></translation> + </message> + <message> + <location filename="../forms/overviewpage.ui" line="68"/> + <source>Unconfirmed:</source> + <translation>未确认：</translation> + </message> + <message> <location filename="../forms/overviewpage.ui" line="14"/> <source>Form</source> <translation>表单</translation> </message> <message> + <location filename="../forms/overviewpage.ui" line="54"/> + <source>Number of transactions:</source> + <translation>交易笔数：</translation> + </message> + <message> <location filename="../forms/overviewpage.ui" line="61"/> <source>0</source> <translation>0</translation> @@ -928,26 +959,11 @@ Address: %4 <translation>钱包</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="54"/> - <source>Number of transactions:</source> - <translation>交易笔数：</translation> - </message> - <message> <location filename="../forms/overviewpage.ui" line="40"/> <source>Balance:</source> <translation>余额：</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="124"/> - <source><b>Recent transactions</b></source> - <translation><b>最近交易记录</b></translation> - </message> - <message> - <location filename="../forms/overviewpage.ui" line="68"/> - <source>Unconfirmed:</source> - <translation>未确认：</translation> - </message> - <message> <location filename="../overviewpage.cpp" line="103"/> <source>Your current balance</source> <translation>您的当前余额</translation> @@ -966,29 +982,29 @@ Address: %4 <context> <name>QRCodeDialog</name> <message> - <location filename="../forms/qrcodedialog.ui" line="144"/> - <source>Message:</source> - <translation>消息：</translation> - </message> - <message> - <location filename="../qrcodedialog.cpp" line="48"/> + <location filename="../qrcodedialog.cpp" line="46"/> <source>Error encoding URI into QR Code.</source> <translation>将 URI 转换成二维码失败.</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="14"/> - <source>Dialog</source> - <translation>会话</translation> + <location filename="../forms/qrcodedialog.ui" line="70"/> + <source>Amount:</source> + <translation>金额：</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="32"/> - <source>QR Code</source> - <translation>二维码</translation> + <location filename="../forms/qrcodedialog.ui" line="186"/> + <source>&Save As...</source> + <translation>&另存为</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="121"/> - <source>Label:</source> - <translation>标签：</translation> + <location filename="../qrcodedialog.cpp" line="121"/> + <source>PNG Images (*.png)</source> + <translation>PNG图像文件(*.png)</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="14"/> + <source>Dialog</source> + <translation>会话</translation> </message> <message> <location filename="../forms/qrcodedialog.ui" line="105"/> @@ -996,34 +1012,56 @@ Address: %4 <translation>BTC</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> + <location filename="../qrcodedialog.cpp" line="121"/> <source>Save Image...</source> <translation>保存图像...</translation> </message> <message> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>URI 太长, 请试着精简标签/消息的内容.</translation> + </message> + <message> + <location filename="../forms/qrcodedialog.ui" line="32"/> + <source>QR Code</source> + <translation>二维码</translation> + </message> + <message> <location filename="../forms/qrcodedialog.ui" line="55"/> <source>Request Payment</source> <translation>请求付款</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="70"/> - <source>Amount:</source> - <translation>金额：</translation> - </message> - <message> - <location filename="../forms/qrcodedialog.ui" line="186"/> - <source>&Save As...</source> - <translation>&另存为</translation> + <location filename="../forms/qrcodedialog.ui" line="121"/> + <source>Label:</source> + <translation>标签：</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> - <source>PNG Images (*.png)</source> - <translation>PNG图像文件(*.png)</translation> + <location filename="../forms/qrcodedialog.ui" line="144"/> + <source>Message:</source> + <translation>消息：</translation> </message> </context> <context> <name>SendCoinsDialog</name> <message> + <location filename="../forms/sendcoinsdialog.ui" line="14"/> + <location filename="../sendcoinsdialog.cpp" line="123"/> + <location filename="../sendcoinsdialog.cpp" line="128"/> + <location filename="../sendcoinsdialog.cpp" line="133"/> + <location filename="../sendcoinsdialog.cpp" line="138"/> + <location filename="../sendcoinsdialog.cpp" line="144"/> + <location filename="../sendcoinsdialog.cpp" line="149"/> + <location filename="../sendcoinsdialog.cpp" line="154"/> + <source>Send Coins</source> + <translation>发送货币</translation> + </message> + <message> + <location filename="../forms/sendcoinsdialog.ui" line="64"/> + <source>Send to multiple recipients at once</source> + <translation>一次发送给多个接收者</translation> + </message> + <message> <location filename="../forms/sendcoinsdialog.ui" line="84"/> <source>Remove all transaction fields</source> <translation>移除所有交易项</translation> @@ -1049,26 +1087,19 @@ Address: %4 <translation>&发送</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="145"/> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>发现重复的地址, 每次只能对同一地址发送一次.</translation> + <location filename="../sendcoinsdialog.cpp" line="129"/> + <source>The amount to pay must be larger than 0.</source> + <translation>支付金额必须大于0.</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="14"/> - <location filename="../sendcoinsdialog.cpp" line="123"/> - <location filename="../sendcoinsdialog.cpp" line="128"/> - <location filename="../sendcoinsdialog.cpp" line="133"/> - <location filename="../sendcoinsdialog.cpp" line="138"/> - <location filename="../sendcoinsdialog.cpp" line="144"/> - <location filename="../sendcoinsdialog.cpp" line="149"/> - <location filename="../sendcoinsdialog.cpp" line="154"/> - <source>Send Coins</source> - <translation>发送货币</translation> + <location filename="../sendcoinsdialog.cpp" line="134"/> + <source>The amount exceeds your balance.</source> + <translation>金额超出您的账上余额。</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="64"/> - <source>Send to multiple recipients at once</source> - <translation>一次发送给多个接收者</translation> + <location filename="../sendcoinsdialog.cpp" line="145"/> + <source>Duplicate address found, can only send to each address once per send operation.</source> + <translation>发现重复的地址, 每次只能对同一地址发送一次.</translation> </message> <message> <location filename="../forms/sendcoinsdialog.ui" line="67"/> @@ -1086,12 +1117,22 @@ Address: %4 <translation>确认发送货币</translation> </message> <message> + <location filename="../sendcoinsdialog.cpp" line="124"/> + <source>The recipient address is not valid, please recheck.</source> + <translation>接收者地址不合法，请检查。</translation> + </message> + <message> <location filename="../sendcoinsdialog.cpp" line="139"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation>计入 %1 交易费后的金额超出您的账上余额。</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="101"/> + <source>Are you sure you want to send %1?</source> + <translation>确定您要发送 %1?</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="101"/> <source> and </source> <translation> 和 </translation> </message> @@ -1101,34 +1142,14 @@ Address: %4 <translation><b>%1</b> 到 %2 (%3)</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="101"/> - <source>Are you sure you want to send %1?</source> - <translation>确定您要发送 %1?</translation> - </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="124"/> - <source>The recipient address is not valid, please recheck.</source> - <translation>接收者地址不合法，请检查。</translation> - </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="129"/> - <source>The amount to pay must be larger than 0.</source> - <translation>支付金额必须大于0.</translation> - </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="150"/> - <source>Error: Transaction creation failed.</source> - <translation>错误: 创建交易失败.</translation> - </message> - <message> <location filename="../sendcoinsdialog.cpp" line="155"/> <source>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.</source> <translation>错误: 交易被拒绝. 如果您使用的是备份钱包，可能存在两个钱包不同步的情况，另一个钱包中的比特币已经被使用，但本地的这个钱包尚没有记录。</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="134"/> - <source>The amount exceeds your balance.</source> - <translation>金额超出您的账上余额。</translation> + <location filename="../sendcoinsdialog.cpp" line="150"/> + <source>Error: Transaction creation failed.</source> + <translation>错误: 创建交易失败.</translation> </message> </context> <context> @@ -1139,6 +1160,16 @@ Address: %4 <translation>Alt+A</translation> </message> <message> + <location filename="../forms/sendcoinsentry.ui" line="137"/> + <source>Remove this recipient</source> + <translation>移除此接收者</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="130"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> <location filename="../forms/sendcoinsentry.ui" line="14"/> <source>Form</source> <translation>表单</translation> @@ -1180,16 +1211,6 @@ Address: %4 <translation>从剪贴板粘贴地址</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="137"/> - <source>Remove this recipient</source> - <translation>移除此接收者</translation> - </message> - <message> - <location filename="../forms/sendcoinsentry.ui" line="130"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> <location filename="../sendcoinsentry.cpp" line="25"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>请输入比特币地址 (例如: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1198,156 +1219,156 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation>交易费</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="30"/> + <source>%1/unconfirmed</source> + <translation>%1/未确认</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>网络金额：</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> - <source>Transaction ID:</source> - <translation>交易ID：</translation> + <location filename="../transactiondesc.cpp" line="55"/> + <source>, has not been successfully broadcast yet</source> + <translation>, 未被成功广播</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> + <location filename="../transactiondesc.cpp" line="22"/> <source>Open until %1</source> <translation>至 %1 个数据块时开启</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="52"/> - <source>, has not been successfully broadcast yet</source> - <translation>, 未被成功广播</translation> + <location filename="../transactiondesc.cpp" line="96"/> + <source> (yours, label: </source> + <translation>(您的, 标签：</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="28"/> - <source>%1/unconfirmed</source> - <translation>%1/未确认</translation> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> + <source><b>To:</b> </source> + <translation><b>到：</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> + <location filename="../transactiondesc.cpp" line="20"/> + <source>Open for %1 blocks</source> + <translation>开启 %1 个数据块</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="28"/> <source>%1/offline?</source> <translation>%1/离线?</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> - <source>unknown</source> - <translation>未知</translation> + <location filename="../transactiondesc.cpp" line="32"/> + <source>%1 confirmations</source> + <translation>%1 确认项</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation><b>状态：</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>，同过 %1 节点广播</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> - <source>Comment:</source> - <translation>备注</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="132"/> - <source>(%1 matures in %2 more blocks)</source> - <translation>(%1 成熟于 %2 以上数据块)</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="18"/> - <source>Open for %1 blocks</source> - <translation>开启 %1 个数据块</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="30"/> - <source>%1 confirmations</source> - <translation>%1 确认项</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="56"/> + <location filename="../transactiondesc.cpp" line="59"/> <source>, broadcast through %1 nodes</source> <translation>，同过 %1 节点组广播</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="60"/> + <location filename="../transactiondesc.cpp" line="63"/> <source><b>Date:</b> </source> <translation><b>日期：</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>来源:</b> 生成<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>从：</b></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> - <source><b>To:</b> </source> - <translation><b>到：</b> </translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="93"/> - <source> (yours, label: </source> - <translation>(您的, 标签：</translation> + <location filename="../transactiondesc.cpp" line="92"/> + <source>unknown</source> + <translation>未知</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> + <location filename="../transactiondesc.cpp" line="98"/> <source> (yours)</source> <translation>(您的)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation><b>到帐:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="135"/> + <source>(%1 matures in %2 more blocks)</source> + <translation>(%1 成熟于 %2 以上数据块)</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation>(未接受)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation>支出</translation> </message> <message> <location filename="../transactiondesc.cpp" line="223"/> + <source>Transaction ID:</source> + <translation>交易ID：</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation>新生产的比特币必须等待120个数据块之后才能被使用. 当您生产出此数据块,它将被广播至比特币网络并添加至数据链. 如果添加到数据链失败, 它的状态将变成"不被接受"，生产的比特币将不能使用. 在您生产新数据块的几秒钟内, 如果其它节点也生产出同样的数据块，有可能会发生这种情况.</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>消息：</translation> </message> + <message> + <location filename="../transactiondesc.cpp" line="221"/> + <source>Comment:</source> + <translation>备注</translation> + </message> </context> <context> <name>TransactionDescDialog</name> <message> - <location filename="../forms/transactiondescdialog.ui" line="20"/> - <source>This pane shows a detailed description of the transaction</source> - <translation>当前面板显示了交易的详细信息</translation> - </message> - <message> <location filename="../forms/transactiondescdialog.ui" line="14"/> <source>Transaction details</source> <translation>交易明细</translation> </message> + <message> + <location filename="../forms/transactiondescdialog.ui" line="20"/> + <source>This pane shows a detailed description of the transaction</source> + <translation>当前面板显示了交易的详细信息</translation> + </message> </context> <context> <name>TransactionTableModel</name> @@ -1374,14 +1395,9 @@ Address: %4 <translation>至 %1 个数据块时开启</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="283"/> - <source>Offline (%1 confirmations)</source> - <translation>离线 (%1 个确认项)</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="289"/> - <source>Confirmed (%1 confirmations)</source> - <translation>已确认 (%1 条确认信息)</translation> + <location filename="../transactiontablemodel.cpp" line="286"/> + <source>Unconfirmed (%1 of %2 confirmations)</source> + <translation>未确认 (%1 / %2 条确认信息)</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="303"/> @@ -1459,9 +1475,14 @@ Address: %4 <translation>地址</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="286"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>未确认 (%1 / %2 条确认信息)</translation> + <location filename="../transactiontablemodel.cpp" line="283"/> + <source>Offline (%1 confirmations)</source> + <translation>离线 (%1 个确认项)</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="289"/> + <source>Confirmed (%1 confirmations)</source> + <translation>已确认 (%1 条确认信息)</translation> </message> <message numerus="yes"> <location filename="../transactiontablemodel.cpp" line="297"/> @@ -1474,14 +1495,9 @@ Address: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="289"/> - <source>Error exporting</source> - <translation>导出错误</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="74"/> - <source>Sent to</source> - <translation>发送到</translation> + <location filename="../transactionview.cpp" line="282"/> + <source>Label</source> + <translation>标签</translation> </message> <message> <location filename="../transactionview.cpp" line="84"/> @@ -1494,16 +1510,16 @@ Address: %4 <translation>复制地址</translation> </message> <message> + <location filename="../transactionview.cpp" line="77"/> + <source>Mined</source> + <translation>挖矿所得</translation> + </message> + <message> <location filename="../transactionview.cpp" line="127"/> <source>Edit label</source> <translation>编辑标签</translation> </message> <message> - <location filename="../transactionview.cpp" line="128"/> - <source>Show details...</source> - <translation>显示细节...</translation> - </message> - <message> <location filename="../transactionview.cpp" line="60"/> <source>This year</source> <translation>今年</translation> @@ -1534,9 +1550,9 @@ Address: %4 <translation>复制标签</translation> </message> <message> - <location filename="../transactionview.cpp" line="126"/> - <source>Copy amount</source> - <translation>复制金额</translation> + <location filename="../transactionview.cpp" line="90"/> + <source>Min amount</source> + <translation>最小金额</translation> </message> <message> <location filename="../transactionview.cpp" line="270"/> @@ -1559,14 +1575,9 @@ Address: %4 <translation>日期</translation> </message> <message> - <location filename="../transactionview.cpp" line="281"/> - <source>Type</source> - <translation>类别</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="282"/> - <source>Label</source> - <translation>标签</translation> + <location filename="../transactionview.cpp" line="283"/> + <source>Address</source> + <translation>地址</translation> </message> <message> <location filename="../transactionview.cpp" line="284"/> @@ -1574,9 +1585,9 @@ Address: %4 <translation>金额</translation> </message> <message> - <location filename="../transactionview.cpp" line="285"/> - <source>ID</source> - <translation>ID</translation> + <location filename="../transactionview.cpp" line="289"/> + <source>Error exporting</source> + <translation>导出错误</translation> </message> <message> <location filename="../transactionview.cpp" line="289"/> @@ -1589,31 +1600,6 @@ Address: %4 <translation>范围：</translation> </message> <message> - <location filename="../transactionview.cpp" line="59"/> - <source>Last month</source> - <translation>上月</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="392"/> - <source>to</source> - <translation>到</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="77"/> - <source>Mined</source> - <translation>挖矿所得</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="90"/> - <source>Min amount</source> - <translation>最小金额</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="283"/> - <source>Address</source> - <translation>地址</translation> - </message> - <message> <location filename="../transactionview.cpp" line="55"/> <location filename="../transactionview.cpp" line="71"/> <source>All</source> @@ -1634,11 +1620,46 @@ Address: %4 <source>This month</source> <translation>本月</translation> </message> + <message> + <location filename="../transactionview.cpp" line="59"/> + <source>Last month</source> + <translation>上月</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="74"/> + <source>Sent to</source> + <translation>发送到</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="126"/> + <source>Copy amount</source> + <translation>复制金额</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="281"/> + <source>Type</source> + <translation>类别</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="285"/> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="392"/> + <source>to</source> + <translation>到</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="128"/> + <source>Show details...</source> + <translation>显示细节...</translation> + </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>发送中...</translation> </message> @@ -1646,240 +1667,215 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Bitcoin version</source> - <translation>比特币版本</translation> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <translation>无法给数据目录 %s 加锁。比特币进程可能已在运行。</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> - <source>Loading wallet...</source> - <translation>正在加载钱包...</translation> + <location filename="../bitcoinstrings.cpp" line="115"/> + <source>Loading block index...</source> + <translation>加载区块索引...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> + <location filename="../bitcoinstrings.cpp" line="42"/> <source>Usage:</source> <translation>使用：</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> - <source>Loading addresses...</source> - <translation>正在加载地址...</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="78"/> + <location filename="../bitcoinstrings.cpp" line="116"/> <source>Error loading blkindex.dat</source> <translation>blkindex.dat文件加载错误</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> + <location filename="../bitcoinstrings.cpp" line="123"/> <source>Cannot initialize keypool</source> <translation>无法初始化 keypool</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation>wallet.dat钱包文件加载错误：请升级到最新Bitcoin客户端</translation> + <location filename="../bitcoinstrings.cpp" line="120"/> + <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> + <translation>钱包文件需要重写：请退出并重新启动Bitcoin客户端</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> - <source>Error loading wallet.dat</source> - <translation>wallet.dat钱包文件加载错误</translation> + <location filename="../bitcoinstrings.cpp" line="122"/> + <source>Cannot downgrade wallet</source> + <translation>无法降级钱包格式</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> - <source>Cannot write default address</source> - <translation>无法写入缺省地址</translation> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Loading wallet...</source> + <translation>正在加载钱包...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Send command to -server or bitcoind</source> - <translation>发送命令到服务器或者 bitcoind -</translation> + <location filename="../bitcoinstrings.cpp" line="132"/> + <source>Error: CreateThread(StartNode) failed</source> + <translation>错误：线程创建(StartNode)失败</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Options:</source> - <translation>选项： -</translation> + <location filename="../bitcoinstrings.cpp" line="133"/> + <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> + <translation>无法绑定端口 %d 到这台计算机。比特币进程可能已在运行。</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> - <source>Generate coins</source> - <translation>生成货币 -</translation> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <translation>警告：请确定您当前计算机的日期和时间是正确的。比特币将无法在错误的时间下正常工作。</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> - <source>List commands</source> - <translation>列出命令 + <location filename="../bitcoinstrings.cpp" line="43"/> + <source>Send command to -server or bitcoind</source> + <translation>发送命令到服务器或者 bitcoind </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Get help for a command</source> - <translation>获得某条命令的帮助 + <location filename="../bitcoinstrings.cpp" line="44"/> + <source>List commands</source> + <translation>列出命令 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>设置数据库缓冲区大小 (缺省: 25MB)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>指定 pid 文件 (默认为 bitcoind.pid) + <location filename="../bitcoinstrings.cpp" line="46"/> + <source>Options:</source> + <translation>选项： </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> - <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> - <translation>无法绑定端口 %d 到这台计算机。比特币进程可能已在运行。</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="99"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> - <translation>警告：请确定您当前计算机的日期和时间是正确的。比特币将无法在错误的时间下正常工作。</translation> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation>使用</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> + <location filename="../bitcoinstrings.cpp" line="128"/> <source>Invalid amount for -paytxfee=<amount></source> <translation>不合适的交易费 -paytxfee=<amount></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="91"/> - <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> - <translation>警告: -paytxfee 交易费设置过高. 每进行一笔交易您都将支付该数量的交易费.</translation> + <location filename="../bitcoinstrings.cpp" line="45"/> + <source>Get help for a command</source> + <translation>获得某条命令的帮助 +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="95"/> + <location filename="../bitcoinstrings.cpp" line="20"/> <source>Warning: Disk space is low</source> <translation>警告：磁盘空间不足</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> - <source>Find peers using internet relay chat (default: 0)</source> - <translation>通过IRC聊天室查找网络上的比特币节点 (缺省: 0)</translation> + <location filename="../bitcoinstrings.cpp" line="49"/> + <source>Generate coins</source> + <translation>生成货币 +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="22"/> + <location filename="../bitcoinstrings.cpp" line="54"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation>设置数据库缓冲区大小 (缺省: 25MB)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="56"/> <source>Specify connection timeout (in milliseconds)</source> <translation>指定连接超时时间 (微秒) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> - <source>Prepend debug output with timestamp</source> - <translation>为调试输出信息添加时间戳</translation> + <location filename="../bitcoinstrings.cpp" line="63"/> + <source>Find peers using internet relay chat (default: 0)</source> + <translation>通过IRC聊天室查找网络上的比特币节点 (缺省: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> + <location filename="../bitcoinstrings.cpp" line="66"/> + <source>Find peers using DNS lookup (default: 1)</source> + <translation>通过DNS查找节点(缺省：1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="85"/> <source>Username for JSON-RPC connections</source> <translation>JSON-RPC连接用户名 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> - <source>Error loading addr.dat</source> - <translation>addr.dat文件加载错误</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>向IP地址为 <ip> 的节点发送指令 (缺省: 127.0.0.1) -</translation> + <location filename="../bitcoinstrings.cpp" line="84"/> + <source>Send trace/debug info to debugger</source> + <translation>跟踪/调试信息输出到 调试器debugger</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> - <source>Server certificate file (default: server.cert)</source> - <translation>服务器证书 (默认为 server.cert) -</translation> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>Error loading wallet.dat</source> + <translation>wallet.dat钱包文件加载错误</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> - <source>Server private key (default: server.pem)</source> - <translation>服务器私钥 (默认为 server.pem) -</translation> + <location filename="../bitcoinstrings.cpp" line="118"/> + <source>Error loading wallet.dat: Wallet corrupted</source> + <translation>wallet.dat钱包文件加载错误：钱包损坏</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>可接受的加密器 (默认为 TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>设置密钥池大小为 <n> (缺省: 100) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> + <location filename="../bitcoinstrings.cpp" line="96"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation>启动时需检查的区块数量 (缺省: 2500, 设置0为检查所有区块)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation>设置密钥池大小为 <n> (缺省: 100) + <location filename="../bitcoinstrings.cpp" line="102"/> + <source>Server certificate file (default: server.cert)</source> + <translation>服务器证书 (默认为 server.cert) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> - <source>Rescan the block chain for missing wallet transactions</source> - <translation>重新扫描数据链以查找遗漏的交易 -</translation> + <location filename="../bitcoinstrings.cpp" line="93"/> + <source>Upgrade wallet to latest format</source> + <translation>将钱包升级到最新的格式</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>跟踪/调试信息输出到控制台，不输出到debug.log文件</translation> + <location filename="../bitcoinstrings.cpp" line="97"/> + <source>How thorough the block verification is (0-6, default: 1)</source> + <translation>需要几个确认 (0-6个, 缺省: 1个)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> - <source>Send trace/debug info to debugger</source> - <translation>跟踪/调试信息输出到 调试器debugger</translation> + <location filename="../bitcoinstrings.cpp" line="101"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>为 JSON-RPC 连接使用 OpenSSL (https)连接</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Password for JSON-RPC connections</source> - <translation>JSON-RPC连接密码 + <location filename="../bitcoinstrings.cpp" line="107"/> + <source>This help message</source> + <translation>该帮助信息 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="54"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>当最佳区块变化时执行命令 (命令行中的 %s 会被替换成区块哈希值)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="19"/> + <location filename="../bitcoinstrings.cpp" line="52"/> <source>Show splash screen on startup (default: 1)</source> <translation>启动时显示版权页 (缺省: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Specify data directory</source> - <translation>指定数据目录 -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="23"/> + <location filename="../bitcoinstrings.cpp" line="57"/> <source>Connect through socks4 proxy</source> <translation>通过 socks4 代理连接 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Find peers using DNS lookup (default: 1)</source> - <translation>通过DNS查找节点(缺省：1)</translation> + <location filename="../bitcoinstrings.cpp" line="51"/> + <source>Start minimized</source> + <translation>启动时最小化 +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> - <translation>Maximum per-connection receive buffer, <n>*1000 bytes (缺省: 10000)</translation> + <location filename="../bitcoinstrings.cpp" line="58"/> + <source>Allow DNS lookups for addnode and connect</source> + <translation>连接节点时允许DNS查找 +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> - <source>Accept command line and JSON-RPC commands</source> - <translation>接受命令行和 JSON-RPC 命令 -</translation> + <location filename="../bitcoinstrings.cpp" line="65"/> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>设置语言, 例如 "de_DE" (缺省: 系统语言)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation> @@ -1887,190 +1883,307 @@ SSL 选项: (SSL 安装教程具体见比特币维基百科) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>发送中</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> + <location filename="../bitcoinstrings.cpp" line="125"/> <source>Rescanning...</source> <translation>正在重新扫描...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> - <source>Loading block index...</source> - <translation>加载区块索引...</translation> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation>使用 %s 选项</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> - <source>Invalid -proxy address</source> - <translation>代理地址不合法</translation> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>金额不对</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> - <source>Error: CreateThread(StartNode) failed</source> - <translation>错误：线程创建(StartNode)失败</translation> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>金额不足</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> + <location filename="../bitcoinstrings.cpp" line="113"/> + <source>Loading addresses...</source> + <translation>正在加载地址...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="126"/> <source>Done loading</source> <translation>加载完成</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>测试</translation> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation>%s, 您必须在配置文件中加入选项 rpcpassword : + %s +建议您使用下面的随机密码: +rpcuser=bitcoinrpc +rpcpassword=%s +(您无需记忆该密码) +如果配置文件不存在，请新建，并将文件权限设置为仅允许文件所有者读取.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> - <source>Error loading wallet.dat: Wallet corrupted</source> - <translation>wallet.dat钱包文件加载错误：钱包损坏</translation> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation>您必须在配置文件中加入选项 rpcpassword : + %s +如果配置文件不存在，请新建，并将文件权限设置为仅允许文件所有者读取.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> - <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation>钱包文件需要重写：请退出并重新启动Bitcoin客户端</translation> + <location filename="../bitcoinstrings.cpp" line="41"/> + <source>Bitcoin version</source> + <translation>比特币版本</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> - <source>Cannot downgrade wallet</source> - <translation>无法降级钱包格式</translation> + <location filename="../bitcoinstrings.cpp" line="114"/> + <source>Error loading addr.dat</source> + <translation>addr.dat文件加载错误</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> + <location filename="../bitcoinstrings.cpp" line="127"/> + <source>Invalid -proxy address</source> + <translation>代理地址不合法</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation>设置数据库磁盘日志大小 (缺省: 100MB)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="124"/> + <source>Cannot write default address</source> + <translation>无法写入缺省地址</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="129"/> + <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> + <translation>警告: -paytxfee 交易费设置过高. 每进行一笔交易您都将支付该数量的交易费.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation>分离区块数据库和地址数据库. 会延升关闭时间 (缺省: 0)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>添加节点并与其保持连接</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> + <location filename="../bitcoinstrings.cpp" line="88"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>允许从指定IP接受到的JSON-RPC连接 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> + <location filename="../bitcoinstrings.cpp" line="47"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>指定配置文件 (默认为 bitcoin.conf) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> - <source>Don't generate coins</source> - <translation>不要生成货币 -</translation> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>比特币</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> - <source>Start minimized</source> - <translation>启动时最小化 + <location filename="../bitcoinstrings.cpp" line="50"/> + <source>Don't generate coins</source> + <translation>不要生成货币 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> - <source>Allow DNS lookups for addnode and connect</source> - <translation>连接节点时允许DNS查找 + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Specify data directory</source> + <translation>指定数据目录 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> + <location filename="../bitcoinstrings.cpp" line="59"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>监听端口连接 <port> (缺省: 8333 or testnet: 18333)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> + <location filename="../bitcoinstrings.cpp" line="60"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>最大连接数 <n> (缺省: 125)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> + <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation>只连接到指定节点 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> + <location filename="../bitcoinstrings.cpp" line="64"/> <source>Accept connections from outside (default: 1)</source> <translation type="unfinished">接受来自外部的连接 (缺省: 1)</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>设置语言, 例如 "de_DE" (缺省: 系统语言)</translation> + <source>Error</source> + <translation>错误</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> + <location filename="../bitcoinstrings.cpp" line="119"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> + <translation>wallet.dat钱包文件加载错误：请升级到最新Bitcoin客户端</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="67"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Threshold for disconnecting misbehaving peers (缺省: 100)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> + <location filename="../bitcoinstrings.cpp" line="68"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Number of seconds to keep misbehaving peers from reconnecting (缺省: 86400)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> + <location filename="../bitcoinstrings.cpp" line="71"/> + <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> + <translation>Maximum per-connection receive buffer, <n>*1000 bytes (缺省: 10000)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> <source>Fee per KB to add to transactions you send</source> <translation>每发送1KB交易所需的费用</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> + <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation>Maximum per-connection send buffer, <n>*1000 bytes (缺省: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation type="unfinished">错误: 创建交易失败.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation type="unfinished">错误: 交易被拒绝. 如果您使用的是备份钱包，可能存在两个钱包不同步的情况，另一个钱包中的比特币已经被使用，但本地的这个钱包尚没有记录。</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation>设置RPC监听端口%u时发生错误: %s</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished">使用UPnp映射监听端口(缺省: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> + <location filename="../bitcoinstrings.cpp" line="74"/> <source>Use Universal Plug and Play to map the listening port (default: 0)</source> <translation type="unfinished">使用UPnp映射监听端口(缺省: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="43"/> + <location filename="../bitcoinstrings.cpp" line="78"/> + <source>Accept command line and JSON-RPC commands</source> + <translation>接受命令行和 JSON-RPC 命令 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="79"/> <source>Run in the background as a daemon and accept commands</source> <translation>在后台运行并接受命令 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> - <source>How thorough the block verification is (0-6, default: 1)</source> - <translation>需要几个确认 (0-6个, 缺省: 1个)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="44"/> + <location filename="../bitcoinstrings.cpp" line="80"/> <source>Use the test network</source> <translation>使用测试网络 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> + <location filename="../bitcoinstrings.cpp" line="81"/> <source>Output extra debugging information</source> <translation>输出调试信息</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Prepend debug output with timestamp</source> + <translation>为调试输出信息添加时间戳</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="83"/> + <source>Send trace/debug info to console instead of debug.log file</source> + <translation>跟踪/调试信息输出到控制台，不输出到debug.log文件</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="86"/> + <source>Password for JSON-RPC connections</source> + <translation>JSON-RPC连接密码 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="87"/> <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> <translation>JSON-RPC连接监听<端口> (默认为 8332) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> - <source>This help message</source> - <translation>该帮助信息 + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>向IP地址为 <ip> 的节点发送指令 (缺省: 127.0.0.1) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> - <source>Upgrade wallet to latest format</source> - <translation>将钱包升级到最新的格式</translation> + <location filename="../bitcoinstrings.cpp" line="90"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation>当最佳区块变化时执行命令 (命令行中的 %s 会被替换成区块哈希值)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> - <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>为 JSON-RPC 连接使用 OpenSSL (https)连接</translation> + <location filename="../bitcoinstrings.cpp" line="95"/> + <source>Rescan the block chain for missing wallet transactions</source> + <translation>重新扫描数据链以查找遗漏的交易 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="103"/> + <source>Server private key (default: server.pem)</source> + <translation>服务器私钥 (默认为 server.pem) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>可接受的加密器 (默认为 TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>指定 pid 文件 (默认为 bitcoind.pid) +</translation> </message> </context> </TS> diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts index f210d8ad79..f3593cb930 100644 --- a/src/qt/locale/bitcoin_zh_TW.ts +++ b/src/qt/locale/bitcoin_zh_TW.ts @@ -15,7 +15,7 @@ <translation><b>位元幣</b>版本</translation> </message> <message> - <location filename="../forms/aboutdialog.ui" line="85"/> + <location filename="../forms/aboutdialog.ui" line="91"/> <source>Copyright © 2009-2012 Bitcoin Developers This is experimental software. @@ -55,9 +55,14 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>產生新位址</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="60"/> - <source>&New Address...</source> - <translation>新位址...</translation> + <location filename="../forms/addressbookpage.ui" line="99"/> + <source>Sign &Message</source> + <translation>訊息簽署</translation> + </message> + <message> + <location filename="../forms/addressbookpage.ui" line="113"/> + <source>&Delete</source> + <translation>刪除</translation> </message> <message> <location filename="../forms/addressbookpage.ui" line="71"/> @@ -65,6 +70,11 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>複製目前選取的位址到系統剪貼簿</translation> </message> <message> + <location filename="../forms/addressbookpage.ui" line="60"/> + <source>&New Address...</source> + <translation>新位址...</translation> + </message> + <message> <location filename="../forms/addressbookpage.ui" line="74"/> <source>&Copy to Clipboard</source> <translation>複製到剪貼簿</translation> @@ -75,14 +85,9 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>顯示 &QR 條碼</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> - <source>Error exporting</source> - <translation>資料匯出有誤</translation> - </message> - <message> - <location filename="../forms/addressbookpage.ui" line="113"/> - <source>&Delete</source> - <translation>刪除</translation> + <location filename="../forms/addressbookpage.ui" line="110"/> + <source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source> + <translation>從列表中刪除目前選取的位址. 只能夠刪除付款位址.</translation> </message> <message> <location filename="../forms/addressbookpage.ui" line="96"/> @@ -90,60 +95,50 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>簽署一則訊息來證明你擁有這個位址</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="99"/> - <source>Sign &Message</source> - <translation>訊息簽署</translation> - </message> - <message> - <location filename="../forms/addressbookpage.ui" line="110"/> - <source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source> - <translation>從列表中刪除目前選取的位址. 只能夠刪除付款位址.</translation> + <location filename="../addressbookpage.cpp" line="299"/> + <source>Error exporting</source> + <translation>資料匯出有誤</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="61"/> + <location filename="../addressbookpage.cpp" line="65"/> <source>Copy address</source> <translation>複製位址</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="62"/> + <location filename="../addressbookpage.cpp" line="66"/> <source>Copy label</source> <translation>複製標記</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="63"/> + <location filename="../addressbookpage.cpp" line="67"/> <source>Edit</source> <translation>編輯</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="278"/> + <location filename="../addressbookpage.cpp" line="68"/> + <source>Delete</source> + <translation>刪除</translation> + </message> + <message> + <location filename="../addressbookpage.cpp" line="285"/> <source>Export Address Book Data</source> <translation>匯出位址簿資料</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="279"/> + <location filename="../addressbookpage.cpp" line="286"/> <source>Comma separated file (*.csv)</source> <translation>逗號區隔資料檔 (*.csv)</translation> </message> <message> - <location filename="../addressbookpage.cpp" line="292"/> + <location filename="../addressbookpage.cpp" line="299"/> <source>Could not write to file %1.</source> <translation>無法寫入檔案 %1.</translation> </message> - <message> - <location filename="../addressbookpage.cpp" line="64"/> - <source>Delete</source> - <translation>刪除</translation> - </message> </context> <context> <name>AddressTableModel</name> <message> <location filename="../addresstablemodel.cpp" line="78"/> - <source>Label</source> - <translation>標記</translation> - </message> - <message> - <location filename="../addresstablemodel.cpp" line="78"/> <source>Address</source> <translation>位址</translation> </message> @@ -152,18 +147,28 @@ This product includes software developed by the OpenSSL Project for use in the O <source>(no label)</source> <translation>(沒有標記)</translation> </message> + <message> + <location filename="../addresstablemodel.cpp" line="78"/> + <source>Label</source> + <translation>標記</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> <message> + <location filename="../forms/askpassphrasedialog.ui" line="61"/> + <source>New passphrase</source> + <translation>新的密碼</translation> + </message> + <message> <location filename="../forms/askpassphrasedialog.ui" line="47"/> <source>Enter passphrase</source> <translation>輸入密碼</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="38"/> - <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>這個動作需要用你的錢包密碼來解鎖</translation> + <location filename="../askpassphrasedialog.cpp" line="145"/> + <source>Wallet unlock failed</source> + <translation>錢包解鎖失敗</translation> </message> <message> <location filename="../forms/askpassphrasedialog.ui" line="26"/> @@ -171,24 +176,9 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>對話視窗</translation> </message> <message> - <location filename="../forms/askpassphrasedialog.ui" line="61"/> - <source>New passphrase</source> - <translation>新的密碼</translation> - </message> - <message> - <location filename="../forms/askpassphrasedialog.ui" line="75"/> - <source>Repeat new passphrase</source> - <translation>重複新密碼</translation> - </message> - <message> - <location filename="../forms/askpassphrasedialog.ui" line="94"/> - <source>TextLabel</source> - <translation>文字標籤</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="55"/> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>輸入錢包的新舊密碼.</translation> + <location filename="../askpassphrasedialog.cpp" line="34"/> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>輸入錢包的新密碼.<br/>請用<b>10個以上的字元</b>, 或是<b>8個以上的單字</b>.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="35"/> @@ -196,68 +186,50 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>錢包加密</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="51"/> - <source>Decrypt wallet</source> - <translation>錢包解密</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="134"/> - <location filename="../askpassphrasedialog.cpp" line="182"/> - <source>The supplied passphrases do not match.</source> - <translation>提供的密碼不符.</translation> - </message> - <message> <location filename="../askpassphrasedialog.cpp" line="43"/> <source>Unlock wallet</source> <translation>錢包解鎖</translation> </message> <message> + <location filename="../askpassphrasedialog.cpp" line="54"/> + <source>Change passphrase</source> + <translation>變更密碼</translation> + </message> + <message> <location filename="../askpassphrasedialog.cpp" line="111"/> <location filename="../askpassphrasedialog.cpp" line="169"/> <source>Wallet encrypted</source> <translation>錢包已加密</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="127"/> - <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>錢包加密因程式內部有誤而失敗. 你的錢包還是沒有加密.</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="34"/> - <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>輸入錢包的新密碼.<br/>請用<b>10個以上的字元</b>, 或是<b>8個以上的字詞</b>.</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="156"/> - <source>Wallet decryption failed</source> - <translation>錢包解密失敗</translation> - </message> - <message> <location filename="../askpassphrasedialog.cpp" line="113"/> <source>Bitcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> <translation>位元幣現在要關閉以完成加密程序. 請記住, 加密錢包無法完全防止入侵電腦的惡意程式偷取你的位元幣.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="46"/> - <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>這個動作需要用你的錢包密碼來解密</translation> + <location filename="../askpassphrasedialog.cpp" line="101"/> + <source>Confirm wallet encryption</source> + <translation>錢包加密確認</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="54"/> - <source>Change passphrase</source> - <translation>變更密碼</translation> + <location filename="../forms/askpassphrasedialog.ui" line="75"/> + <source>Repeat new passphrase</source> + <translation>重複新密碼</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="101"/> - <source>Confirm wallet encryption</source> - <translation>錢包加密確認</translation> + <location filename="../askpassphrasedialog.cpp" line="55"/> + <source>Enter the old and new passphrase to the wallet.</source> + <translation>輸入錢包的新舊密碼.</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="102"/> - <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! -Are you sure you wish to encrypt your wallet?</source> - <translation>警告: 如果將錢包加密後忘記密碼, 你會<b>失去其中所有的位元幣</b>! -你確定要將錢包加密嗎?</translation> + <location filename="../forms/askpassphrasedialog.ui" line="94"/> + <source>TextLabel</source> + <translation>文字標籤</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="51"/> + <source>Decrypt wallet</source> + <translation>錢包解密</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="117"/> @@ -273,9 +245,15 @@ Are you sure you wish to encrypt your wallet?</source> <translation>錢包加密失敗</translation> </message> <message> - <location filename="../askpassphrasedialog.cpp" line="145"/> - <source>Wallet unlock failed</source> - <translation>錢包解鎖失敗</translation> + <location filename="../askpassphrasedialog.cpp" line="127"/> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>錢包加密因程式內部有誤而失敗. 你的錢包還是沒有加密.</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="134"/> + <location filename="../askpassphrasedialog.cpp" line="182"/> + <source>The supplied passphrases do not match.</source> + <translation>提供的密碼不符.</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="146"/> @@ -295,225 +273,285 @@ Are you sure you wish to encrypt your wallet?</source> <source>Warning: The Caps Lock key is on.</source> <translation>警告: 鍵盤輸入鎖定為大寫字母中.</translation> </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="102"/> + <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! +Are you sure you wish to encrypt your wallet?</source> + <translation>警告: 如果將錢包加密後忘記密碼, 你會<b>失去其中所有的位元幣</b>! +你確定要將錢包加密嗎?</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="38"/> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>這個動作需要用你的錢包密碼來解鎖</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="46"/> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>這個動作需要用你的錢包密碼來解密</translation> + </message> + <message> + <location filename="../askpassphrasedialog.cpp" line="156"/> + <source>Wallet decryption failed</source> + <translation>錢包解密失敗</translation> + </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="245"/> - <source>Show information about Qt</source> - <translation>顯示有關於 Qt 的資訊</translation> + <location filename="../bitcoingui.cpp" line="191"/> + <source>&Transactions</source> + <translation>交易</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="197"/> + <source>&Address Book</source> + <translation>位址簿</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="205"/> + <location filename="../bitcoingui.cpp" line="203"/> <source>&Receive coins</source> <translation>收錢</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="206"/> - <source>Show the list of addresses for receiving payments</source> - <translation>顯示收款位址的列表</translation> + <location filename="../bitcoingui.cpp" line="506"/> + <source>Synchronizing with network...</source> + <translation>網路同步中...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Backup Wallet</source> - <translation>錢包備份</translation> + <location filename="../bitcoingui.cpp" line="192"/> + <source>Browse transaction history</source> + <translation>瀏覽交易紀錄</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="187"/> + <location filename="../bitcoingui.cpp" line="185"/> <source>&Overview</source> <translation>總覽</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="193"/> - <source>&Transactions</source> - <translation>交易</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="199"/> - <source>&Address Book</source> - <translation>位址簿</translation> + <location filename="../bitcoingui.cpp" line="186"/> + <source>Show general overview of wallet</source> + <translation>顯示錢包一般總覽</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="212"/> - <source>Send coins to a bitcoin address</source> - <translation>付錢至某個位元幣位址</translation> + <location filename="../bitcoingui.cpp" line="198"/> + <source>Edit the list of stored addresses and labels</source> + <translation>編輯儲存位址與標記的列表</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="237"/> + <location filename="../bitcoingui.cpp" line="235"/> <source>E&xit</source> <translation>結束</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="211"/> + <location filename="../bitcoingui.cpp" line="209"/> <source>&Send coins</source> <translation>付錢</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="146"/> - <location filename="../bitcoingui.cpp" line="478"/> - <source>Synchronizing with network...</source> - <translation>網路同步中...</translation> + <location filename="../bitcoingui.cpp" line="210"/> + <source>Send coins to a bitcoin address</source> + <translation>付錢至某個位元幣位址</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="247"/> + <location filename="../bitcoingui.cpp" line="236"/> + <source>Quit application</source> + <translation>結束應用程式</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="245"/> <source>&Options...</source> <translation>選項...</translation> </message> <message> <location filename="../bitcoingui.cpp" line="242"/> - <source>Show information about Bitcoin</source> - <translation>顯示位元幣相關資訊</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="244"/> <source>About &Qt</source> <translation>關於 &Qt</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="252"/> + <location filename="../bitcoingui.cpp" line="216"/> + <source>Prove you control an address</source> + <translation>證明你控制一個位址</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="249"/> + <source>Show or hide the Bitcoin window</source> + <translation>顯示或隱藏位元幣的視窗</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="250"/> <source>&Export...</source> <translation>匯出...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="292"/> - <source>&Settings</source> - <translation>設定</translation> + <location filename="../bitcoingui.cpp" line="251"/> + <source>Export the data in the current tab to a file</source> + <translation>將目前分頁的資料匯出存成檔案</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="255"/> - <source>Encrypt or decrypt wallet</source> - <translation>將錢包加解密</translation> + <location filename="../bitcoingui.cpp" line="296"/> + <source>&Help</source> + <translation>求助</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="258"/> - <source>Backup wallet to another location</source> - <translation>將錢包備份到其它地方</translation> + <location filename="../bitcoingui.cpp" line="327"/> + <source>[testnet]</source> + <translation>[testnet]</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="260"/> - <source>Change the passphrase used for wallet encryption</source> - <translation>變更錢包加密用的密碼</translation> + <location filename="../bitcoingui.cpp" line="632"/> + <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> + <translation>這筆交易的資料大小超過限制了. 你還是可以付出 %1 的費用來傳送. 這筆費用會付給處理該筆交易的節點, 並幫助維持整個網路. 你願意支付這項費用嗎?</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="259"/> - <source>&Change Passphrase</source> - <translation>變更密碼</translation> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Wallet Data (*.dat)</source> + <translation>錢包資料檔 (*.dat)</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="619"/> - <source>Sending...</source> - <translation>付出中...</translation> + <location filename="../bitcoingui.cpp" line="824"/> + <source>Backup Failed</source> + <translation>備份失敗</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="824"/> + <source>There was an error trying to save the wallet data to the new location.</source> + <translation>儲存錢包資料到新的地方時發生錯誤</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="149"/> - <source>Block chain synchronization in progress</source> - <translation>正在進行區塊鎖鏈的同步中</translation> + <location filename="../bitcoingui.cpp" line="290"/> + <source>&Settings</source> + <translation>設定</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="204"/> + <source>Show the list of addresses for receiving payments</source> + <translation>顯示收款位址的列表</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="283"/> + <location filename="../bitcoingui.cpp" line="215"/> + <source>Sign &message</source> + <translation>訊息簽署</translation> + </message> + <message> + <location filename="../bitcoingui.cpp" line="281"/> <source>&File</source> <translation>檔案</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="73"/> - <source>Bitcoin Wallet</source> - <translation>位元幣錢包</translation> + <location filename="../bitcoingui.cpp" line="303"/> + <source>Tabs toolbar</source> + <translation>分頁工具列</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="188"/> - <source>Show general overview of wallet</source> - <translation>顯示錢包一般總覽</translation> + <location filename="../bitcoingui.cpp" line="314"/> + <source>Actions toolbar</source> + <translation>動作工具列</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="194"/> - <source>Browse transaction history</source> - <translation>瀏覽交易紀錄</translation> + <location filename="../bitcoingui.cpp" line="391"/> + <source>Bitcoin client</source> + <translation>位元幣客戶端軟體</translation> </message> - <message> - <location filename="../bitcoingui.cpp" line="250"/> - <source>Open &Bitcoin</source> - <translation>開啟位元幣</translation> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="482"/> + <source>%n active connection(s) to Bitcoin network</source> + <translation> + <numerusform>與位元幣網路有 %n 個連線在使用中</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="298"/> - <source>&Help</source> - <translation>求助</translation> + <location filename="../bitcoingui.cpp" line="239"/> + <source>&About %1</source> + <translation>關於%1</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="489"/> - <source>Downloaded %1 of %2 blocks of transaction history.</source> - <translation>已下載了 %1/%2 個交易紀錄的區塊.</translation> + <location filename="../bitcoingui.cpp" line="240"/> + <source>Show information about Bitcoin</source> + <translation>顯示位元幣相關資訊</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="501"/> - <source>Downloaded %1 blocks of transaction history.</source> - <translation>已下載了 %1 個交易紀錄的區塊.</translation> + <location filename="../bitcoingui.cpp" line="243"/> + <source>Show information about Qt</source> + <translation>顯示有關於 Qt 的資訊</translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="516"/> + <location filename="../bitcoingui.cpp" line="546"/> <source>%n second(s) ago</source> <translation> <numerusform>%n 秒鐘前</numerusform> </translation> </message> + <message> + <location filename="../bitcoingui.cpp" line="246"/> + <source>Modify configuration options for bitcoin</source> + <translation>修改位元幣的設定選項</translation> + </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="520"/> + <location filename="../bitcoingui.cpp" line="550"/> <source>%n minute(s) ago</source> <translation> <numerusform>%n 分鐘前</numerusform> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="524"/> + <location filename="../bitcoingui.cpp" line="554"/> <source>%n hour(s) ago</source> <translation> <numerusform>%n 小時前</numerusform> </translation> </message> <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="528"/> + <location filename="../bitcoingui.cpp" line="558"/> <source>%n day(s) ago</source> <translation> <numerusform>%n 天前</numerusform> </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="534"/> + <location filename="../bitcoingui.cpp" line="564"/> <source>Up to date</source> <translation>最新狀態</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="539"/> + <location filename="../bitcoingui.cpp" line="569"/> <source>Catching up...</source> <translation>進度追趕中...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="547"/> + <location filename="../bitcoingui.cpp" line="577"/> <source>Last received block was generated %1.</source> <translation>最近收到的區塊產生於 %1.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="218"/> - <source>Prove you control an address</source> - <translation>證明你控制一個位址</translation> + <location filename="../bitcoingui.cpp" line="418"/> + <source>bitcoin-qt</source> + <translation>bitcoin-qt</translation> + </message> + <message numerus="yes"> + <location filename="../bitcoingui.cpp" line="508"/> + <source>~%n block(s) remaining</source> + <translation> + <numerusform>剩下 ~%n 個區塊</numerusform> + </translation> </message> <message> - <location filename="../bitcoingui.cpp" line="615"/> - <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source> - <translation>這筆交易的資料大小超過限制了. 你還是可以付出 %1 的費用來傳送. 這筆費用會付給處理該筆交易的節點, 並幫助維持整個網路. 你願意支付這項費用嗎?</translation> + <location filename="../bitcoingui.cpp" line="531"/> + <source>Downloaded %1 blocks of transaction history.</source> + <translation>已下載了 %1 個交易紀錄的區塊.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="646"/> + <location filename="../bitcoingui.cpp" line="663"/> <source>Sent transaction</source> <translation>付款交易</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="647"/> + <location filename="../bitcoingui.cpp" line="664"/> <source>Incoming transaction</source> <translation>收款交易</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="648"/> + <location filename="../bitcoingui.cpp" line="665"/> <source>Date: %1 Amount: %2 Type: %3 @@ -525,127 +563,95 @@ Address: %4 位址: %4</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="773"/> + <location filename="../bitcoingui.cpp" line="790"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>錢包<b>已加密</b>並且正<b>解鎖中</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="781"/> + <location filename="../bitcoingui.cpp" line="798"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>錢包<b>已加密</b>並且正<b>上鎖中</b></translation> </message> <message> - <location filename="../bitcoingui.cpp" line="238"/> - <source>Quit application</source> - <translation>結束應用程式</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="241"/> - <source>&About %1</source> - <translation>關於%1</translation> + <location filename="../bitcoingui.cpp" line="821"/> + <source>Backup Wallet</source> + <translation>錢包備份</translation> </message> <message> <location filename="../bitcoingui.cpp" line="248"/> - <source>Modify configuration options for bitcoin</source> - <translation>修改位元幣的設定選項</translation> + <source>Show/Hide &Bitcoin</source> + <translation>顯示/隱藏位元幣</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="253"/> - <source>Export the data in the current tab to a file</source> - <translation>將目前分頁的資料匯出存成檔案</translation> + <location filename="../bitcoin.cpp" line="127"/> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>發生了致命的錯誤. 位元幣程式無法再繼續安全執行, 只好結束.</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="254"/> - <source>&Encrypt Wallet</source> - <translation>錢包加密</translation> + <location filename="../bitcoingui.cpp" line="253"/> + <source>Encrypt or decrypt wallet</source> + <translation>將錢包加解密</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="257"/> + <location filename="../bitcoingui.cpp" line="255"/> <source>&Backup Wallet</source> <translation>錢包備份</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="305"/> - <source>Tabs toolbar</source> - <translation>分頁工具列</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="316"/> - <source>Actions toolbar</source> - <translation>動作工具列</translation> - </message> - <message> - <location filename="../bitcoin.cpp" line="144"/> - <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> - <translation>發生了致命的錯誤. 位元幣程式無法再繼續安全執行, 只好結束.</translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="421"/> - <source>bitcoin-qt</source> - <translation>bitcoin-qt</translation> - </message> - <message numerus="yes"> - <location filename="../bitcoingui.cpp" line="463"/> - <source>%n active connection(s) to Bitcoin network</source> - <translation> - <numerusform>與位元幣網路有 %n 個連線在使用中</numerusform> - </translation> - </message> - <message> - <location filename="../bitcoingui.cpp" line="804"/> - <source>Wallet Data (*.dat)</source> - <translation>錢包資料檔 (*.dat)</translation> + <location filename="../bitcoingui.cpp" line="256"/> + <source>Backup wallet to another location</source> + <translation>將錢包備份到其它地方</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> - <source>There was an error trying to save the wallet data to the new location.</source> - <translation>儲存錢包資料到新的地方時發生錯誤</translation> + <location filename="../bitcoingui.cpp" line="257"/> + <source>&Change Passphrase</source> + <translation>變更密碼</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="807"/> - <source>Backup Failed</source> - <translation>備份失敗</translation> + <location filename="../bitcoingui.cpp" line="258"/> + <source>Change the passphrase used for wallet encryption</source> + <translation>變更錢包加密用的密碼</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="251"/> - <source>Show the Bitcoin window</source> - <translation>顯示位元幣主視窗</translation> + <location filename="../bitcoingui.cpp" line="71"/> + <source>Bitcoin Wallet</source> + <translation>位元幣錢包</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="329"/> - <source>[testnet]</source> - <translation>[testnet]</translation> + <location filename="../bitcoingui.cpp" line="519"/> + <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> + <translation>已下載了全部 %2 個中的 %1 個交易紀錄區塊 (已完成 %3%).</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="200"/> - <source>Edit the list of stored addresses and labels</source> - <translation>編輯儲存位址與標記的列表</translation> + <location filename="../bitcoingui.cpp" line="636"/> + <source>Sending...</source> + <translation>付出中...</translation> </message> <message> - <location filename="../bitcoingui.cpp" line="217"/> - <source>Sign &message</source> - <translation>訊息簽署</translation> + <location filename="../bitcoingui.cpp" line="252"/> + <source>&Encrypt Wallet</source> + <translation>錢包加密</translation> </message> </context> <context> <name>DisplayOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="269"/> + <location filename="../optionsdialog.cpp" line="273"/> <source>&Unit to show amounts in: </source> <translation>金額顯示單位: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="273"/> + <location filename="../optionsdialog.cpp" line="277"/> <source>Choose the default subdivision unit to show in the interface, and when sending coins</source> <translation>選擇操作界面與付錢時預設顯示的細分單位</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="280"/> + <location filename="../optionsdialog.cpp" line="284"/> <source>&Display addresses in transaction list</source> <translation>&在交易列表中顯示位址</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="281"/> + <location filename="../optionsdialog.cpp" line="285"/> <source>Whether to show Bitcoin addresses in the transaction list</source> <translation type="unfinished">是否要在交易列表中顯示位元幣位址</translation> </message> @@ -721,85 +727,95 @@ Address: %4 <context> <name>MainOptionsPage</name> <message> - <location filename="../optionsdialog.cpp" line="170"/> + <location filename="../optionsdialog.cpp" line="171"/> <source>&Start Bitcoin on window system startup</source> <translation>視窗系統啓動時同時開啓位元幣</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="171"/> + <location filename="../optionsdialog.cpp" line="172"/> <source>Automatically start Bitcoin after the computer is turned on</source> <translation>電腦開啟後自動啟動位元幣</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="180"/> + <location filename="../optionsdialog.cpp" line="176"/> + <source>&Minimize to the tray instead of the taskbar</source> + <translation>最小化至通知區域而非工作列</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="185"/> <source>Map port using &UPnP</source> <translation>用 &UPnP 設定通訊埠對應</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="185"/> + <location filename="../optionsdialog.cpp" line="180"/> <source>M&inimize on close</source> <translation>關閉時最小化</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="181"/> + <location filename="../optionsdialog.cpp" line="186"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>自動在路由器上開啟位元幣的客戶端通訊埠. 只有在你的路由器支援 UPnP 且開啟時才有作用.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="176"/> + <location filename="../optionsdialog.cpp" line="177"/> <source>Show only a tray icon after minimizing the window</source> <translation>最小化視窗後只在通知區域顯示圖示</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="175"/> - <source>&Minimize to the tray instead of the taskbar</source> - <translation>最小化至通知區域而非工作列</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="186"/> + <location filename="../optionsdialog.cpp" line="181"/> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> <translation>當視窗關閉時將其最小化, 而非結束應用程式. 當勾選這個選項時, 應用程式只能用選單中的結束來停止執行.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="190"/> + <location filename="../optionsdialog.cpp" line="189"/> <source>&Connect through SOCKS4 proxy:</source> <translation>透過 SOCKS4 代理伺服器連線:</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="191"/> + <location filename="../optionsdialog.cpp" line="190"/> <source>Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)</source> <translation>透過 SOCKS4 代理伺服器連線至位元幣網路 (比如說透過 Tor)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="196"/> + <location filename="../optionsdialog.cpp" line="195"/> <source>Proxy &IP: </source> <translation>伺服器位址: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="202"/> + <location filename="../optionsdialog.cpp" line="201"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> <translation>代理伺服器的網際網路位址 (比如說 127.0.0.1)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="205"/> + <location filename="../optionsdialog.cpp" line="204"/> <source>&Port: </source> <translation>通訊埠: </translation> </message> <message> - <location filename="../optionsdialog.cpp" line="211"/> + <location filename="../optionsdialog.cpp" line="210"/> <source>Port of the proxy (e.g. 1234)</source> <translation>代理伺服器的通訊埠 (比如說 1234)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="217"/> + <location filename="../optionsdialog.cpp" line="216"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</source> <translation>非必要的交易手續費, 以 kB 為計費單位, 且有助於縮短你的交易處理時間. 大部份交易的資料大小是 1 kB. 建議設定為 0.01 元.</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="223"/> + <location filename="../optionsdialog.cpp" line="222"/> <source>Pay transaction &fee</source> <translation>付交易手續費</translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="232"/> + <source>Detach databases at shutdown</source> + <translation>關閉時卸載資料庫</translation> + </message> + <message> + <location filename="../optionsdialog.cpp" line="233"/> + <source>Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.</source> + <translation>關掉程式時卸載區塊與位址的資料庫. 表示說資料庫會被搬到別的資料目錄去, 且會造成程式關掉的比較慢. 錢包則總是會被卸載.</translation> + </message> </context> <context> <name>MessagePage</name> @@ -824,14 +840,26 @@ Address: %4 <translation>簽署一則訊息來證明你擁有這個位址</translation> </message> <message> + <location filename="../forms/messagepage.ui" line="105"/> + <source>Click "Sign Message" to get signature</source> + <translation>按"簽署訊息"來取得簽章</translation> + </message> + <message> + <location filename="../forms/messagepage.ui" line="120"/> + <source>&Sign Message</source> + <translation>簽署訊息</translation> + </message> + <message> + <location filename="../messagepage.cpp" line="74"/> + <location filename="../messagepage.cpp" line="89"/> <location filename="../messagepage.cpp" line="101"/> - <source>Sign failed</source> - <translation>簽署失敗</translation> + <source>Error signing</source> + <translation>簽署發生錯誤</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="131"/> - <source>Copy the current signature to the system clipboard</source> - <translation>複製目前的簽章到系統剪貼簿</translation> + <location filename="../messagepage.cpp" line="89"/> + <source>Private key for %1 is not available.</source> + <translation>沒有 %1 的密鑰.</translation> </message> <message> <location filename="../forms/messagepage.ui" line="38"/> @@ -859,14 +887,9 @@ Address: %4 <translation>Alt+P</translation> </message> <message> - <location filename="../forms/messagepage.ui" line="105"/> - <source>Click "Sign Message" to get signature</source> - <translation>按"簽署訊息"來取得簽章</translation> - </message> - <message> - <location filename="../forms/messagepage.ui" line="120"/> - <source>&Sign Message</source> - <translation>簽署訊息</translation> + <location filename="../forms/messagepage.ui" line="131"/> + <source>Copy the current signature to the system clipboard</source> + <translation>複製目前的簽章到系統剪貼簿</translation> </message> <message> <location filename="../forms/messagepage.ui" line="134"/> @@ -875,56 +898,44 @@ Address: %4 </message> <message> <location filename="../messagepage.cpp" line="74"/> - <location filename="../messagepage.cpp" line="89"/> - <location filename="../messagepage.cpp" line="101"/> - <source>Error signing</source> - <translation>簽署發生錯誤</translation> - </message> - <message> - <location filename="../messagepage.cpp" line="74"/> <source>%1 is not a valid address.</source> <translation>%1 不是個有效的位址.</translation> </message> <message> - <location filename="../messagepage.cpp" line="89"/> - <source>Private key for %1 is not available.</source> - <translation>沒有 %1 的密鑰.</translation> + <location filename="../messagepage.cpp" line="101"/> + <source>Sign failed</source> + <translation>簽署失敗</translation> </message> </context> <context> <name>OptionsDialog</name> <message> - <location filename="../optionsdialog.cpp" line="79"/> + <location filename="../optionsdialog.cpp" line="80"/> <source>Main</source> <translation>主要</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="104"/> - <source>Options</source> - <translation>選項</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="84"/> + <location filename="../optionsdialog.cpp" line="85"/> <source>Display</source> <translation>顯示</translation> </message> + <message> + <location filename="../optionsdialog.cpp" line="105"/> + <source>Options</source> + <translation>選項</translation> + </message> </context> <context> <name>OverviewPage</name> <message> - <location filename="../overviewpage.cpp" line="108"/> - <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> - <translation>尚未確認之交易的總額, 不包含在目前餘額中</translation> - </message> - <message> - <location filename="../overviewpage.cpp" line="111"/> - <source>Total number of transactions in wallet</source> - <translation>錢包中紀錄的總交易次數</translation> + <location filename="../forms/overviewpage.ui" line="54"/> + <source>Number of transactions:</source> + <translation>交易次數:</translation> </message> <message> - <location filename="../overviewpage.cpp" line="103"/> - <source>Your current balance</source> - <translation>目前餘額</translation> + <location filename="../forms/overviewpage.ui" line="68"/> + <source>Unconfirmed:</source> + <translation>未確認額:</translation> </message> <message> <location filename="../forms/overviewpage.ui" line="14"/> @@ -932,16 +943,6 @@ Address: %4 <translation>表單</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="88"/> - <source>Wallet</source> - <translation>錢包</translation> - </message> - <message> - <location filename="../forms/overviewpage.ui" line="54"/> - <source>Number of transactions:</source> - <translation>交易次數:</translation> - </message> - <message> <location filename="../forms/overviewpage.ui" line="40"/> <source>Balance:</source> <translation>餘額:</translation> @@ -952,15 +953,30 @@ Address: %4 <translation>0</translation> </message> <message> - <location filename="../forms/overviewpage.ui" line="68"/> - <source>Unconfirmed:</source> - <translation>未確認額:</translation> + <location filename="../forms/overviewpage.ui" line="88"/> + <source>Wallet</source> + <translation>錢包</translation> </message> <message> <location filename="../forms/overviewpage.ui" line="124"/> <source><b>Recent transactions</b></source> <translation><b>最近交易</b></translation> </message> + <message> + <location filename="../overviewpage.cpp" line="108"/> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> + <translation>尚未確認之交易的總額, 不包含在目前餘額中</translation> + </message> + <message> + <location filename="../overviewpage.cpp" line="111"/> + <source>Total number of transactions in wallet</source> + <translation>錢包中紀錄的總交易次數</translation> + </message> + <message> + <location filename="../overviewpage.cpp" line="103"/> + <source>Your current balance</source> + <translation>目前餘額</translation> + </message> </context> <context> <name>QRCodeDialog</name> @@ -970,14 +986,19 @@ Address: %4 <translation>訊息:</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="48"/> - <source>Error encoding URI into QR Code.</source> - <translation>將 URI 編碼成 QR 條碼時發生錯誤</translation> + <location filename="../forms/qrcodedialog.ui" line="55"/> + <source>Request Payment</source> + <translation>付款單</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="14"/> - <source>Dialog</source> - <translation>對話視窗</translation> + <location filename="../forms/qrcodedialog.ui" line="70"/> + <source>Amount:</source> + <translation>金額:</translation> + </message> + <message> + <location filename="../qrcodedialog.cpp" line="121"/> + <source>PNG Images (*.png)</source> + <translation>PNG 圖檔 (*.png)</translation> </message> <message> <location filename="../forms/qrcodedialog.ui" line="105"/> @@ -985,14 +1006,14 @@ Address: %4 <translation>BTC</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="186"/> - <source>&Save As...</source> - <translation>儲存為...</translation> + <location filename="../qrcodedialog.cpp" line="64"/> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>造出的網址太長了,請把標籤或訊息的文字縮短再試看看.</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> - <source>Save Image...</source> - <translation>儲存圖片...</translation> + <location filename="../forms/qrcodedialog.ui" line="14"/> + <source>Dialog</source> + <translation>對話視窗</translation> </message> <message> <location filename="../forms/qrcodedialog.ui" line="32"/> @@ -1000,44 +1021,34 @@ Address: %4 <translation>QR 條碼</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="55"/> - <source>Request Payment</source> - <translation>付款單</translation> + <location filename="../forms/qrcodedialog.ui" line="121"/> + <source>Label:</source> + <translation>標記:</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="70"/> - <source>Amount:</source> - <translation>金額:</translation> + <location filename="../forms/qrcodedialog.ui" line="186"/> + <source>&Save As...</source> + <translation>儲存為...</translation> </message> <message> - <location filename="../forms/qrcodedialog.ui" line="121"/> - <source>Label:</source> - <translation>標記:</translation> + <location filename="../qrcodedialog.cpp" line="46"/> + <source>Error encoding URI into QR Code.</source> + <translation>將 URI 編碼成 QR 條碼時發生錯誤</translation> </message> <message> - <location filename="../qrcodedialog.cpp" line="113"/> - <source>PNG Images (*.png)</source> - <translation>PNG 圖檔 (*.png)</translation> + <location filename="../qrcodedialog.cpp" line="121"/> + <source>Save Image...</source> + <translation>儲存圖片...</translation> </message> </context> <context> <name>SendCoinsDialog</name> <message> - <location filename="../forms/sendcoinsdialog.ui" line="84"/> - <source>Remove all transaction fields</source> - <translation>移除所有交易欄位</translation> - </message> - <message> <location filename="../forms/sendcoinsdialog.ui" line="106"/> <source>Balance:</source> <translation>餘額:</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="147"/> - <source>S&end</source> - <translation>付出</translation> - </message> - <message> <location filename="../forms/sendcoinsdialog.ui" line="144"/> <source>Confirm the send action</source> <translation>確認付款動作</translation> @@ -1053,9 +1064,9 @@ Address: %4 <translation>和</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="100"/> - <source>Confirm send coins</source> - <translation>確認付出金額</translation> + <location filename="../sendcoinsdialog.cpp" line="129"/> + <source>The amount to pay must be larger than 0.</source> + <translation>付款金額必須大於 0.</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="101"/> @@ -1063,9 +1074,9 @@ Address: %4 <translation>確定要付出 %1 嗎?</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="124"/> - <source>The recipient address is not valid, please recheck.</source> - <translation>無效的收款位址, 請再檢查看看.</translation> + <location filename="../sendcoinsdialog.cpp" line="155"/> + <source>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.</source> + <translation>錯誤: 交易被拒絕. 有時候會發生這種錯誤, 是因為你錢包中的一些錢已經被花掉了. 比如說你複製了錢包檔 wallet.dat, 然後用複製的錢包花掉了錢, 你現在所用的原來的錢包中卻沒有該筆交易紀錄.</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="134"/> @@ -1073,14 +1084,24 @@ Address: %4 <translation>金額超過了餘額</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="64"/> - <source>Send to multiple recipients at once</source> - <translation>一次付給多個人</translation> + <location filename="../sendcoinsdialog.cpp" line="100"/> + <source>Confirm send coins</source> + <translation>確認付出金額</translation> </message> <message> - <location filename="../forms/sendcoinsdialog.ui" line="113"/> - <source>123.456 BTC</source> - <translation>123.456 BTC</translation> + <location filename="../sendcoinsdialog.cpp" line="139"/> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>包含 %1 的交易手續費後, 總金額超過了你的餘額</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="145"/> + <source>Duplicate address found, can only send to each address once per send operation.</source> + <translation>發現有重複的位址. 在一次付款動作中, 只能付給每個位址一次.</translation> + </message> + <message> + <location filename="../sendcoinsdialog.cpp" line="150"/> + <source>Error: Transaction creation failed.</source> + <translation>錯誤: 交易產生失敗.</translation> </message> <message> <location filename="../forms/sendcoinsdialog.ui" line="14"/> @@ -1095,19 +1116,9 @@ Address: %4 <translation>付錢</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="145"/> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>發現有重複的位址. 在一次付款動作中, 只能付給每個位址一次.</translation> - </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="150"/> - <source>Error: Transaction creation failed.</source> - <translation>錯誤: 交易產生失敗.</translation> - </message> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="67"/> - <source>&Add recipient...</source> - <translation>加收款人...</translation> + <location filename="../forms/sendcoinsdialog.ui" line="84"/> + <source>Remove all transaction fields</source> + <translation>移除所有交易欄位</translation> </message> <message> <location filename="../forms/sendcoinsdialog.ui" line="87"/> @@ -1115,43 +1126,33 @@ Address: %4 <translation>全部清掉</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="129"/> - <source>The amount to pay must be larger than 0.</source> - <translation>付款金額必須大於 0.</translation> - </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="139"/> - <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation>包含 %1 的交易手續費後, 總金額超過了你的餘額</translation> - </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="155"/> - <source>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.</source> - <translation>錯誤: 交易被拒絕. 有時候會發生這種錯誤, 是因為你錢包中的一些錢已經被花掉了. 比如說你複製了錢包檔 wallet.dat, 然後用複製的錢包花掉了錢, 你現在所用的原來的錢包中卻沒有該筆交易紀錄.</translation> + <location filename="../forms/sendcoinsdialog.ui" line="113"/> + <source>123.456 BTC</source> + <translation>123.456 BTC</translation> </message> -</context> -<context> - <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="75"/> - <source>&Label:</source> - <translation>標記:</translation> + <location filename="../forms/sendcoinsdialog.ui" line="147"/> + <source>S&end</source> + <translation>付出</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="93"/> - <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>付款的目標位址 (比如說 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <location filename="../forms/sendcoinsdialog.ui" line="64"/> + <source>Send to multiple recipients at once</source> + <translation>一次付給多個人</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="120"/> - <source>Paste address from clipboard</source> - <translation>從剪貼簿貼上位址</translation> + <location filename="../forms/sendcoinsdialog.ui" line="67"/> + <source>&Add recipient...</source> + <translation>加收款人...</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="130"/> - <source>Alt+P</source> - <translation>Alt+P</translation> + <location filename="../sendcoinsdialog.cpp" line="124"/> + <source>The recipient address is not valid, please recheck.</source> + <translation>無效的收款位址, 請再檢查看看.</translation> </message> +</context> +<context> + <name>SendCoinsEntry</name> <message> <location filename="../forms/sendcoinsentry.ui" line="14"/> <source>Form</source> @@ -1174,9 +1175,14 @@ Address: %4 <translation>給這個位址輸入一個標記, 並加到位址簿中</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="103"/> - <source>Choose address from address book</source> - <translation>從位址簿中選一個位址</translation> + <location filename="../forms/sendcoinsentry.ui" line="75"/> + <source>&Label:</source> + <translation>標記:</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="93"/> + <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> + <translation>付款的目標位址 (比如說 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location filename="../forms/sendcoinsentry.ui" line="113"/> @@ -1184,11 +1190,26 @@ Address: %4 <translation>Alt+A</translation> </message> <message> + <location filename="../forms/sendcoinsentry.ui" line="120"/> + <source>Paste address from clipboard</source> + <translation>從剪貼簿貼上位址</translation> + </message> + <message> + <location filename="../forms/sendcoinsentry.ui" line="130"/> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> <location filename="../forms/sendcoinsentry.ui" line="137"/> <source>Remove this recipient</source> <translation>去掉這個收款人</translation> </message> <message> + <location filename="../forms/sendcoinsentry.ui" line="103"/> + <source>Choose address from address book</source> + <translation>從位址簿中選一個位址</translation> + </message> + <message> <location filename="../sendcoinsentry.cpp" line="25"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>輸入位元幣位址 (比如說 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> @@ -1197,140 +1218,140 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="28"/> - <source>%1/unconfirmed</source> - <translation>%1/未確認</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="52"/> - <source>, has not been successfully broadcast yet</source> - <translation>, 尚未成功公告出去</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="18"/> + <location filename="../transactiondesc.cpp" line="20"/> <source>Open for %1 blocks</source> <translation>在 %1 個區塊內未定</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="20"/> - <source>Open until %1</source> - <translation>在 %1 前未定</translation> + <location filename="../transactiondesc.cpp" line="28"/> + <source>%1/offline?</source> + <translation>%1/離線中?</translation> </message> <message> <location filename="../transactiondesc.cpp" line="30"/> - <source>%1 confirmations</source> - <translation>經確認 %1 次</translation> + <source>%1/unconfirmed</source> + <translation>%1/未確認</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="47"/> + <location filename="../transactiondesc.cpp" line="50"/> <source><b>Status:</b> </source> <translation><b>狀態:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="54"/> + <location filename="../transactiondesc.cpp" line="55"/> + <source>, has not been successfully broadcast yet</source> + <translation>, 尚未成功公告出去</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="57"/> <source>, broadcast through %1 node</source> <translation>, 已公告至 %1 個節點</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="89"/> - <source>unknown</source> - <translation>未知</translation> + <location filename="../transactiondesc.cpp" line="59"/> + <source>, broadcast through %1 nodes</source> + <translation>, 已公告至 %1 個節點</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="63"/> + <source><b>Date:</b> </source> + <translation><b>日期:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="67"/> + <location filename="../transactiondesc.cpp" line="70"/> <source><b>Source:</b> Generated<br></source> <translation><b>來源:</b> 生產所得<br></translation> </message> <message> - <location filename="../transactiondesc.cpp" line="72"/> - <location filename="../transactiondesc.cpp" line="89"/> + <location filename="../transactiondesc.cpp" line="75"/> + <location filename="../transactiondesc.cpp" line="92"/> <source><b>From:</b> </source> <translation><b>來自:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="90"/> - <location filename="../transactiondesc.cpp" line="113"/> - <location filename="../transactiondesc.cpp" line="172"/> + <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="116"/> + <location filename="../transactiondesc.cpp" line="175"/> <source><b>To:</b> </source> <translation><b>目的:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="95"/> - <source> (yours)</source> - <translation> (你的)</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="93"/> + <location filename="../transactiondesc.cpp" line="96"/> <source> (yours, label: </source> <translation> (你的, 標記為: </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="26"/> - <source>%1/offline?</source> - <translation>%1/離線中?</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="56"/> - <source>, broadcast through %1 nodes</source> - <translation>, 已公告至 %1 個節點</translation> - </message> - <message> - <location filename="../transactiondesc.cpp" line="60"/> - <source><b>Date:</b> </source> - <translation><b>日期:</b> </translation> + <location filename="../transactiondesc.cpp" line="98"/> + <source> (yours)</source> + <translation> (你的)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="130"/> - <location filename="../transactiondesc.cpp" line="144"/> - <location filename="../transactiondesc.cpp" line="189"/> - <location filename="../transactiondesc.cpp" line="206"/> + <location filename="../transactiondesc.cpp" line="133"/> + <location filename="../transactiondesc.cpp" line="147"/> + <location filename="../transactiondesc.cpp" line="192"/> + <location filename="../transactiondesc.cpp" line="209"/> <source><b>Credit:</b> </source> <translation><b>入帳:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="132"/> + <location filename="../transactiondesc.cpp" line="135"/> <source>(%1 matures in %2 more blocks)</source> <translation>(%1 將在 %2 個區塊產出後熟成)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="136"/> + <location filename="../transactiondesc.cpp" line="139"/> <source>(not accepted)</source> <translation>(不被接受)</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="180"/> - <location filename="../transactiondesc.cpp" line="188"/> - <location filename="../transactiondesc.cpp" line="203"/> + <location filename="../transactiondesc.cpp" line="183"/> + <location filename="../transactiondesc.cpp" line="191"/> + <location filename="../transactiondesc.cpp" line="206"/> <source><b>Debit:</b> </source> <translation><b>出帳:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="194"/> + <location filename="../transactiondesc.cpp" line="197"/> <source><b>Transaction fee:</b> </source> <translation><b>交易手續費:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="210"/> + <location filename="../transactiondesc.cpp" line="213"/> <source><b>Net amount:</b> </source> <translation><b>淨額:</b> </translation> </message> <message> - <location filename="../transactiondesc.cpp" line="216"/> + <location filename="../transactiondesc.cpp" line="22"/> + <source>Open until %1</source> + <translation>在 %1 前未定</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="32"/> + <source>%1 confirmations</source> + <translation>經確認 %1 次</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="92"/> + <source>unknown</source> + <translation>未知</translation> + </message> + <message> + <location filename="../transactiondesc.cpp" line="219"/> <source>Message:</source> <translation>訊息:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="218"/> + <location filename="../transactiondesc.cpp" line="221"/> <source>Comment:</source> <translation>附註:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="220"/> + <location filename="../transactiondesc.cpp" line="223"/> <source>Transaction ID:</source> <translation>交易識別碼:</translation> </message> <message> - <location filename="../transactiondesc.cpp" line="223"/> + <location filename="../transactiondesc.cpp" line="226"/> <source>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.</source> <translation>生產出來的錢要再等 120 個區塊產出之後, 才能夠花用. 當你產出區塊時, 它會被公布到網路上, 以被串連至區塊鎖鏈. 如果串連失敗了, 它的狀態就會變成"不被接受", 且不能被花用. 當你產出區塊的幾秒鐘內, 其他節點也產出了區塊的話, 有時候就會發生這種情形.</translation> </message> @@ -1338,15 +1359,15 @@ Address: %4 <context> <name>TransactionDescDialog</name> <message> - <location filename="../forms/transactiondescdialog.ui" line="20"/> - <source>This pane shows a detailed description of the transaction</source> - <translation>此版面顯示交易的詳細說明</translation> - </message> - <message> <location filename="../forms/transactiondescdialog.ui" line="14"/> <source>Transaction details</source> <translation>交易明細</translation> </message> + <message> + <location filename="../forms/transactiondescdialog.ui" line="20"/> + <source>This pane shows a detailed description of the transaction</source> + <translation>此版面顯示交易的詳細說明</translation> + </message> </context> <context> <name>TransactionTableModel</name> @@ -1366,28 +1387,6 @@ Address: %4 <translation>位址</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="214"/> - <source>Amount</source> - <translation>金額</translation> - </message> - <message numerus="yes"> - <location filename="../transactiontablemodel.cpp" line="277"/> - <source>Open for %n block(s)</source> - <translation> - <numerusform>在 %n 個區塊內未定</numerusform> - </translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="280"/> - <source>Open until %1</source> - <translation>在 %1 前未定</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="283"/> - <source>Offline (%1 confirmations)</source> - <translation>離線中 (經確認 %1 次)</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="289"/> <source>Confirmed (%1 confirmations)</source> <translation>已確認 (經確認 %1 次)</translation> @@ -1398,11 +1397,6 @@ Address: %4 <translation>沒有其他節點收到這個區塊, 也許它不被接受!</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="306"/> - <source>Generated but not accepted</source> - <translation>產出但不被接受</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="349"/> <source>Received with</source> <translation>收受於</translation> @@ -1423,26 +1417,11 @@ Address: %4 <translation>付給自己</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="358"/> - <source>Mined</source> - <translation>開採所得</translation> - </message> - <message> - <location filename="../transactiontablemodel.cpp" line="396"/> - <source>(n/a)</source> - <translation>(不適用)</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="595"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>交易狀態. 移動游標至欄位上方來顯示確認次數.</translation> </message> <message> - <location filename="../transactiontablemodel.cpp" line="597"/> - <source>Date and time that the transaction was received.</source> - <translation>收到交易的日期與時間.</translation> - </message> - <message> <location filename="../transactiontablemodel.cpp" line="599"/> <source>Type of transaction.</source> <translation>交易的種類.</translation> @@ -1458,6 +1437,28 @@ Address: %4 <translation>減去或加入至餘額的金額</translation> </message> <message> + <location filename="../transactiontablemodel.cpp" line="214"/> + <source>Amount</source> + <translation>金額</translation> + </message> + <message numerus="yes"> + <location filename="../transactiontablemodel.cpp" line="277"/> + <source>Open for %n block(s)</source> + <translation> + <numerusform>在 %n 個區塊內未定</numerusform> + </translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="280"/> + <source>Open until %1</source> + <translation>在 %1 前未定</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="283"/> + <source>Offline (%1 confirmations)</source> + <translation>離線中 (經確認 %1 次)</translation> + </message> + <message> <location filename="../transactiontablemodel.cpp" line="286"/> <source>Unconfirmed (%1 of %2 confirmations)</source> <translation>未確認 (經確認 %1 次, 應確認 %2 次)</translation> @@ -1469,18 +1470,63 @@ Address: %4 <numerusform>生產金額將在 %n 個區塊產出後可用</numerusform> </translation> </message> + <message> + <location filename="../transactiontablemodel.cpp" line="306"/> + <source>Generated but not accepted</source> + <translation>產出但不被接受</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="358"/> + <source>Mined</source> + <translation>開採所得</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="396"/> + <source>(n/a)</source> + <translation>(不適用)</translation> + </message> + <message> + <location filename="../transactiontablemodel.cpp" line="597"/> + <source>Date and time that the transaction was received.</source> + <translation>收到交易的日期與時間.</translation> + </message> </context> <context> <name>TransactionView</name> <message> + <location filename="../transactionview.cpp" line="127"/> + <source>Edit label</source> + <translation>編輯標記</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="270"/> + <source>Export Transaction Data</source> + <translation>匯出交易資料</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="271"/> + <source>Comma separated file (*.csv)</source> + <translation>逗號分隔資料檔 (*.csv)</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="279"/> + <source>Confirmed</source> + <translation>已確認</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="280"/> + <source>Date</source> + <translation>日期</translation> + </message> + <message> <location filename="../transactionview.cpp" line="284"/> <source>Amount</source> <translation>金額</translation> </message> <message> - <location filename="../transactionview.cpp" line="289"/> - <source>Error exporting</source> - <translation>匯出錯誤</translation> + <location filename="../transactionview.cpp" line="285"/> + <source>ID</source> + <translation>識別碼</translation> </message> <message> <location filename="../transactionview.cpp" line="289"/> @@ -1488,27 +1534,11 @@ Address: %4 <translation>無法寫入至 %1 檔案.</translation> </message> <message> - <location filename="../transactionview.cpp" line="384"/> - <source>Range:</source> - <translation>範圍:</translation> - </message> - <message> <location filename="../transactionview.cpp" line="392"/> <source>to</source> <translation>至</translation> </message> <message> - <location filename="../transactionview.cpp" line="125"/> - <source>Copy label</source> - <translation>複製標記</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="55"/> - <location filename="../transactionview.cpp" line="71"/> - <source>All</source> - <translation>全部</translation> - </message> - <message> <location filename="../transactionview.cpp" line="56"/> <source>Today</source> <translation>今天</translation> @@ -1519,6 +1549,16 @@ Address: %4 <translation>這週</translation> </message> <message> + <location filename="../transactionview.cpp" line="61"/> + <source>Range...</source> + <translation>指定範圍...</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="77"/> + <source>Mined</source> + <translation>開採所得</translation> + </message> + <message> <location filename="../transactionview.cpp" line="58"/> <source>This month</source> <translation>這個月</translation> @@ -1529,29 +1569,9 @@ Address: %4 <translation>複製位址</translation> </message> <message> - <location filename="../transactionview.cpp" line="59"/> - <source>Last month</source> - <translation>上個月</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="126"/> - <source>Copy amount</source> - <translation>複製金額</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="61"/> - <source>Range...</source> - <translation>指定範圍...</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="127"/> - <source>Edit label</source> - <translation>編輯標記</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="74"/> - <source>Sent to</source> - <translation>付出至</translation> + <location filename="../transactionview.cpp" line="125"/> + <source>Copy label</source> + <translation>複製標記</translation> </message> <message> <location filename="../transactionview.cpp" line="76"/> @@ -1559,19 +1579,14 @@ Address: %4 <translation>給自己</translation> </message> <message> - <location filename="../transactionview.cpp" line="270"/> - <source>Export Transaction Data</source> - <translation>匯出交易資料</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="78"/> - <source>Other</source> - <translation>其他</translation> + <location filename="../transactionview.cpp" line="126"/> + <source>Copy amount</source> + <translation>複製金額</translation> </message> <message> - <location filename="../transactionview.cpp" line="271"/> - <source>Comma separated file (*.csv)</source> - <translation>逗號分隔資料檔 (*.csv)</translation> + <location filename="../transactionview.cpp" line="84"/> + <source>Enter address or label to search</source> + <translation>輸入位址或標記來搜尋</translation> </message> <message> <location filename="../transactionview.cpp" line="90"/> @@ -1579,34 +1594,20 @@ Address: %4 <translation>最小金額</translation> </message> <message> - <location filename="../transactionview.cpp" line="279"/> - <source>Confirmed</source> - <translation>已確認</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="280"/> - <source>Date</source> - <translation>日期</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="282"/> - <source>Label</source> - <translation>標記</translation> - </message> - <message> - <location filename="../transactionview.cpp" line="283"/> - <source>Address</source> - <translation>位址</translation> + <location filename="../transactionview.cpp" line="281"/> + <source>Type</source> + <translation>種類</translation> </message> <message> - <location filename="../transactionview.cpp" line="285"/> - <source>ID</source> - <translation>識別碼</translation> + <location filename="../transactionview.cpp" line="55"/> + <location filename="../transactionview.cpp" line="71"/> + <source>All</source> + <translation>全部</translation> </message> <message> - <location filename="../transactionview.cpp" line="281"/> - <source>Type</source> - <translation>種類</translation> + <location filename="../transactionview.cpp" line="59"/> + <source>Last month</source> + <translation>上個月</translation> </message> <message> <location filename="../transactionview.cpp" line="60"/> @@ -1619,25 +1620,45 @@ Address: %4 <translation>收受於</translation> </message> <message> - <location filename="../transactionview.cpp" line="77"/> - <source>Mined</source> - <translation>開採所得</translation> + <location filename="../transactionview.cpp" line="74"/> + <source>Sent to</source> + <translation>付出至</translation> </message> <message> - <location filename="../transactionview.cpp" line="84"/> - <source>Enter address or label to search</source> - <translation>輸入位址或標記來搜尋</translation> + <location filename="../transactionview.cpp" line="78"/> + <source>Other</source> + <translation>其他</translation> </message> <message> <location filename="../transactionview.cpp" line="128"/> <source>Show details...</source> <translation>顯示明細...</translation> </message> + <message> + <location filename="../transactionview.cpp" line="283"/> + <source>Address</source> + <translation>位址</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="282"/> + <source>Label</source> + <translation>標記</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="289"/> + <source>Error exporting</source> + <translation>匯出錯誤</translation> + </message> + <message> + <location filename="../transactionview.cpp" line="384"/> + <source>Range:</source> + <translation>範圍:</translation> + </message> </context> <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="145"/> + <location filename="../walletmodel.cpp" line="142"/> <source>Sending...</source> <translation>付出中...</translation> </message> @@ -1645,193 +1666,195 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="75"/> - <source>Loading addresses...</source> - <translation>載入位址中...</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="8"/> - <source>Bitcoin version</source> - <translation>位元幣版本</translation> + <location filename="../bitcoinstrings.cpp" line="126"/> + <source>Done loading</source> + <translation>載入完成</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="77"/> - <source>Loading block index...</source> - <translation>載入區塊索引中...</translation> + <location filename="../bitcoinstrings.cpp" line="118"/> + <source>Error loading wallet.dat: Wallet corrupted</source> + <translation>載入檔案 wallet.dat 失敗: 錢包壞掉了</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="87"/> - <source>Rescanning...</source> - <translation>重新掃描中...</translation> + <location filename="../bitcoinstrings.cpp" line="122"/> + <source>Cannot downgrade wallet</source> + <translation>無法將錢包格式降級</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="81"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation>載入檔案 wallet.dat 失敗: 此錢包需要新版的 Bitcoin</translation> + <location filename="../bitcoinstrings.cpp" line="123"/> + <source>Cannot initialize keypool</source> + <translation>無法將密鑰池初始化</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="11"/> + <location filename="../bitcoinstrings.cpp" line="44"/> <source>List commands</source> <translation>列出指令 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="26"/> + <location filename="../bitcoinstrings.cpp" line="45"/> + <source>Get help for a command</source> + <translation>取得指令說明 +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="117"/> + <source>Loading wallet...</source> + <translation>載入錢包中...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="46"/> + <source>Options:</source> + <translation>選項: +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="60"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>維持與節點連線數的上限為 <n> 個 (預設: 125)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="27"/> + <location filename="../bitcoinstrings.cpp" line="56"/> + <source>Specify connection timeout (in milliseconds)</source> + <translation>指定連線逾時時間 (毫秒) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="61"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>加入一個要連線的節線, 並試著保持對它的連線暢通</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="34"/> + <location filename="../bitcoinstrings.cpp" line="68"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>避免與亂搞的節點連線的秒數 (預設: 86400)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="33"/> - <source>Threshold for disconnecting misbehaving peers (default: 100)</source> - <translation>與亂搞的節點斷線的臨界值 (預設: 100)</translation> + <location filename="../bitcoinstrings.cpp" line="53"/> + <source>Specify data directory</source> + <translation>指定資料目錄 +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="42"/> + <location filename="../bitcoinstrings.cpp" line="54"/> + <source>Set database cache size in megabytes (default: 25)</source> + <translation>設定資料庫快取大小為多少百萬位元組(MB, 預設: 25)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="78"/> <source>Accept command line and JSON-RPC commands</source> <translation>接受命令列與 JSON-RPC 指令 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="41"/> - <source>Fee per KB to add to transactions you send</source> - <translation>交易付款時每 KB 的交易手續費</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="43"/> + <location filename="../bitcoinstrings.cpp" line="79"/> <source>Run in the background as a daemon and accept commands</source> <translation>以背景程式執行並接受指令</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="47"/> + <location filename="../bitcoinstrings.cpp" line="83"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>輸出追蹤或除錯資訊至終端機, 而非 debug.log 檔案</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="50"/> - <source>Password for JSON-RPC connections</source> - <translation>JSON-RPC 連線密碼</translation> + <location filename="../bitcoinstrings.cpp" line="82"/> + <source>Prepend debug output with timestamp</source> + <translation>在除錯輸出內容前附加時間</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="48"/> + <location filename="../bitcoinstrings.cpp" line="84"/> <source>Send trace/debug info to debugger</source> <translation>輸出追蹤或除錯資訊給除錯器</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="52"/> - <source>Allow JSON-RPC connections from specified IP address</source> - <translation>只允許從指定網路位址來的 JSON-RPC 連線</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="91"/> - <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> - <translation>警告: -paytxfee 設定得很高. 這是當你交易付款時所要支付的手續費.</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="53"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>送指令給在 <ip> 的節點 (預設: 127.0.0.1) -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="95"/> - <source>Warning: Disk space is low</source> - <translation>警告: 磁碟空間很少</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="54"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>當最新區塊改變時所要執行的指令 (指令中的 %s 會被取代為區塊的雜湊值)</translation> + <location filename="../bitcoinstrings.cpp" line="86"/> + <source>Password for JSON-RPC connections</source> + <translation>JSON-RPC 連線密碼</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="57"/> + <location filename="../bitcoinstrings.cpp" line="93"/> <source>Upgrade wallet to latest format</source> <translation>將錢包升級成最新的格式</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="59"/> + <location filename="../bitcoinstrings.cpp" line="95"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>重新掃描區塊鎖鏈, 以尋找錢包所遺漏的交易.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="10"/> - <source>Send command to -server or bitcoind</source> - <translation>送指令至 -server 或 bitcoind + <location filename="../bitcoinstrings.cpp" line="94"/> + <source>Set key pool size to <n> (default: 100)</source> + <translation>設定密鑰池大小為 <n> (預設: 100) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="60"/> + <location filename="../bitcoinstrings.cpp" line="96"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation>啓動時檢查多少區塊 (預設: 2500, 0 表示全部)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="61"/> + <location filename="../bitcoinstrings.cpp" line="97"/> <source>How thorough the block verification is (0-6, default: 1)</source> <translation>區塊檢查的仔細程度 (0 至 6, 預設: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="44"/> - <source>Use the test network</source> - <translation>使用測試網路 -</translation> + <location filename="../bitcoinstrings.cpp" line="85"/> + <source>Username for JSON-RPC connections</source> + <translation>JSON-RPC 連線使用者名稱</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="46"/> - <source>Prepend debug output with timestamp</source> - <translation>在除錯輸出內容前附加時間</translation> + <location filename="../bitcoinstrings.cpp" line="87"/> + <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> + <translation>在通訊埠 <port> 聽候 JSON-RPC 連線 (預設: 8332)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="58"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation>設定密鑰池大小為 <n> (預設: 100) + <location filename="../bitcoinstrings.cpp" line="104"/> + <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> + <translation>可以接受的加密法 (預設: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> - <source>Find peers using DNS lookup (default: 1)</source> - <translation>是否允許在找節點時使用域名查詢 (預設: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="48"/> + <source>Specify pid file (default: bitcoind.pid)</source> + <translation>指定行程識別碼檔案 (預設: bitcoind.pid) +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="30"/> - <source>Accept connections from outside (default: 1)</source> - <translation type="unfinished">是否接受外來連線 (預設: 1)</translation> + <location filename="../bitcoinstrings.cpp" line="101"/> + <source>Use OpenSSL (https) for JSON-RPC connections</source> + <translation>使用 OpenSSL (https) 於JSON-RPC 連線 +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="31"/> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>設定語言, 比如說 "de_DE" (預設: 系統語系)</translation> + <location filename="../bitcoinstrings.cpp" line="102"/> + <source>Server certificate file (default: server.cert)</source> + <translation>伺服器憑證檔 (預設: server.cert) +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="37"/> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> - <translation>每個連線的接收緩衝區大小上限為 <n>*1000 位元組 (預設: 10000)</translation> + <location filename="../bitcoinstrings.cpp" line="103"/> + <source>Server private key (default: server.pem)</source> + <translation>伺服器密鑰檔 (預設: server.pem) +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="38"/> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> - <translation>每個連線的傳送緩衝區大小上限為 <n>*1000 位元組 (預設: 10000)</translation> + <location filename="../bitcoinstrings.cpp" line="71"/> + <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 10000)</source> + <translation>每個連線的接收緩衝區大小上限為 <n>*1000 位元組 (預設: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="40"/> - <source>Use Universal Plug and Play to map the listening port (default: 0)</source> - <translation type="unfinished">是否使用通用即插即用(UPnP)協定來設定聽候連線的通訊埠 (預設: 0)</translation> + <location filename="../bitcoinstrings.cpp" line="107"/> + <source>This help message</source> + <translation>此協助訊息 +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="45"/> - <source>Output extra debugging information</source> - <translation>輸出額外的除錯資訊</translation> + <location filename="../bitcoinstrings.cpp" line="72"/> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> + <translation>每個連線的傳送緩衝區大小上限為 <n>*1000 位元組 (預設: 10000)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="62"/> + <location filename="../bitcoinstrings.cpp" line="98"/> <source> SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation> @@ -1839,231 +1862,322 @@ SSL 選項: (SSL 設定程序請見 Bitcoin Wiki) </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="9"/> - <source>Usage:</source> - <translation>用法:</translation> + <location filename="../bitcoinstrings.cpp" line="13"/> + <source>Sending...</source> + <translation>付出中...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="89"/> - <source>Invalid -proxy address</source> - <translation>無效的 -proxy 位址</translation> + <location filename="../bitcoinstrings.cpp" line="18"/> + <source>Invalid amount</source> + <translation>無效的金額</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="90"/> - <source>Invalid amount for -paytxfee=<amount></source> - <translation>-paytxfee=<金額> 中的金額無效</translation> + <location filename="../bitcoinstrings.cpp" line="19"/> + <source>Insufficient funds</source> + <translation>累積金額不足</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="79"/> - <source>Loading wallet...</source> - <translation>載入錢包中...</translation> + <location filename="../bitcoinstrings.cpp" line="22"/> + <source>%s, you must set a rpcpassword in the configuration file: + %s +It is recommended you use the following random password: +rpcuser=bitcoinrpc +rpcpassword=%s +(you do not need to remember this password) +If the file does not exist, create it with owner-readable-only file permissions. +</source> + <translation>%s, 你必須在下列設定檔中設定 RPC 密碼(rpcpassword): +%s +建議你使用下列的隨機產生密碼: +rpcuser=bitcoinrpc +rpcpassword=%s +(你不用記住這個密碼) +如果這個檔案還不存在, 請在新增時, 設定檔案權限為"只有主人才能讀取". +</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="88"/> - <source>Done loading</source> - <translation>載入完成</translation> + <location filename="../bitcoinstrings.cpp" line="21"/> + <source>To use the %s option</source> + <translation>為了要使用 %s 選項</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="94"/> - <source>Error: CreateThread(StartNode) failed</source> - <translation>錯誤: CreateThread(StartNode) 失敗</translation> + <location filename="../bitcoinstrings.cpp" line="31"/> + <source>Error</source> + <translation>錯誤</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="96"/> - <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> - <translation>無法與這台電腦上的通訊埠 %d 連結. 也許 Bitcoin 已經在執行了.</translation> + <location filename="../bitcoinstrings.cpp" line="33"/> + <source>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</source> + <translation>你必須在下列設定檔中設定 RPC 密碼(rpcpassword=<password>): +%s +如果這個檔案還不存在, 請在新增時, 設定檔案權限為"只有主人才能讀取".</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="102"/> - <source>beta</source> - <translation>公測版</translation> + <location filename="../bitcoinstrings.cpp" line="41"/> + <source>Bitcoin version</source> + <translation>位元幣版本</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="86"/> + <location filename="../bitcoinstrings.cpp" line="20"/> + <source>Warning: Disk space is low</source> + <translation>警告: 磁碟空間很少</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="47"/> + <source>Specify configuration file (default: bitcoin.conf)</source> + <translation>指定設定檔 (預設: bitcoin.conf) +</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="67"/> + <source>Threshold for disconnecting misbehaving peers (default: 100)</source> + <translation>與亂搞的節點斷線的臨界值 (預設: 100)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="42"/> + <source>Usage:</source> + <translation>用法:</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="120"/> + <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> + <translation>錢包需要重寫: 請重啟位元幣來完成</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="121"/> + <source>Error loading wallet.dat</source> + <translation>載入檔案 wallet.dat 失敗</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="124"/> <source>Cannot write default address</source> <translation>無法寫入預設位址</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="99"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> - <translation>警告: 請檢查電腦時間日期是否正確. 位元幣無法在時鐘不準的情況下正常運作.</translation> + <location filename="../bitcoinstrings.cpp" line="125"/> + <source>Rescanning...</source> + <translation>重新掃描中...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="76"/> - <source>Error loading addr.dat</source> - <translation>載入 addr.dat 失敗</translation> + <location filename="../bitcoinstrings.cpp" line="132"/> + <source>Error: CreateThread(StartNode) failed</source> + <translation>錯誤: CreateThread(StartNode) 失敗</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="72"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <location filename="../bitcoinstrings.cpp" line="133"/> + <source>Unable to bind to port %d on this computer. Bitcoin is probably already running.</source> + <translation>無法與這台電腦上的通訊埠 %d 連結. 也許 Bitcoin 已經在執行了.</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="55"/> + <source>Set database disk log size in megabytes (default: 100)</source> + <translation>設定資料庫的磁碟紀錄大小為多少百萬位元組(MB, 預設: 100)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="109"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation>無法鎖定資料目錄 %s. 也許位元幣已經在執行了.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="78"/> - <source>Error loading blkindex.dat</source> - <translation>載入 blkindex.dat 失敗</translation> + <location filename="../bitcoinstrings.cpp" line="115"/> + <source>Loading block index...</source> + <translation>載入區塊索引中...</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="80"/> - <source>Error loading wallet.dat: Wallet corrupted</source> - <translation>載入檔案 wallet.dat 失敗: 錢包壞掉了</translation> + <location filename="../bitcoinstrings.cpp" line="75"/> + <source>Detach block and address databases. Increases shutdown time (default: 0)</source> + <translation>卸載區塊與位址的資料庫. 會延長關閉時間 (預設: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="82"/> - <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation>錢包需要重寫: 請重啟位元幣來完成</translation> + <location filename="../bitcoinstrings.cpp" line="127"/> + <source>Invalid -proxy address</source> + <translation>無效的 -proxy 位址</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="83"/> - <source>Error loading wallet.dat</source> - <translation>載入檔案 wallet.dat 失敗</translation> + <location filename="../bitcoinstrings.cpp" line="128"/> + <source>Invalid amount for -paytxfee=<amount></source> + <translation>-paytxfee=<金額> 中的金額無效</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="84"/> - <source>Cannot downgrade wallet</source> - <translation>無法將錢包格式降級</translation> + <location filename="../bitcoinstrings.cpp" line="116"/> + <source>Error loading blkindex.dat</source> + <translation>載入 blkindex.dat 失敗</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="85"/> - <source>Cannot initialize keypool</source> - <translation>無法將密鑰池初始化</translation> + <location filename="../bitcoinstrings.cpp" line="38"/> + <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> + <translation>警告: 請檢查電腦時間日期是否正確. 位元幣無法在時鐘不準的情況下正常運作.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="12"/> - <source>Get help for a command</source> - <translation>取得指令說明 -</translation> + <location filename="../bitcoinstrings.cpp" line="112"/> + <source>Bitcoin</source> + <translation>位元幣</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="13"/> - <source>Options:</source> - <translation>選項: -</translation> + <location filename="../bitcoinstrings.cpp" line="119"/> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> + <translation>載入檔案 wallet.dat 失敗: 此錢包需要新版的 Bitcoin</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="14"/> - <source>Specify configuration file (default: bitcoin.conf)</source> - <translation>指定設定檔 (預設: bitcoin.conf) -</translation> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation>設定聽候 RPC 連線的通訊埠 %u 時發生錯誤: %s</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="15"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>指定行程識別碼檔案 (預設: bitcoind.pid) + <location filename="../bitcoinstrings.cpp" line="43"/> + <source>Send command to -server or bitcoind</source> + <translation>送指令至 -server 或 bitcoind </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="16"/> + <location filename="../bitcoinstrings.cpp" line="49"/> <source>Generate coins</source> <translation>生產位元幣 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="17"/> + <location filename="../bitcoinstrings.cpp" line="50"/> <source>Don't generate coins</source> <translation>不生產位元幣 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="18"/> + <location filename="../bitcoinstrings.cpp" line="51"/> <source>Start minimized</source> <translation>啓動時最小化 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="68"/> - <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation>可以接受的加密法 (預設: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH) -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="19"/> + <location filename="../bitcoinstrings.cpp" line="52"/> <source>Show splash screen on startup (default: 1)</source> <translation>顯示啓動畫面 (預設: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="20"/> - <source>Specify data directory</source> - <translation>指定資料目錄 -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="21"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>設定資料庫快取大小為多少百萬位元組(MB, 預設: 25)</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="22"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>指定連線逾時時間 (毫秒) -</translation> - </message> - <message> - <location filename="../bitcoinstrings.cpp" line="23"/> + <location filename="../bitcoinstrings.cpp" line="57"/> <source>Connect through socks4 proxy</source> <translation>透過 socks4 代理伺服器連線 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="24"/> + <location filename="../bitcoinstrings.cpp" line="58"/> <source>Allow DNS lookups for addnode and connect</source> <translation>允許 addnode 和 connect 時做域名解析 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="25"/> + <location filename="../bitcoinstrings.cpp" line="59"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>在通訊埠 <port> 聽候連線 (預設: 8333, 或若為測試網路: 18333)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="28"/> + <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation>只連線至指定節點 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="29"/> + <location filename="../bitcoinstrings.cpp" line="63"/> <source>Find peers using internet relay chat (default: 0)</source> <translation>是否使用網際網路中繼聊天(IRC)來找節點 (預設: 0)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="39"/> + <location filename="../bitcoinstrings.cpp" line="64"/> + <source>Accept connections from outside (default: 1)</source> + <translation type="unfinished">是否接受外來連線 (預設: 1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="65"/> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>設定語言, 比如說 "de_DE" (預設: 系統語系)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="66"/> + <source>Find peers using DNS lookup (default: 1)</source> + <translation>是否允許在找節點時使用域名查詢 (預設: 1)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="90"/> + <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> + <translation>當最新區塊改變時所要執行的指令 (指令中的 %s 會被取代為區塊的雜湊值)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="73"/> <source>Use Universal Plug and Play to map the listening port (default: 1)</source> <translation type="unfinished">是否使用通用即插即用(UPnP)協定來設定聽候連線的通訊埠 (預設: 1)</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="49"/> - <source>Username for JSON-RPC connections</source> - <translation>JSON-RPC 連線使用者名稱</translation> + <location filename="../bitcoinstrings.cpp" line="8"/> + <source>Error: Wallet locked, unable to create transaction.</source> + <translation>錯誤: 錢包被上鎖了, 無法產生新的交易 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="51"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation>在通訊埠 <port> 聽候 JSON-RPC 連線 (預設: 8332)</translation> + <location filename="../bitcoinstrings.cpp" line="9"/> + <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds.</source> + <translation>錯誤: 這筆交易需要至少 %s 的手續費, 因為它的金額太大, 或複雜度太高, 或是使用了最近才剛收到的款項 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="65"/> - <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>使用 OpenSSL (https) 於JSON-RPC 連線 -</translation> + <location filename="../bitcoinstrings.cpp" line="12"/> + <source>Error: Transaction creation failed.</source> + <translation>錯誤: 交易產生失敗.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="66"/> - <source>Server certificate file (default: server.cert)</source> - <translation>伺服器憑證檔 (預設: server.cert) -</translation> + <location filename="../bitcoinstrings.cpp" line="14"/> + <source>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.</source> + <translation>錯誤: 交易被拒絕. 有時候會發生這種錯誤, 是因為你錢包中的一些錢已經被花掉了. 比如說你複製了錢包檔 wallet.dat, 然後用複製的錢包花掉了錢, 你現在所用的原來的錢包中卻沒有該筆交易紀錄.</translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="67"/> - <source>Server private key (default: server.pem)</source> - <translation>伺服器密鑰檔 (預設: server.pem) + <location filename="../bitcoinstrings.cpp" line="74"/> + <source>Use Universal Plug and Play to map the listening port (default: 0)</source> + <translation type="unfinished">是否使用通用即插即用(UPnP)協定來設定聽候連線的通訊埠 (預設: 0)</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="77"/> + <source>Fee per KB to add to transactions you send</source> + <translation>交易付款時每 KB 的交易手續費</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="80"/> + <source>Use the test network</source> + <translation>使用測試網路 </translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="71"/> - <source>This help message</source> - <translation>此協助訊息 + <location filename="../bitcoinstrings.cpp" line="81"/> + <source>Output extra debugging information</source> + <translation>輸出額外的除錯資訊</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="88"/> + <source>Allow JSON-RPC connections from specified IP address</source> + <translation>只允許從指定網路位址來的 JSON-RPC 連線</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="89"/> + <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> + <translation>送指令給在 <ip> 的節點 (預設: 127.0.0.1) </translation> </message> + <message> + <location filename="../bitcoinstrings.cpp" line="113"/> + <source>Loading addresses...</source> + <translation>載入位址中...</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="108"/> + <source>Usage</source> + <translation>用法</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="114"/> + <source>Error loading addr.dat</source> + <translation>載入 addr.dat 失敗</translation> + </message> + <message> + <location filename="../bitcoinstrings.cpp" line="129"/> + <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> + <translation>警告: -paytxfee 設定得很高. 這是當你交易付款時所要支付的手續費.</translation> + </message> </context> </TS> diff --git a/src/qt/messagepage.cpp b/src/qt/messagepage.cpp index 46a0cbae24..18bb64fe6c 100644 --- a/src/qt/messagepage.cpp +++ b/src/qt/messagepage.cpp @@ -91,7 +91,7 @@ void MessagePage::on_signMessage_clicked() return; } - CDataStream ss(SER_GETHASH); + CDataStream ss(SER_GETHASH, 0); ss << strMessageMagic; ss << ui->message->document()->toPlainText().toStdString(); diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 6018419fbc..8a25a16e24 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -38,6 +38,7 @@ private: QCheckBox *minimize_on_close; #endif QCheckBox *connect_socks4; + QCheckBox *detach_database; QLineEdit *proxy_ip; QLineEdit *proxy_port; BitcoinAmountField *fee_edit; @@ -175,18 +176,16 @@ MainOptionsPage::MainOptionsPage(QWidget *parent): minimize_to_tray = new QCheckBox(tr("&Minimize to the tray instead of the taskbar")); minimize_to_tray->setToolTip(tr("Show only a tray icon after minimizing the window")); layout->addWidget(minimize_to_tray); -#endif - - map_port_upnp = new QCheckBox(tr("Map port using &UPnP")); - map_port_upnp->setToolTip(tr("Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.")); - layout->addWidget(map_port_upnp); -#ifndef Q_WS_MAC minimize_on_close = new QCheckBox(tr("M&inimize on close")); minimize_on_close->setToolTip(tr("Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.")); layout->addWidget(minimize_on_close); #endif + map_port_upnp = new QCheckBox(tr("Map port using &UPnP")); + map_port_upnp->setToolTip(tr("Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.")); + layout->addWidget(map_port_upnp); + connect_socks4 = new QCheckBox(tr("&Connect through SOCKS4 proxy:")); connect_socks4->setToolTip(tr("Connect to the Bitcoin network through a SOCKS4 proxy (e.g. when connecting through Tor)")); layout->addWidget(connect_socks4); @@ -230,6 +229,10 @@ MainOptionsPage::MainOptionsPage(QWidget *parent): layout->addLayout(fee_hbox); + detach_database = new QCheckBox(tr("Detach databases at shutdown")); + detach_database->setToolTip(tr("Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached.")); + layout->addWidget(detach_database); + layout->addStretch(1); // Extra space at bottom setLayout(layout); @@ -257,6 +260,7 @@ void MainOptionsPage::setMapper(MonitoredDataMapper *mapper) mapper->addMapping(proxy_ip, OptionsModel::ProxyIP); mapper->addMapping(proxy_port, OptionsModel::ProxyPort); mapper->addMapping(fee_edit, OptionsModel::Fee); + mapper->addMapping(detach_database, OptionsModel::DetachDatabases); } DisplayOptionsPage::DisplayOptionsPage(QWidget *parent): diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 23c4838407..9297e2b15a 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -2,8 +2,8 @@ #include "bitcoinunits.h" #include <QSettings> -#include "headers.h" #include "init.h" +#include "walletdb.h" OptionsModel::OptionsModel(QObject *parent) : QAbstractListModel(parent) @@ -28,6 +28,8 @@ void OptionsModel::Init() SoftSetBoolArg("-upnp", settings.value("fUseUPnP").toBool()); if (settings.contains("addrProxy") && settings.value("fUseProxy").toBool()) SoftSetArg("-proxy", settings.value("addrProxy").toString().toStdString()); + if (settings.contains("detachDB")) + SoftSetBoolArg("-detachdb", settings.value("detachDB").toBool()); } bool OptionsModel::Upgrade() @@ -121,6 +123,8 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const return QVariant(nDisplayUnit); case DisplayAddresses: return QVariant(bDisplayAddresses); + case DetachDatabases: + return QVariant(fDetachDB); default: return QVariant(); } @@ -204,6 +208,11 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in settings.setValue("bDisplayAddresses", bDisplayAddresses); } break; + case DetachDatabases: { + fDetachDB = value.toBool(); + settings.setValue("detachDB", fDetachDB); + } + break; default: break; } diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h index 70220993ba..e5b3b31aa5 100644 --- a/src/qt/optionsmodel.h +++ b/src/qt/optionsmodel.h @@ -26,7 +26,8 @@ public: Fee, // qint64 DisplayUnit, // BitcoinUnits::Unit DisplayAddresses, // bool - OptionIDRowCount + DetachDatabases, // bool + OptionIDRowCount, }; void Init(); diff --git a/src/qt/qrcodedialog.cpp b/src/qt/qrcodedialog.cpp index 567cfa75f1..2a428fb79e 100644 --- a/src/qt/qrcodedialog.cpp +++ b/src/qt/qrcodedialog.cpp @@ -8,21 +8,19 @@ #include <qrencode.h> -#define EXPORT_IMAGE_SIZE 256 +#define EXPORT_IMAGE_SIZE 256 -QRCodeDialog::QRCodeDialog(const QString &title, const QString &addr, const QString &label, bool enableReq, QWidget *parent) : - QDialog(parent), - ui(new Ui::QRCodeDialog), - address(addr) +QRCodeDialog::QRCodeDialog(const QString &addr, const QString &label, bool enableReq, QWidget *parent) : + QDialog(parent), ui(new Ui::QRCodeDialog), address(addr) { ui->setupUi(this); - setWindowTitle(title); + setWindowTitle(QString("%1").arg(address)); setAttribute(Qt::WA_DeleteOnClose); - ui->chkReq->setVisible(enableReq); + ui->chkReqPayment->setVisible(enableReq); ui->lnReqAmount->setVisible(enableReq); - ui->lblAm1->setVisible(enableReq); - ui->lblAm2->setVisible(enableReq); + ui->lblAmount->setVisible(enableReq); + ui->lblBTC->setVisible(enableReq); ui->lnLabel->setText(label); @@ -37,8 +35,8 @@ QRCodeDialog::~QRCodeDialog() void QRCodeDialog::genCode() { QString uri = getURI(); - //qDebug() << "Encoding:" << uri.toUtf8().constData(); + if (uri != "") { ui->lblQRCode->setText(""); @@ -62,6 +60,8 @@ void QRCodeDialog::genCode() QRcode_free(code); ui->lblQRCode->setPixmap(QPixmap::fromImage(myImage).scaled(300, 300)); } + else + ui->lblQRCode->setText(tr("Resulting URI too long, try to reduce the text for label / message.")); } QString QRCodeDialog::getURI() @@ -69,41 +69,49 @@ QString QRCodeDialog::getURI() QString ret = QString("bitcoin:%1").arg(address); int paramCount = 0; - if(ui->chkReq->isChecked() && ui->lnReqAmount->text().isEmpty() == false) { - bool ok= false; - double amount = ui->lnReqAmount->text().toDouble(&ok); - if(ok) { - ret += QString("?amount=%1X8").arg(ui->lnReqAmount->text()); + if (ui->chkReqPayment->isChecked() && !ui->lnReqAmount->text().isEmpty()) + { + bool ok = false; + ui->lnReqAmount->text().toDouble(&ok); + if (ok) + { + ret += QString("?amount=%1").arg(ui->lnReqAmount->text()); paramCount++; } } - if(ui->lnLabel->text().isEmpty() == false) { + if (!ui->lnLabel->text().isEmpty()) + { QString lbl(QUrl::toPercentEncoding(ui->lnLabel->text())); ret += QString("%1label=%2").arg(paramCount == 0 ? "?" : "&").arg(lbl); paramCount++; } - if(ui->lnMessage->text().isEmpty() == false) { + if (!ui->lnMessage->text().isEmpty()) + { QString msg(QUrl::toPercentEncoding(ui->lnMessage->text())); ret += QString("%1message=%2").arg(paramCount == 0 ? "?" : "&").arg(msg); paramCount++; } - return ret; + // limit URI length to 255 chars, to prevent a DoS against the QR-Code dialog + if (ret.length() < 256) + return ret; + else + return QString(""); } -void QRCodeDialog::on_lnReqAmount_textChanged(const QString &) +void QRCodeDialog::on_lnReqAmount_textChanged(const QString &arg1) { genCode(); } -void QRCodeDialog::on_lnLabel_textChanged(const QString &) +void QRCodeDialog::on_lnLabel_textChanged(const QString &arg1) { genCode(); } -void QRCodeDialog::on_lnMessage_textChanged(const QString &) +void QRCodeDialog::on_lnMessage_textChanged(const QString &arg1) { genCode(); } @@ -111,12 +119,11 @@ void QRCodeDialog::on_lnMessage_textChanged(const QString &) void QRCodeDialog::on_btnSaveAs_clicked() { QString fn = GUIUtil::getSaveFileName(this, tr("Save Image..."), QString(), tr("PNG Images (*.png)")); - if(!fn.isEmpty()) { + if (!fn.isEmpty()) myImage.scaled(EXPORT_IMAGE_SIZE, EXPORT_IMAGE_SIZE).save(fn); - } } -void QRCodeDialog::on_chkReq_toggled(bool) +void QRCodeDialog::on_chkReqPayment_toggled(bool) { genCode(); } diff --git a/src/qt/qrcodedialog.h b/src/qt/qrcodedialog.h index 7463a8810e..ad0611605b 100644 --- a/src/qt/qrcodedialog.h +++ b/src/qt/qrcodedialog.h @@ -13,7 +13,7 @@ class QRCodeDialog : public QDialog Q_OBJECT public: - explicit QRCodeDialog(const QString &title, const QString &address, const QString &label, bool allowReq, QWidget *parent = 0); + explicit QRCodeDialog(const QString &addr, const QString &label, bool enableReq, QWidget *parent = 0); ~QRCodeDialog(); private slots: @@ -22,7 +22,7 @@ private slots: void on_lnMessage_textChanged(const QString &arg1); void on_btnSaveAs_clicked(); - void on_chkReq_toggled(bool checked); + void on_chkReqPayment_toggled(bool checked); private: Ui::QRCodeDialog *ui; diff --git a/src/qt/qtipcserver.cpp b/src/qt/qtipcserver.cpp index f1ad2b75a6..8a7bdabbfc 100644 --- a/src/qt/qtipcserver.cpp +++ b/src/qt/qtipcserver.cpp @@ -7,7 +7,8 @@ #include <boost/tokenizer.hpp> #include <boost/date_time/posix_time/posix_time.hpp> -#include "headers.h" +#include "ui_interface.h" +#include "util.h" #include "qtipcserver.h" using namespace boost::interprocess; diff --git a/src/qt/res/icons/connect4_16.png b/src/qt/res/icons/connect4_16.png Binary files differindex e2fe97d496..c1232f5682 100644 --- a/src/qt/res/icons/connect4_16.png +++ b/src/qt/res/icons/connect4_16.png diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index a91fc3880e..c6c9a08f04 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -1,10 +1,12 @@ -#include <transactiondesc.h> +#include "transactiondesc.h" #include "guiutil.h" #include "bitcoinunits.h" -#include "headers.h" -#include "qtui.h" +#include "main.h" +#include "wallet.h" +#include "db.h" +#include "ui_interface.h" #include <QString> @@ -34,8 +36,9 @@ QString TransactionDesc::FormatTxStatus(const CWalletTx& wtx) QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx) { QString strHTML; - CRITICAL_BLOCK(wallet->cs_wallet) + { + LOCK(wallet->cs_wallet); strHTML.reserve(4000); strHTML += "<html><font face='verdana, arial, helvetica, sans-serif'>"; @@ -242,8 +245,9 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx) strHTML += "<br><b>Inputs:</b>"; strHTML += "<ul>"; - CRITICAL_BLOCK(wallet->cs_wallet) + { + LOCK(wallet->cs_wallet); BOOST_FOREACH(const CTxIn& txin, wtx.vin) { COutPoint prevout = txin.prevout; diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index 57210dcc02..90fc5b7da3 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -1,6 +1,6 @@ #include "transactionrecord.h" -#include "headers.h" +#include "wallet.h" /* Return positive answer if transaction should be shown in list. */ @@ -33,7 +33,7 @@ bool TransactionRecord::showTransaction(const CWalletTx &wtx) QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *wallet, const CWalletTx &wtx) { QList<TransactionRecord> parts; - int64 nTime = wtx.nTimeDisplayed = wtx.GetTxTime(); + int64 nTime = wtx.GetTxTime(); int64 nCredit = wtx.GetCredit(true); int64 nDebit = wtx.GetDebit(); int64 nNet = nCredit - nDebit; @@ -146,12 +146,6 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet * // // Mixed debit transaction, can't break down payees // - bool fAllMine = true; - BOOST_FOREACH(const CTxOut& txout, wtx.vout) - fAllMine = fAllMine && wallet->IsMine(txout); - BOOST_FOREACH(const CTxIn& txin, wtx.vin) - fAllMine = fAllMine && wallet->IsMine(txin); - parts.append(TransactionRecord(hash, nTime, TransactionRecord::Other, "", nNet, 0)); } } diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index a8ffe62ed9..fb009387bb 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -8,7 +8,7 @@ #include "addresstablemodel.h" #include "bitcoinunits.h" -#include "headers.h" +#include "wallet.h" #include <QLocale> #include <QList> @@ -70,8 +70,8 @@ public: qDebug() << "refreshWallet"; #endif cachedWallet.clear(); - CRITICAL_BLOCK(wallet->cs_wallet) { + LOCK(wallet->cs_wallet); for(std::map<uint256, CWalletTx>::iterator it = wallet->mapWallet.begin(); it != wallet->mapWallet.end(); ++it) { cachedWallet.append(TransactionRecord::decomposeTransaction(wallet, it->second)); @@ -96,8 +96,8 @@ public: QList<uint256> updated_sorted = updated; qSort(updated_sorted); - CRITICAL_BLOCK(wallet->cs_wallet) { + LOCK(wallet->cs_wallet); for(int update_idx = updated_sorted.size()-1; update_idx >= 0; --update_idx) { const uint256 &hash = updated_sorted.at(update_idx); @@ -172,8 +172,8 @@ public: // simply re-use the cached status. if(rec->statusUpdateNeeded()) { - CRITICAL_BLOCK(wallet->cs_wallet) { + LOCK(wallet->cs_wallet); std::map<uint256, CWalletTx>::iterator mi = wallet->mapWallet.find(rec->hash); if(mi != wallet->mapWallet.end()) @@ -192,8 +192,8 @@ public: QString describe(TransactionRecord *rec) { - CRITICAL_BLOCK(wallet->cs_wallet) { + LOCK(wallet->cs_wallet); std::map<uint256, CWalletTx>::iterator mi = wallet->mapWallet.find(rec->hash); if(mi != wallet->mapWallet.end()) { @@ -232,9 +232,9 @@ void TransactionTableModel::update() QList<uint256> updated; // Check if there are changes to wallet map - TRY_CRITICAL_BLOCK(wallet->cs_wallet) { - if(!wallet->vWalletUpdated.empty()) + TRY_LOCK(wallet->cs_wallet, lockWallet); + if (lockWallet && !wallet->vWalletUpdated.empty()) { BOOST_FOREACH(uint256 hash, wallet->vWalletUpdated) { diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 0a085f5745..b9ccb06c09 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -4,10 +4,10 @@ #include "addresstablemodel.h" #include "transactiontablemodel.h" -#include "headers.h" -#include "db.h" // for BackupWallet +#include "ui_interface.h" +#include "wallet.h" +#include "walletdb.h" // for BackupWallet -#include <QTimer> #include <QSet> WalletModel::WalletModel(CWallet *wallet, OptionsModel *optionsModel, QObject *parent) : @@ -16,12 +16,6 @@ WalletModel::WalletModel(CWallet *wallet, OptionsModel *optionsModel, QObject *p cachedBalance(0), cachedUnconfirmedBalance(0), cachedNumTransactions(0), cachedEncryptionStatus(Unencrypted) { - // Until signal notifications is built into the bitcoin core, - // simply update everything after polling using a timer. - QTimer *timer = new QTimer(this); - connect(timer, SIGNAL(timeout()), this, SLOT(update())); - timer->start(MODEL_UPDATE_DELAY); - addressTableModel = new AddressTableModel(wallet, this); transactionTableModel = new TransactionTableModel(wallet, this); } @@ -39,8 +33,8 @@ qint64 WalletModel::getUnconfirmedBalance() const int WalletModel::getNumTransactions() const { int numTransactions = 0; - CRITICAL_BLOCK(wallet->cs_wallet) { + LOCK(wallet->cs_wallet); numTransactions = wallet->mapWallet.size(); } return numTransactions; @@ -65,7 +59,10 @@ void WalletModel::update() cachedBalance = newBalance; cachedUnconfirmedBalance = newUnconfirmedBalance; cachedNumTransactions = newNumTransactions; +} +void WalletModel::updateAddressList() +{ addressTableModel->update(); } @@ -117,9 +114,9 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList<SendCoinsRecipie return SendCoinsReturn(AmountWithFeeExceedsBalance, nTransactionFee); } - CRITICAL_BLOCK(cs_main) - CRITICAL_BLOCK(wallet->cs_wallet) { + LOCK2(cs_main, wallet->cs_wallet); + // Sendmany std::vector<std::pair<CScript, int64> > vecSend; foreach(const SendCoinsRecipient &rcp, recipients) @@ -142,7 +139,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList<SendCoinsRecipie } return TransactionCreationFailed; } - if(!ThreadSafeAskFee(nFeeRequired, tr("Sending...").toStdString(), NULL)) + if(!ThreadSafeAskFee(nFeeRequired, tr("Sending...").toStdString())) { return Aborted; } @@ -158,8 +155,9 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList<SendCoinsRecipie { std::string strAddress = rcp.address.toStdString(); std::string strLabel = rcp.label.toStdString(); - CRITICAL_BLOCK(wallet->cs_wallet) { + LOCK(wallet->cs_wallet); + std::map<CBitcoinAddress, std::string>::iterator mi = wallet->mapAddressBook.find(strAddress); // Check if we have a new address or an updated label @@ -170,9 +168,6 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList<SendCoinsRecipie } } - // Update our model of the address table - addressTableModel->updateList(); - return SendCoinsReturn(OK, 0, hex); } @@ -238,8 +233,8 @@ bool WalletModel::setWalletLocked(bool locked, const SecureString &passPhrase) bool WalletModel::changePassphrase(const SecureString &oldPass, const SecureString &newPass) { bool retval; - CRITICAL_BLOCK(wallet->cs_wallet) { + LOCK(wallet->cs_wallet); wallet->Lock(); // Make sure wallet is locked before attempting pass change retval = wallet->ChangeWalletPassphrase(oldPass, newPass); } diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index e78773f8a3..6c47f61bef 100644 --- a/src/qt/walletmodel.h +++ b/src/qt/walletmodel.h @@ -3,15 +3,16 @@ #include <QObject> -#include "util.h" +#include "allocators.h" /* for SecureString */ class OptionsModel; class AddressTableModel; class TransactionTableModel; class CWallet; -struct SendCoinsRecipient +class SendCoinsRecipient { +public: QString address; QString label; qint64 amount; @@ -133,12 +134,11 @@ signals: void requireUnlock(); // Asynchronous error notification - void error(const QString &title, const QString &message); + void error(const QString &title, const QString &message, bool modal); public slots: - -private slots: void update(); + void updateAddressList(); }; diff --git a/src/rpcdump.cpp b/src/rpcdump.cpp index ae7f1cdd4c..2db4882068 100644 --- a/src/rpcdump.cpp +++ b/src/rpcdump.cpp @@ -2,19 +2,12 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "headers.h" #include "init.h" // for pwalletMain #include "bitcoinrpc.h" +#include "ui_interface.h" -// #include <boost/asio.hpp> -// #include <boost/iostreams/concepts.hpp> -// #include <boost/iostreams/stream.hpp> #include <boost/lexical_cast.hpp> -// #ifdef USE_SSL -// #include <boost/asio/ssl.hpp> -// typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> SSLStream; -// #endif -// #include <boost/xpressive/xpressive_dynamic.hpp> + #include "json/json_spirit_reader_template.h" #include "json/json_spirit_writer_template.h" #include "json/json_spirit_utils.h" @@ -67,9 +60,9 @@ Value importprivkey(const Array& params, bool fHelp) key.SetSecret(secret, fCompressed); CBitcoinAddress vchAddress = CBitcoinAddress(key.GetPubKey()); - CRITICAL_BLOCK(cs_main) - CRITICAL_BLOCK(pwalletMain->cs_wallet) { + LOCK2(cs_main, pwalletMain->cs_wallet); + pwalletMain->MarkDirty(); pwalletMain->SetAddressBookName(vchAddress, strLabel); diff --git a/src/script.cpp b/src/script.cpp index a78763e31d..5003b1f0ad 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -2,11 +2,19 @@ // Copyright (c) 2009-2012 The Bitcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "headers.h" +#include <boost/foreach.hpp> +#include <boost/tuple/tuple.hpp> using namespace std; using namespace boost; +#include "script.h" +#include "keystore.h" +#include "bignum.h" +#include "key.h" +#include "main.h" +#include "util.h" + bool CheckSig(vector<unsigned char> vchSig, vector<unsigned char> vchPubKey, CScript scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType); @@ -32,7 +40,7 @@ CBigNum CastToBigNum(const valtype& vch) bool CastToBool(const valtype& vch) { - for (int i = 0; i < vch.size(); i++) + for (unsigned int i = 0; i < vch.size(); i++) { if (vch[i] != 0) { @@ -530,7 +538,7 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, co return false; int n = CastToBigNum(stacktop(-1)).getint(); popstack(stack); - if (n < 0 || n >= stack.size()) + if (n < 0 || n >= (int)stack.size()) return false; valtype vch = stacktop(-n-1); if (opcode == OP_ROLL) @@ -598,9 +606,9 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, co int nEnd = nBegin + CastToBigNum(stacktop(-1)).getint(); if (nBegin < 0 || nEnd < nBegin) return false; - if (nBegin > vch.size()) + if (nBegin > (int)vch.size()) nBegin = vch.size(); - if (nEnd > vch.size()) + if (nEnd > (int)vch.size()) nEnd = vch.size(); vch.erase(vch.begin() + nEnd, vch.end()); vch.erase(vch.begin(), vch.begin() + nBegin); @@ -619,7 +627,7 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, co int nSize = CastToBigNum(stacktop(-1)).getint(); if (nSize < 0) return false; - if (nSize > vch.size()) + if (nSize > (int)vch.size()) nSize = vch.size(); if (opcode == OP_LEFT) vch.erase(vch.begin() + nSize, vch.end()); @@ -649,7 +657,7 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, co if (stack.size() < 1) return false; valtype& vch = stacktop(-1); - for (int i = 0; i < vch.size(); i++) + for (unsigned int i = 0; i < vch.size(); i++) vch[i] = ~vch[i]; } break; @@ -666,17 +674,17 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, co MakeSameSize(vch1, vch2); if (opcode == OP_AND) { - for (int i = 0; i < vch1.size(); i++) + for (unsigned int i = 0; i < vch1.size(); i++) vch1[i] &= vch2[i]; } else if (opcode == OP_OR) { - for (int i = 0; i < vch1.size(); i++) + for (unsigned int i = 0; i < vch1.size(); i++) vch1[i] |= vch2[i]; } else if (opcode == OP_XOR) { - for (int i = 0; i < vch1.size(); i++) + for (unsigned int i = 0; i < vch1.size(); i++) vch1[i] ^= vch2[i]; } popstack(stack); @@ -1044,7 +1052,7 @@ uint256 SignatureHash(CScript scriptCode, const CTransaction& txTo, unsigned int scriptCode.FindAndDelete(CScript(OP_CODESEPARATOR)); // Blank out other inputs' signatures - for (int i = 0; i < txTmp.vin.size(); i++) + for (unsigned int i = 0; i < txTmp.vin.size(); i++) txTmp.vin[i].scriptSig = CScript(); txTmp.vin[nIn].scriptSig = scriptCode; @@ -1055,7 +1063,7 @@ uint256 SignatureHash(CScript scriptCode, const CTransaction& txTo, unsigned int txTmp.vout.clear(); // Let the others update at will - for (int i = 0; i < txTmp.vin.size(); i++) + for (unsigned int i = 0; i < txTmp.vin.size(); i++) if (i != nIn) txTmp.vin[i].nSequence = 0; } @@ -1069,11 +1077,11 @@ uint256 SignatureHash(CScript scriptCode, const CTransaction& txTo, unsigned int return 1; } txTmp.vout.resize(nOut+1); - for (int i = 0; i < nOut; i++) + for (unsigned int i = 0; i < nOut; i++) txTmp.vout[i].SetNull(); // Let the others update at will - for (int i = 0; i < txTmp.vin.size(); i++) + for (unsigned int i = 0; i < txTmp.vin.size(); i++) if (i != nIn) txTmp.vin[i].nSequence = 0; } @@ -1086,19 +1094,74 @@ uint256 SignatureHash(CScript scriptCode, const CTransaction& txTo, unsigned int } // Serialize and hash - CDataStream ss(SER_GETHASH); + CDataStream ss(SER_GETHASH, 0); ss.reserve(10000); ss << txTmp << nHashType; return Hash(ss.begin(), ss.end()); } +// Valid signature cache, to avoid doing expensive ECDSA signature checking +// twice for every transaction (once when accepted into memory pool, and +// again when accepted into the block chain) + +class CSignatureCache +{ +private: + // sigdata_type is (signature hash, signature, public key): + typedef boost::tuple<uint256, std::vector<unsigned char>, std::vector<unsigned char> > sigdata_type; + std::set< sigdata_type> setValid; + CCriticalSection cs_sigcache; + +public: + bool + Get(uint256 hash, const std::vector<unsigned char>& vchSig, const std::vector<unsigned char>& pubKey) + { + LOCK(cs_sigcache); + + sigdata_type k(hash, vchSig, pubKey); + std::set<sigdata_type>::iterator mi = setValid.find(k); + if (mi != setValid.end()) + return true; + return false; + } + + void + Set(uint256 hash, const std::vector<unsigned char>& vchSig, const std::vector<unsigned char>& pubKey) + { + // DoS prevention: limit cache size to less than 10MB + // (~200 bytes per cache entry times 50,000 entries) + // Since there are a maximum of 20,000 signature operations per block + // 50,000 is a reasonable default. + int64 nMaxCacheSize = GetArg("-maxsigcachesize", 50000); + if (nMaxCacheSize <= 0) return; + + LOCK(cs_sigcache); + + while (static_cast<int64>(setValid.size()) > nMaxCacheSize) + { + // Evict a random entry. Random because that helps + // foil would-be DoS attackers who might try to pre-generate + // and re-use a set of valid signatures just-slightly-greater + // than our cache size. + uint256 randomHash = GetRandHash(); + std::vector<unsigned char> unused; + std::set<sigdata_type>::iterator it = + setValid.lower_bound(sigdata_type(randomHash, unused, unused)); + if (it == setValid.end()) + it = setValid.begin(); + setValid.erase(*it); + } + + sigdata_type k(hash, vchSig, pubKey); + setValid.insert(k); + } +}; + bool CheckSig(vector<unsigned char> vchSig, vector<unsigned char> vchPubKey, CScript scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType) { - CKey key; - if (!key.SetPubKey(vchPubKey)) - return false; + static CSignatureCache signatureCache; // Hash type is one byte tacked on to the end of the signature if (vchSig.empty()) @@ -1109,7 +1172,20 @@ bool CheckSig(vector<unsigned char> vchSig, vector<unsigned char> vchPubKey, CSc return false; vchSig.pop_back(); - return key.Verify(SignatureHash(scriptCode, txTo, nIn, nHashType), vchSig); + uint256 sighash = SignatureHash(scriptCode, txTo, nIn, nHashType); + + if (signatureCache.Get(sighash, vchSig, vchPubKey)) + return true; + + CKey key; + if (!key.SetPubKey(vchPubKey)) + return false; + + if (!key.Verify(sighash, vchSig)) + return false; + + signatureCache.Set(sighash, vchSig, vchPubKey); + return true; } @@ -1354,9 +1430,9 @@ bool IsStandard(const CScript& scriptPubKey) } -int HaveKeys(const vector<valtype>& pubkeys, const CKeyStore& keystore) +unsigned int HaveKeys(const vector<valtype>& pubkeys, const CKeyStore& keystore) { - int nResult = 0; + unsigned int nResult = 0; BOOST_FOREACH(const valtype& pubkey, pubkeys) { CBitcoinAddress address; @@ -1443,7 +1519,7 @@ bool ExtractAddresses(const CScript& scriptPubKey, txnouttype& typeRet, vector<C if (typeRet == TX_MULTISIG) { nRequiredRet = vSolutions.front()[0]; - for (int i = 1; i < vSolutions.size()-1; i++) + for (unsigned int i = 1; i < vSolutions.size()-1; i++) { CBitcoinAddress address; address.SetPubKey(vSolutions[i]); @@ -1560,9 +1636,9 @@ bool VerifySignature(const CTransaction& txFrom, const CTransaction& txTo, unsig return true; } -int CScript::GetSigOpCount(bool fAccurate) const +unsigned int CScript::GetSigOpCount(bool fAccurate) const { - int n = 0; + unsigned int n = 0; const_iterator pc = begin(); opcodetype lastOpcode = OP_INVALIDOPCODE; while (pc < end()) @@ -1584,7 +1660,7 @@ int CScript::GetSigOpCount(bool fAccurate) const return n; } -int CScript::GetSigOpCount(const CScript& scriptSig) const +unsigned int CScript::GetSigOpCount(const CScript& scriptSig) const { if (!IsPayToScriptHash()) return GetSigOpCount(true); diff --git a/src/script.h b/src/script.h index bbc6498fbb..5397a1972f 100644 --- a/src/script.h +++ b/src/script.h @@ -41,136 +41,136 @@ const char* GetTxnOutputType(txnouttype t); enum opcodetype { // push value - OP_0=0, - OP_FALSE=OP_0, - OP_PUSHDATA1=76, - OP_PUSHDATA2, - OP_PUSHDATA4, - OP_1NEGATE, - OP_RESERVED, - OP_1, + OP_0 = 0x00, + OP_FALSE = OP_0, + OP_PUSHDATA1 = 0x4c, + OP_PUSHDATA2 = 0x4d, + OP_PUSHDATA4 = 0x4e, + OP_1NEGATE = 0x4f, + OP_RESERVED = 0x50, + OP_1 = 0x51, OP_TRUE=OP_1, - OP_2, - OP_3, - OP_4, - OP_5, - OP_6, - OP_7, - OP_8, - OP_9, - OP_10, - OP_11, - OP_12, - OP_13, - OP_14, - OP_15, - OP_16, + OP_2 = 0x52, + OP_3 = 0x53, + OP_4 = 0x54, + OP_5 = 0x55, + OP_6 = 0x56, + OP_7 = 0x57, + OP_8 = 0x58, + OP_9 = 0x59, + OP_10 = 0x5a, + OP_11 = 0x5b, + OP_12 = 0x5c, + OP_13 = 0x5d, + OP_14 = 0x5e, + OP_15 = 0x5f, + OP_16 = 0x60, // control - OP_NOP, - OP_VER, - OP_IF, - OP_NOTIF, - OP_VERIF, - OP_VERNOTIF, - OP_ELSE, - OP_ENDIF, - OP_VERIFY, - OP_RETURN, + OP_NOP = 0x61, + OP_VER = 0x62, + OP_IF = 0x63, + OP_NOTIF = 0x64, + OP_VERIF = 0x65, + OP_VERNOTIF = 0x66, + OP_ELSE = 0x67, + OP_ENDIF = 0x68, + OP_VERIFY = 0x69, + OP_RETURN = 0x6a, // stack ops - OP_TOALTSTACK, - OP_FROMALTSTACK, - OP_2DROP, - OP_2DUP, - OP_3DUP, - OP_2OVER, - OP_2ROT, - OP_2SWAP, - OP_IFDUP, - OP_DEPTH, - OP_DROP, - OP_DUP, - OP_NIP, - OP_OVER, - OP_PICK, - OP_ROLL, - OP_ROT, - OP_SWAP, - OP_TUCK, + OP_TOALTSTACK = 0x6b, + OP_FROMALTSTACK = 0x6c, + OP_2DROP = 0x6d, + OP_2DUP = 0x6e, + OP_3DUP = 0x6f, + OP_2OVER = 0x70, + OP_2ROT = 0x71, + OP_2SWAP = 0x72, + OP_IFDUP = 0x73, + OP_DEPTH = 0x74, + OP_DROP = 0x75, + OP_DUP = 0x76, + OP_NIP = 0x77, + OP_OVER = 0x78, + OP_PICK = 0x79, + OP_ROLL = 0x7a, + OP_ROT = 0x7b, + OP_SWAP = 0x7c, + OP_TUCK = 0x7d, // splice ops - OP_CAT, - OP_SUBSTR, - OP_LEFT, - OP_RIGHT, - OP_SIZE, + OP_CAT = 0x7e, + OP_SUBSTR = 0x7f, + OP_LEFT = 0x80, + OP_RIGHT = 0x81, + OP_SIZE = 0x82, // bit logic - OP_INVERT, - OP_AND, - OP_OR, - OP_XOR, - OP_EQUAL, - OP_EQUALVERIFY, - OP_RESERVED1, - OP_RESERVED2, + OP_INVERT = 0x83, + OP_AND = 0x84, + OP_OR = 0x85, + OP_XOR = 0x86, + OP_EQUAL = 0x87, + OP_EQUALVERIFY = 0x88, + OP_RESERVED1 = 0x89, + OP_RESERVED2 = 0x8a, // numeric - OP_1ADD, - OP_1SUB, - OP_2MUL, - OP_2DIV, - OP_NEGATE, - OP_ABS, - OP_NOT, - OP_0NOTEQUAL, - - OP_ADD, - OP_SUB, - OP_MUL, - OP_DIV, - OP_MOD, - OP_LSHIFT, - OP_RSHIFT, - - OP_BOOLAND, - OP_BOOLOR, - OP_NUMEQUAL, - OP_NUMEQUALVERIFY, - OP_NUMNOTEQUAL, - OP_LESSTHAN, - OP_GREATERTHAN, - OP_LESSTHANOREQUAL, - OP_GREATERTHANOREQUAL, - OP_MIN, - OP_MAX, - - OP_WITHIN, + OP_1ADD = 0x8b, + OP_1SUB = 0x8c, + OP_2MUL = 0x8d, + OP_2DIV = 0x8e, + OP_NEGATE = 0x8f, + OP_ABS = 0x90, + OP_NOT = 0x91, + OP_0NOTEQUAL = 0x92, + + OP_ADD = 0x93, + OP_SUB = 0x94, + OP_MUL = 0x95, + OP_DIV = 0x96, + OP_MOD = 0x97, + OP_LSHIFT = 0x98, + OP_RSHIFT = 0x99, + + OP_BOOLAND = 0x9a, + OP_BOOLOR = 0x9b, + OP_NUMEQUAL = 0x9c, + OP_NUMEQUALVERIFY = 0x9d, + OP_NUMNOTEQUAL = 0x9e, + OP_LESSTHAN = 0x9f, + OP_GREATERTHAN = 0xa0, + OP_LESSTHANOREQUAL = 0xa1, + OP_GREATERTHANOREQUAL = 0xa2, + OP_MIN = 0xa3, + OP_MAX = 0xa4, + + OP_WITHIN = 0xa5, // crypto - OP_RIPEMD160, - OP_SHA1, - OP_SHA256, - OP_HASH160, - OP_HASH256, - OP_CODESEPARATOR, - OP_CHECKSIG, - OP_CHECKSIGVERIFY, - OP_CHECKMULTISIG, - OP_CHECKMULTISIGVERIFY, + OP_RIPEMD160 = 0xa6, + OP_SHA1 = 0xa7, + OP_SHA256 = 0xa8, + OP_HASH160 = 0xa9, + OP_HASH256 = 0xaa, + OP_CODESEPARATOR = 0xab, + OP_CHECKSIG = 0xac, + OP_CHECKSIGVERIFY = 0xad, + OP_CHECKMULTISIG = 0xae, + OP_CHECKMULTISIGVERIFY = 0xaf, // expansion - OP_NOP1, - OP_NOP2, - OP_NOP3, - OP_NOP4, - OP_NOP5, - OP_NOP6, - OP_NOP7, - OP_NOP8, - OP_NOP9, - OP_NOP10, + OP_NOP1 = 0xb0, + OP_NOP2 = 0xb1, + OP_NOP3 = 0xb2, + OP_NOP4 = 0xb3, + OP_NOP5 = 0xb4, + OP_NOP6 = 0xb5, + OP_NOP7 = 0xb6, + OP_NOP8 = 0xb7, + OP_NOP9 = 0xb8, + OP_NOP10 = 0xb9, @@ -467,7 +467,7 @@ public: opcodetype opcode; do { - while (end() - pc >= b.size() && memcmp(&pc[0], &b[0], b.size()) == 0) + while (end() - pc >= (long)b.size() && memcmp(&pc[0], &b[0], b.size()) == 0) { erase(pc, pc + b.size()); ++nFound; @@ -491,11 +491,11 @@ public: // CHECKMULTISIGs serialized in scriptSigs are // counted more accurately, assuming they are of the form // ... OP_N CHECKMULTISIG ... - int GetSigOpCount(bool fAccurate) const; + unsigned int GetSigOpCount(bool fAccurate) const; // Accurately count sigOps, including sigOps in // pay-to-script-hash transactions: - int GetSigOpCount(const CScript& scriptSig) const; + unsigned int GetSigOpCount(const CScript& scriptSig) const; bool IsPayToScriptHash() const; diff --git a/src/serialize.h b/src/serialize.h index 73c1139dbc..3d01199275 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -21,42 +21,17 @@ #include <boost/tuple/tuple_comparison.hpp> #include <boost/tuple/tuple_io.hpp> +#include "allocators.h" +#include "version.h" + typedef long long int64; typedef unsigned long long uint64; -#ifdef WIN32 -#define _WIN32_WINNT 0x0501 -#include <windows.h> -// This is used to attempt to keep keying material out of swap -// Note that VirtualLock does not provide this as a guarantee on Windows, -// but, in practice, memory that has been VirtualLock'd almost never gets written to -// the pagefile except in rare circumstances where memory is extremely low. -#include <windows.h> -#define mlock(p, n) VirtualLock((p), (n)); -#define munlock(p, n) VirtualUnlock((p), (n)); -#else -#include <sys/mman.h> -#include <limits.h> -/* This comes from limits.h if it's not defined there set a sane default */ -#ifndef PAGESIZE -#include <unistd.h> -#define PAGESIZE sysconf(_SC_PAGESIZE) -#endif -#define mlock(a,b) \ - mlock(((void *)(((size_t)(a)) & (~((PAGESIZE)-1)))),\ - (((((size_t)(a)) + (b) - 1) | ((PAGESIZE) - 1)) + 1) - (((size_t)(a)) & (~((PAGESIZE) - 1)))) -#define munlock(a,b) \ - munlock(((void *)(((size_t)(a)) & (~((PAGESIZE)-1)))),\ - (((((size_t)(a)) + (b) - 1) | ((PAGESIZE) - 1)) + 1) - (((size_t)(a)) & (~((PAGESIZE) - 1)))) -#endif - class CScript; class CDataStream; class CAutoFile; static const unsigned int MAX_SIZE = 0x02000000; -static const int PROTOCOL_VERSION = 60000; - // Used to bypass the rule against non-const reference to temporary // where it makes sense with wrappers such as CFlatData or CTxDB template<typename T> @@ -84,7 +59,7 @@ enum }; #define IMPLEMENT_SERIALIZE(statements) \ - unsigned int GetSerializeSize(int nType=0, int nVersion=PROTOCOL_VERSION) const \ + unsigned int GetSerializeSize(int nType, int nVersion) const \ { \ CSerActionGetSerializeSize ser_action; \ const bool fGetSize = true; \ @@ -99,7 +74,7 @@ enum return nSerSize; \ } \ template<typename Stream> \ - void Serialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) const \ + void Serialize(Stream& s, int nType, int nVersion) const \ { \ CSerActionSerialize ser_action; \ const bool fGetSize = false; \ @@ -110,7 +85,7 @@ enum {statements} \ } \ template<typename Stream> \ - void Unserialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) \ + void Unserialize(Stream& s, int nType, int nVersion) \ { \ CSerActionUnserialize ser_action; \ const bool fGetSize = false; \ @@ -302,48 +277,6 @@ public: } }; - - -/** string stored as a fixed length field */ -template<std::size_t LEN> -class CFixedFieldString -{ -protected: - const std::string* pcstr; - std::string* pstr; -public: - explicit CFixedFieldString(const std::string& str) : pcstr(&str), pstr(NULL) { } - explicit CFixedFieldString(std::string& str) : pcstr(&str), pstr(&str) { } - - unsigned int GetSerializeSize(int, int=0) const - { - return LEN; - } - - template<typename Stream> - void Serialize(Stream& s, int, int=0) const - { - char pszBuf[LEN]; - strncpy(pszBuf, pcstr->c_str(), LEN); - s.write(pszBuf, LEN); - } - - template<typename Stream> - void Unserialize(Stream& s, int, int=0) - { - if (pstr == NULL) - throw std::ios_base::failure("CFixedFieldString::Unserialize : trying to unserialize to const string"); - char pszBuf[LEN+1]; - s.read(pszBuf, LEN); - pszBuf[LEN] = '\0'; - *pstr = pszBuf; - } -}; - - - - - // // Forward declarations // @@ -356,43 +289,43 @@ template<typename Stream, typename C> void Unserialize(Stream& is, std::basic_st // vector template<typename T, typename A> unsigned int GetSerializeSize_impl(const std::vector<T, A>& v, int nType, int nVersion, const boost::true_type&); template<typename T, typename A> unsigned int GetSerializeSize_impl(const std::vector<T, A>& v, int nType, int nVersion, const boost::false_type&); -template<typename T, typename A> inline unsigned int GetSerializeSize(const std::vector<T, A>& v, int nType, int nVersion=PROTOCOL_VERSION); +template<typename T, typename A> inline unsigned int GetSerializeSize(const std::vector<T, A>& v, int nType, int nVersion); template<typename Stream, typename T, typename A> void Serialize_impl(Stream& os, const std::vector<T, A>& v, int nType, int nVersion, const boost::true_type&); template<typename Stream, typename T, typename A> void Serialize_impl(Stream& os, const std::vector<T, A>& v, int nType, int nVersion, const boost::false_type&); -template<typename Stream, typename T, typename A> inline void Serialize(Stream& os, const std::vector<T, A>& v, int nType, int nVersion=PROTOCOL_VERSION); +template<typename Stream, typename T, typename A> inline void Serialize(Stream& os, const std::vector<T, A>& v, int nType, int nVersion); template<typename Stream, typename T, typename A> void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion, const boost::true_type&); template<typename Stream, typename T, typename A> void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion, const boost::false_type&); -template<typename Stream, typename T, typename A> inline void Unserialize(Stream& is, std::vector<T, A>& v, int nType, int nVersion=PROTOCOL_VERSION); +template<typename Stream, typename T, typename A> inline void Unserialize(Stream& is, std::vector<T, A>& v, int nType, int nVersion); // others derived from vector -extern inline unsigned int GetSerializeSize(const CScript& v, int nType, int nVersion=PROTOCOL_VERSION); -template<typename Stream> void Serialize(Stream& os, const CScript& v, int nType, int nVersion=PROTOCOL_VERSION); -template<typename Stream> void Unserialize(Stream& is, CScript& v, int nType, int nVersion=PROTOCOL_VERSION); +extern inline unsigned int GetSerializeSize(const CScript& v, int nType, int nVersion); +template<typename Stream> void Serialize(Stream& os, const CScript& v, int nType, int nVersion); +template<typename Stream> void Unserialize(Stream& is, CScript& v, int nType, int nVersion); // pair -template<typename K, typename T> unsigned int GetSerializeSize(const std::pair<K, T>& item, int nType, int nVersion=PROTOCOL_VERSION); -template<typename Stream, typename K, typename T> void Serialize(Stream& os, const std::pair<K, T>& item, int nType, int nVersion=PROTOCOL_VERSION); -template<typename Stream, typename K, typename T> void Unserialize(Stream& is, std::pair<K, T>& item, int nType, int nVersion=PROTOCOL_VERSION); +template<typename K, typename T> unsigned int GetSerializeSize(const std::pair<K, T>& item, int nType, int nVersion); +template<typename Stream, typename K, typename T> void Serialize(Stream& os, const std::pair<K, T>& item, int nType, int nVersion); +template<typename Stream, typename K, typename T> void Unserialize(Stream& is, std::pair<K, T>& item, int nType, int nVersion); // 3 tuple -template<typename T0, typename T1, typename T2> unsigned int GetSerializeSize(const boost::tuple<T0, T1, T2>& item, int nType, int nVersion=PROTOCOL_VERSION); -template<typename Stream, typename T0, typename T1, typename T2> void Serialize(Stream& os, const boost::tuple<T0, T1, T2>& item, int nType, int nVersion=PROTOCOL_VERSION); -template<typename Stream, typename T0, typename T1, typename T2> void Unserialize(Stream& is, boost::tuple<T0, T1, T2>& item, int nType, int nVersion=PROTOCOL_VERSION); +template<typename T0, typename T1, typename T2> unsigned int GetSerializeSize(const boost::tuple<T0, T1, T2>& item, int nType, int nVersion); +template<typename Stream, typename T0, typename T1, typename T2> void Serialize(Stream& os, const boost::tuple<T0, T1, T2>& item, int nType, int nVersion); +template<typename Stream, typename T0, typename T1, typename T2> void Unserialize(Stream& is, boost::tuple<T0, T1, T2>& item, int nType, int nVersion); // 4 tuple -template<typename T0, typename T1, typename T2, typename T3> unsigned int GetSerializeSize(const boost::tuple<T0, T1, T2, T3>& item, int nType, int nVersion=PROTOCOL_VERSION); -template<typename Stream, typename T0, typename T1, typename T2, typename T3> void Serialize(Stream& os, const boost::tuple<T0, T1, T2, T3>& item, int nType, int nVersion=PROTOCOL_VERSION); -template<typename Stream, typename T0, typename T1, typename T2, typename T3> void Unserialize(Stream& is, boost::tuple<T0, T1, T2, T3>& item, int nType, int nVersion=PROTOCOL_VERSION); +template<typename T0, typename T1, typename T2, typename T3> unsigned int GetSerializeSize(const boost::tuple<T0, T1, T2, T3>& item, int nType, int nVersion); +template<typename Stream, typename T0, typename T1, typename T2, typename T3> void Serialize(Stream& os, const boost::tuple<T0, T1, T2, T3>& item, int nType, int nVersion); +template<typename Stream, typename T0, typename T1, typename T2, typename T3> void Unserialize(Stream& is, boost::tuple<T0, T1, T2, T3>& item, int nType, int nVersion); // map -template<typename K, typename T, typename Pred, typename A> unsigned int GetSerializeSize(const std::map<K, T, Pred, A>& m, int nType, int nVersion=PROTOCOL_VERSION); -template<typename Stream, typename K, typename T, typename Pred, typename A> void Serialize(Stream& os, const std::map<K, T, Pred, A>& m, int nType, int nVersion=PROTOCOL_VERSION); -template<typename Stream, typename K, typename T, typename Pred, typename A> void Unserialize(Stream& is, std::map<K, T, Pred, A>& m, int nType, int nVersion=PROTOCOL_VERSION); +template<typename K, typename T, typename Pred, typename A> unsigned int GetSerializeSize(const std::map<K, T, Pred, A>& m, int nType, int nVersion); +template<typename Stream, typename K, typename T, typename Pred, typename A> void Serialize(Stream& os, const std::map<K, T, Pred, A>& m, int nType, int nVersion); +template<typename Stream, typename K, typename T, typename Pred, typename A> void Unserialize(Stream& is, std::map<K, T, Pred, A>& m, int nType, int nVersion); // set -template<typename K, typename Pred, typename A> unsigned int GetSerializeSize(const std::set<K, Pred, A>& m, int nType, int nVersion=PROTOCOL_VERSION); -template<typename Stream, typename K, typename Pred, typename A> void Serialize(Stream& os, const std::set<K, Pred, A>& m, int nType, int nVersion=PROTOCOL_VERSION); -template<typename Stream, typename K, typename Pred, typename A> void Unserialize(Stream& is, std::set<K, Pred, A>& m, int nType, int nVersion=PROTOCOL_VERSION); +template<typename K, typename Pred, typename A> unsigned int GetSerializeSize(const std::set<K, Pred, A>& m, int nType, int nVersion); +template<typename Stream, typename K, typename Pred, typename A> void Serialize(Stream& os, const std::set<K, Pred, A>& m, int nType, int nVersion); +template<typename Stream, typename K, typename Pred, typename A> void Unserialize(Stream& is, std::set<K, Pred, A>& m, int nType, int nVersion); @@ -405,19 +338,19 @@ template<typename Stream, typename K, typename Pred, typename A> void Unserializ // Thanks to Boost serialization for this idea. // template<typename T> -inline unsigned int GetSerializeSize(const T& a, long nType, int nVersion=PROTOCOL_VERSION) +inline unsigned int GetSerializeSize(const T& a, long nType, int nVersion) { return a.GetSerializeSize((int)nType, nVersion); } template<typename Stream, typename T> -inline void Serialize(Stream& os, const T& a, long nType, int nVersion=PROTOCOL_VERSION) +inline void Serialize(Stream& os, const T& a, long nType, int nVersion) { a.Serialize(os, (int)nType, nVersion); } template<typename Stream, typename T> -inline void Unserialize(Stream& is, T& a, long nType, int nVersion=PROTOCOL_VERSION) +inline void Unserialize(Stream& is, T& a, long nType, int nVersion) { a.Unserialize(is, (int)nType, nVersion); } @@ -505,10 +438,6 @@ inline void Serialize(Stream& os, const std::vector<T, A>& v, int nType, int nVe template<typename Stream, typename T, typename A> void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion, const boost::true_type&) { - //unsigned int nSize = ReadCompactSize(is); - //v.resize(nSize); - //is.read((char*)&v[0], nSize * sizeof(T)); - // Limit size per read so bogus size value won't cause out of memory v.clear(); unsigned int nSize = ReadCompactSize(is); @@ -525,11 +454,6 @@ void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion, template<typename Stream, typename T, typename A> void Unserialize_impl(Stream& is, std::vector<T, A>& v, int nType, int nVersion, const boost::false_type&) { - //unsigned int nSize = ReadCompactSize(is); - //v.resize(nSize); - //for (std::vector<T, A>::iterator vi = v.begin(); vi != v.end(); ++vi) - // Unserialize(is, (*vi), nType, nVersion); - v.clear(); unsigned int nSize = ReadCompactSize(is); unsigned int i = 0; @@ -778,81 +702,6 @@ struct ser_streamplaceholder -// -// Allocator that locks its contents from being paged -// out of memory and clears its contents before deletion. -// -template<typename T> -struct secure_allocator : public std::allocator<T> -{ - // MSVC8 default copy constructor is broken - typedef std::allocator<T> base; - typedef typename base::size_type size_type; - typedef typename base::difference_type difference_type; - typedef typename base::pointer pointer; - typedef typename base::const_pointer const_pointer; - typedef typename base::reference reference; - typedef typename base::const_reference const_reference; - typedef typename base::value_type value_type; - secure_allocator() throw() {} - secure_allocator(const secure_allocator& a) throw() : base(a) {} - template <typename U> - secure_allocator(const secure_allocator<U>& a) throw() : base(a) {} - ~secure_allocator() throw() {} - template<typename _Other> struct rebind - { typedef secure_allocator<_Other> other; }; - - T* allocate(std::size_t n, const void *hint = 0) - { - T *p; - p = std::allocator<T>::allocate(n, hint); - if (p != NULL) - mlock(p, sizeof(T) * n); - return p; - } - - void deallocate(T* p, std::size_t n) - { - if (p != NULL) - { - OPENSSL_cleanse(p, sizeof(T) * n); - munlock(p, sizeof(T) * n); - } - std::allocator<T>::deallocate(p, n); - } -}; - - -// -// Allocator that clears its contents before deletion. -// -template<typename T> -struct zero_after_free_allocator : public std::allocator<T> -{ - // MSVC8 default copy constructor is broken - typedef std::allocator<T> base; - typedef typename base::size_type size_type; - typedef typename base::difference_type difference_type; - typedef typename base::pointer pointer; - typedef typename base::const_pointer const_pointer; - typedef typename base::reference reference; - typedef typename base::const_reference const_reference; - typedef typename base::value_type value_type; - zero_after_free_allocator() throw() {} - zero_after_free_allocator(const zero_after_free_allocator& a) throw() : base(a) {} - template <typename U> - zero_after_free_allocator(const zero_after_free_allocator<U>& a) throw() : base(a) {} - ~zero_after_free_allocator() throw() {} - template<typename _Other> struct rebind - { typedef zero_after_free_allocator<_Other> other; }; - - void deallocate(T* p, std::size_t n) - { - if (p != NULL) - OPENSSL_cleanse(p, sizeof(T) * n); - std::allocator<T>::deallocate(p, n); - } -}; @@ -883,39 +732,39 @@ public: typedef vector_type::const_iterator const_iterator; typedef vector_type::reverse_iterator reverse_iterator; - explicit CDataStream(int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION) + explicit CDataStream(int nTypeIn, int nVersionIn) { Init(nTypeIn, nVersionIn); } - CDataStream(const_iterator pbegin, const_iterator pend, int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION) : vch(pbegin, pend) + CDataStream(const_iterator pbegin, const_iterator pend, int nTypeIn, int nVersionIn) : vch(pbegin, pend) { Init(nTypeIn, nVersionIn); } #if !defined(_MSC_VER) || _MSC_VER >= 1300 - CDataStream(const char* pbegin, const char* pend, int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION) : vch(pbegin, pend) + CDataStream(const char* pbegin, const char* pend, int nTypeIn, int nVersionIn) : vch(pbegin, pend) { Init(nTypeIn, nVersionIn); } #endif - CDataStream(const vector_type& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION) : vch(vchIn.begin(), vchIn.end()) + CDataStream(const vector_type& vchIn, int nTypeIn, int nVersionIn) : vch(vchIn.begin(), vchIn.end()) { Init(nTypeIn, nVersionIn); } - CDataStream(const std::vector<char>& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION) : vch(vchIn.begin(), vchIn.end()) + CDataStream(const std::vector<char>& vchIn, int nTypeIn, int nVersionIn) : vch(vchIn.begin(), vchIn.end()) { Init(nTypeIn, nVersionIn); } - CDataStream(const std::vector<unsigned char>& vchIn, int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION) : vch((char*)&vchIn.begin()[0], (char*)&vchIn.end()[0]) + CDataStream(const std::vector<unsigned char>& vchIn, int nTypeIn, int nVersionIn) : vch((char*)&vchIn.begin()[0], (char*)&vchIn.end()[0]) { Init(nTypeIn, nVersionIn); } - void Init(int nTypeIn=SER_NETWORK, int nVersionIn=PROTOCOL_VERSION) + void Init(int nTypeIn, int nVersionIn) { nReadPos = 0; nType = nTypeIn; @@ -1129,7 +978,7 @@ public: } template<typename Stream> - void Serialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) const + void Serialize(Stream& s, int nType, int nVersion) const { // Special case: stream << stream concatenates like stream += stream if (!vch.empty()) @@ -1236,7 +1085,7 @@ public: int nType; int nVersion; - CAutoFile(FILE* filenew=NULL, int nTypeIn=SER_DISK, int nVersionIn=PROTOCOL_VERSION) + CAutoFile(FILE* filenew, int nTypeIn, int nVersionIn) { file = filenew; nType = nTypeIn; @@ -1289,7 +1138,7 @@ public: void ReadVersion() { *this >> nVersion; } void WriteVersion() { *this << nVersion; } - CAutoFile& read(char* pch, int nSize) + CAutoFile& read(char* pch, size_t nSize) { if (!file) throw std::ios_base::failure("CAutoFile::read : file handle is NULL"); @@ -1298,7 +1147,7 @@ public: return (*this); } - CAutoFile& write(const char* pch, int nSize) + CAutoFile& write(const char* pch, size_t nSize) { if (!file) throw std::ios_base::failure("CAutoFile::write : file handle is NULL"); diff --git a/src/strlcpy.h b/src/strlcpy.h index d4d1908e7a..2cc786e953 100644 --- a/src/strlcpy.h +++ b/src/strlcpy.h @@ -15,6 +15,10 @@ */ #ifndef BITCOIN_STRLCPY_H #define BITCOIN_STRLCPY_H + +#include <stdlib.h> +#include <string.h> + /* * Copy src to string dst of size siz. At most siz-1 characters * will be copied. Always NUL terminates (unless siz == 0). diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp index 2cbd4d5dc9..91ae23194c 100644 --- a/src/test/DoS_tests.cpp +++ b/src/test/DoS_tests.cpp @@ -1,7 +1,10 @@ // // Unit tests for denial-of-service detection/prevention code // +#include <algorithm> + #include <boost/assign/list_of.hpp> // for 'map_list_of()' +#include <boost/date_time/posix_time/posix_time_types.hpp> #include <boost/test/unit_test.hpp> #include <boost/foreach.hpp> @@ -13,10 +16,10 @@ #include <stdint.h> // Tests this internal-to-main.cpp method: -extern void AddOrphanTx(const CDataStream& vMsg); -extern int LimitOrphanTxSize(int nMaxOrphans); +extern bool AddOrphanTx(const CDataStream& vMsg); +extern unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans); extern std::map<uint256, CDataStream*> mapOrphanTransactions; -extern std::multimap<uint256, CDataStream*> mapOrphanTransactionsByPrev; +extern std::map<uint256, std::map<uint256, CDataStream*> > mapOrphanTransactionsByPrev; CService ip(uint32_t i) { @@ -57,7 +60,7 @@ BOOST_AUTO_TEST_CASE(DoS_banscore) BOOST_CHECK(!CNode::IsBanned(addr1)); dummyNode1.Misbehaving(1); BOOST_CHECK(CNode::IsBanned(addr1)); - mapArgs["-banscore"] = "100"; + mapArgs.erase("-banscore"); } BOOST_AUTO_TEST_CASE(DoS_bantime) @@ -129,18 +132,10 @@ BOOST_AUTO_TEST_CASE(DoS_checknbits) } -static uint256 RandomHash() -{ - std::vector<unsigned char> randbytes(32); - RAND_bytes(&randbytes[0], 32); - uint256 randomhash(randbytes); - return randomhash; -} - CTransaction RandomOrphan() { std::map<uint256, CDataStream*>::iterator it; - it = mapOrphanTransactions.lower_bound(RandomHash()); + it = mapOrphanTransactions.lower_bound(GetRandHash()); if (it == mapOrphanTransactions.end()) it = mapOrphanTransactions.begin(); const CDataStream* pvMsg = it->second; @@ -162,13 +157,13 @@ BOOST_AUTO_TEST_CASE(DoS_mapOrphans) CTransaction tx; tx.vin.resize(1); tx.vin[0].prevout.n = 0; - tx.vin[0].prevout.hash = RandomHash(); + tx.vin[0].prevout.hash = GetRandHash(); tx.vin[0].scriptSig << OP_1; tx.vout.resize(1); tx.vout[0].nValue = 1*CENT; tx.vout[0].scriptPubKey.SetBitcoinAddress(key.GetPubKey()); - CDataStream ds; + CDataStream ds(SER_DISK, CLIENT_VERSION); ds << tx; AddOrphanTx(ds); } @@ -187,11 +182,37 @@ BOOST_AUTO_TEST_CASE(DoS_mapOrphans) tx.vout[0].scriptPubKey.SetBitcoinAddress(key.GetPubKey()); SignSignature(keystore, txPrev, tx, 0); - CDataStream ds; + CDataStream ds(SER_DISK, CLIENT_VERSION); ds << tx; AddOrphanTx(ds); } + // This really-big orphan should be ignored: + for (int i = 0; i < 10; i++) + { + CTransaction txPrev = RandomOrphan(); + + CTransaction tx; + tx.vout.resize(1); + tx.vout[0].nValue = 1*CENT; + tx.vout[0].scriptPubKey.SetBitcoinAddress(key.GetPubKey()); + tx.vin.resize(500); + for (int j = 0; j < tx.vin.size(); j++) + { + tx.vin[j].prevout.n = j; + tx.vin[j].prevout.hash = txPrev.GetHash(); + } + SignSignature(keystore, txPrev, tx, 0); + // Re-use same signature for other inputs + // (they don't have to be valid for this test) + for (int j = 1; j < tx.vin.size(); j++) + tx.vin[j].scriptSig = tx.vin[0].scriptSig; + + CDataStream ds(SER_DISK, CLIENT_VERSION); + ds << tx; + BOOST_CHECK(!AddOrphanTx(ds)); + } + // Test LimitOrphanTxSize() function: LimitOrphanTxSize(40); BOOST_CHECK(mapOrphanTransactions.size() <= 40); @@ -202,4 +223,92 @@ BOOST_AUTO_TEST_CASE(DoS_mapOrphans) BOOST_CHECK(mapOrphanTransactionsByPrev.empty()); } +BOOST_AUTO_TEST_CASE(DoS_checkSig) +{ + // Test signature caching code (see key.cpp Verify() methods) + + CKey key; + key.MakeNewKey(true); + CBasicKeyStore keystore; + keystore.AddKey(key); + + // 100 orphan transactions: + static const int NPREV=100; + CTransaction orphans[NPREV]; + for (int i = 0; i < NPREV; i++) + { + CTransaction& tx = orphans[i]; + tx.vin.resize(1); + tx.vin[0].prevout.n = 0; + tx.vin[0].prevout.hash = GetRandHash(); + tx.vin[0].scriptSig << OP_1; + tx.vout.resize(1); + tx.vout[0].nValue = 1*CENT; + tx.vout[0].scriptPubKey.SetBitcoinAddress(key.GetPubKey()); + + CDataStream ds(SER_DISK, CLIENT_VERSION); + ds << tx; + AddOrphanTx(ds); + } + + // Create a transaction that depends on orphans: + CTransaction tx; + tx.vout.resize(1); + tx.vout[0].nValue = 1*CENT; + tx.vout[0].scriptPubKey.SetBitcoinAddress(key.GetPubKey()); + tx.vin.resize(NPREV); + for (int j = 0; j < tx.vin.size(); j++) + { + tx.vin[j].prevout.n = 0; + tx.vin[j].prevout.hash = orphans[j].GetHash(); + } + // Creating signatures primes the cache: + boost::posix_time::ptime mst1 = boost::posix_time::microsec_clock::local_time(); + for (int j = 0; j < tx.vin.size(); j++) + BOOST_CHECK(SignSignature(keystore, orphans[j], tx, j)); + boost::posix_time::ptime mst2 = boost::posix_time::microsec_clock::local_time(); + boost::posix_time::time_duration msdiff = mst2 - mst1; + long nOneValidate = msdiff.total_milliseconds(); + if (fDebug) printf("DoS_Checksig sign: %ld\n", nOneValidate); + + // ... now validating repeatedly should be quick: + // 2.8GHz machine, -g build: Sign takes ~760ms, + // uncached Verify takes ~250ms, cached Verify takes ~50ms + // (for 100 single-signature inputs) + mst1 = boost::posix_time::microsec_clock::local_time(); + for (int i = 0; i < 5; i++) + for (int j = 0; j < tx.vin.size(); j++) + BOOST_CHECK(VerifySignature(orphans[j], tx, j, true, SIGHASH_ALL)); + mst2 = boost::posix_time::microsec_clock::local_time(); + msdiff = mst2 - mst1; + long nManyValidate = msdiff.total_milliseconds(); + if (fDebug) printf("DoS_Checksig five: %ld\n", nManyValidate); + + BOOST_CHECK_MESSAGE(nManyValidate < nOneValidate, "Signature cache timing failed"); + + // Empty a signature, validation should fail: + CScript save = tx.vin[0].scriptSig; + tx.vin[0].scriptSig = CScript(); + BOOST_CHECK(!VerifySignature(orphans[0], tx, 0, true, SIGHASH_ALL)); + tx.vin[0].scriptSig = save; + + // Swap signatures, validation should fail: + std::swap(tx.vin[0].scriptSig, tx.vin[1].scriptSig); + BOOST_CHECK(!VerifySignature(orphans[0], tx, 0, true, SIGHASH_ALL)); + BOOST_CHECK(!VerifySignature(orphans[1], tx, 1, true, SIGHASH_ALL)); + std::swap(tx.vin[0].scriptSig, tx.vin[1].scriptSig); + + // Exercise -maxsigcachesize code: + mapArgs["-maxsigcachesize"] = "10"; + // Generate a new, different signature for vin[0] to trigger cache clear: + CScript oldSig = tx.vin[0].scriptSig; + BOOST_CHECK(SignSignature(keystore, orphans[0], tx, 0)); + BOOST_CHECK(tx.vin[0].scriptSig != oldSig); + for (int j = 0; j < tx.vin.size(); j++) + BOOST_CHECK(VerifySignature(orphans[j], tx, j, true, SIGHASH_ALL)); + mapArgs.erase("-maxsigcachesize"); + + LimitOrphanTxSize(0); +} + BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/data/script_invalid.json b/src/test/data/script_invalid.json new file mode 100644 index 0000000000..c05d3ba5b2 --- /dev/null +++ b/src/test/data/script_invalid.json @@ -0,0 +1,25 @@ +[ +["", ""], +["", "NOP"], +["NOP", ""], +["NOP","NOP"], +["0 1","EQUAL"], +["1 1 ADD", "0 EQUAL"], +["11 1 ADD 12 SUB", "11 EQUAL"], + +["2147483648 0 ADD", "NOP", "arithmetic operands must be in range [-2^31...2^31] "], +["-2147483648 0 ADD", "NOP", "arithmetic operands must be in range [-2^31...2^31] "], +["2147483647 DUP ADD", "4294967294 NUMEQUAL", "NUMEQUAL must be in numeric range"], +["0xaabbccddeeff NOT", "0 EQUAL", "NOT is an arithmetic operand"], + +["2 DUP MUL", "4 EQUAL", "disabled"], +["2 DUP DIV", "1 EQUAL", "disabled"], +["2 2MUL", "4 EQUAL", "disabled"], +["2 2DIV", "1 EQUAL", "disabled"], +["7 3 MOD", "1 EQUAL", "disabled"], +["2 2 LSHIFT", "8 EQUAL", "disabled"], +["2 1 RSHIFT", "1 EQUAL", "disabled"], + + +["NOP1","NOP10"] +] diff --git a/src/test/data/script_valid.json b/src/test/data/script_valid.json new file mode 100644 index 0000000000..e7ad6d9cc0 --- /dev/null +++ b/src/test/data/script_valid.json @@ -0,0 +1,78 @@ +[ +["2 -2 ADD", "0 EQUAL"], +["2147483647 -2147483647 ADD", "0 EQUAL"], +["-1 -1 ADD", "-2 EQUAL"], + +["1","NOP"], +["0 0","EQUAL"], +["1 1 ADD", "2 EQUAL"], +["1 1ADD", "2 EQUAL"], +["111 1SUB", "110 EQUAL"], +["111 1 ADD 12 SUB", "100 EQUAL"], +["0 ABS", "0 EQUAL"], +["16 ABS", "16 EQUAL"], +["-16 ABS", "-16 NEGATE EQUAL"], +["0 NOT", "NOP"], +["1 NOT", "0 EQUAL"], +["11 NOT", "0 EQUAL"], +["0 0NOTEQUAL", "0 EQUAL"], +["1 0NOTEQUAL", "1 EQUAL"], +["111 0NOTEQUAL", "1 EQUAL"], +["-111 0NOTEQUAL", "1 EQUAL"], +["1 1 BOOLAND", "NOP"], +["1 0 BOOLAND", "NOT"], +["0 1 BOOLAND", "NOT"], +["0 0 BOOLAND", "NOT"], +["16 17 BOOLAND", "NOP"], +["1 1 BOOLOR", "NOP"], +["1 0 BOOLOR", "NOP"], +["0 1 BOOLOR", "NOP"], +["0 0 BOOLOR", "NOT"], +["16 17 BOOLOR", "NOP"], +["11 10 1 ADD", "NUMEQUAL"], +["11 10 1 ADD", "NUMEQUALVERIFY 1"], +["11 10 1 ADD", "NUMNOTEQUAL NOT"], +["111 10 1 ADD", "NUMNOTEQUAL"], +["11 10", "LESSTHAN NOT"], +["4 4", "LESSTHAN NOT"], +["10 11", "LESSTHAN"], +["-11 11", "LESSTHAN"], +["-11 -10", "LESSTHAN"], +["11 10", "GREATERTHAN"], +["4 4", "GREATERTHAN NOT"], +["10 11", "GREATERTHAN NOT"], +["-11 11", "GREATERTHAN NOT"], +["-11 -10", "GREATERTHAN NOT"], +["11 10", "LESSTHANOREQUAL NOT"], +["4 4", "LESSTHANOREQUAL"], +["10 11", "LESSTHANOREQUAL"], +["-11 11", "LESSTHANOREQUAL"], +["-11 -10", "LESSTHANOREQUAL"], +["11 10", "GREATERTHANOREQUAL"], +["4 4", "GREATERTHANOREQUAL"], +["10 11", "GREATERTHANOREQUAL NOT"], +["-11 11", "GREATERTHANOREQUAL NOT"], +["-11 -10", "GREATERTHANOREQUAL NOT"], +["1 0 MIN", "0 NUMEQUAL"], +["0 1 MIN", "0 NUMEQUAL"], +["-1 0 MIN", "-1 NUMEQUAL"], +["0 -2147483647 MIN", "-2147483647 NUMEQUAL"], +["2147483647 0 MAX", "2147483647 NUMEQUAL"], +["0 100 MAX", "100 NUMEQUAL"], +["-100 0 MAX", "0 NUMEQUAL"], +["0 -2147483647 MAX", "0 NUMEQUAL"], +["0 0 1", "WITHIN"], +["1 0 1", "WITHIN NOT"], +["0 -2147483647 2147483647", "WITHIN"], +["-1 -100 100", "WITHIN"], +["11 -100 100", "WITHIN"], +["-2147483647 -100 100", "WITHIN NOT"], +["2147483647 -100 100", "WITHIN NOT"], + +["2147483647 2147483647 SUB", "0 EQUAL"], +["2147483647 DUP ADD", "4294967294 EQUAL", ">32 bit EQUAL is valid"], +["2147483647 NEGATE DUP ADD", "-4294967294 EQUAL"], + + +["NOP","1"] +] diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index d4abd6d2a7..5712b4a1b1 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -1,6 +1,7 @@ #include <boost/test/unit_test.hpp> #include "uint256.h" +#include "util.h" extern void SHA256Transform(void* pstate, void* pinput, const void* pinit); @@ -11,7 +12,7 @@ BOOST_AUTO_TEST_CASE(sha256transform_equality) unsigned int pSHA256InitState[8] = {0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19}; - unsigned char pstate[32]; + // unsigned char pstate[32]; unsigned char pinput[64]; int i; diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp index 5b8086ffef..505ec8f5f7 100644 --- a/src/test/rpc_tests.cpp +++ b/src/test/rpc_tests.cpp @@ -3,16 +3,11 @@ #include "base58.h" #include "util.h" -#include "json/json_spirit_reader_template.h" -#include "json/json_spirit_writer_template.h" -#include "json/json_spirit_utils.h" +#include "bitcoinrpc.h" using namespace std; using namespace json_spirit; -typedef Value(*rpcfn_type)(const Array& params, bool fHelp); -extern map<string, rpcfn_type> mapCallTable; - BOOST_AUTO_TEST_SUITE(rpc_tests) static Array @@ -27,16 +22,9 @@ createArgs(int nRequired, const char* address1=NULL, const char* address2=NULL) return result; } -// This can be removed this when addmultisigaddress is enabled on main net: -struct TestNetFixture -{ - TestNetFixture() { fTestNet = true; } - ~TestNetFixture() { fTestNet = false; } -}; - -BOOST_FIXTURE_TEST_CASE(rpc_addmultisig, TestNetFixture) +BOOST_AUTO_TEST_CASE(rpc_addmultisig) { - rpcfn_type addmultisig = mapCallTable["addmultisigaddress"]; + rpcfn_type addmultisig = tableRPC["addmultisigaddress"]->actor; // old, 65-byte-long: const char address1Hex[] = "0434e3e09f49ea168c5bbf53f877ff4206923858aab7c7e1df25bc263978107c95e35065a27ef6f1b27222db0ec97e0e895eaca603d3ee0d4c060ce3d8a00286c8"; diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index 493ea69d93..745df4bd7b 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -1,17 +1,171 @@ +#include <iostream> +#include <fstream> #include <vector> -#include <boost/test/unit_test.hpp> +#include <boost/algorithm/string/classification.hpp> +#include <boost/algorithm/string/predicate.hpp> +#include <boost/algorithm/string/replace.hpp> +#include <boost/algorithm/string/split.hpp> #include <boost/foreach.hpp> +#include <boost/preprocessor/stringize.hpp> +#include <boost/test/unit_test.hpp> +#include "json/json_spirit_reader_template.h" +#include "json/json_spirit_writer_template.h" +#include "json/json_spirit_utils.h" #include "main.h" #include "wallet.h" using namespace std; +using namespace json_spirit; +using namespace boost::algorithm; + extern uint256 SignatureHash(CScript scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType); extern bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const CTransaction& txTo, unsigned int nIn, bool fValidatePayToScriptHash, int nHashType); +CScript +ParseScript(string s) +{ + CScript result; + + static map<string, opcodetype> mapOpNames; + + if (mapOpNames.size() == 0) + { + for (int op = OP_NOP; op <= OP_NOP10; op++) + { + const char* name = GetOpName((opcodetype)op); + if (strcmp(name, "OP_UNKNOWN") == 0) + continue; + string strName(name); + mapOpNames[strName] = (opcodetype)op; + // Convenience: OP_ADD and just ADD are both recognized: + replace_first(strName, "OP_", ""); + mapOpNames[strName] = (opcodetype)op; + } + } + + vector<string> words; + split(words, s, is_any_of(" \t\n"), token_compress_on); + + BOOST_FOREACH(string w, words) + { + if (all(w, is_digit()) || + (starts_with(w, "-") && all(string(w.begin()+1, w.end()), is_digit()))) + { + // Number + int64 n = atoi64(w); + result << n; + } + else if (starts_with(w, "0x") && IsHex(string(w.begin()+2, w.end()))) + { + // Hex data: + result << ParseHex(string(w.begin()+2, w.end())); + } + else if (s.size() >= 2 && starts_with(w, "'") && ends_with(w, "'")) + { + // Single-quoted string, pushed as data: + std::vector<unsigned char> value(s.begin()+1, s.end()-1); + result << value; + } + else if (mapOpNames.count(w)) + { + // opcode, e.g. OP_ADD or OP_1: + result << mapOpNames[w]; + } + else + { + BOOST_ERROR("Parse error: " << s); + return CScript(); + } + } + + return result; +} + +Array +read_json(const std::string& filename) +{ + namespace fs = boost::filesystem; + fs::path testFile = fs::current_path() / "test" / "data" / filename; + +#ifdef TEST_DATA_DIR + if (!fs::exists(testFile)) + { + testFile = fs::path(BOOST_PP_STRINGIZE(TEST_DATA_DIR)) / filename; + } +#endif + + ifstream ifs(testFile.string().c_str(), ifstream::in); + Value v; + if (!read_stream(ifs, v)) + { + BOOST_ERROR("Cound not find/open " << filename); + return Array(); + } + if (v.type() != array_type) + { + BOOST_ERROR(filename << " does not contain a json array"); + return Array(); + } + + return v.get_array(); +} + BOOST_AUTO_TEST_SUITE(script_tests) +BOOST_AUTO_TEST_CASE(script_valid) +{ + // Read tests from test/data/script_valid.json + // Format is an array of arrays + // Inner arrays are [ "scriptSig", "scriptPubKey" ] + // ... where scriptSig and scriptPubKey are stringified + // scripts. + Array tests = read_json("script_valid.json"); + + BOOST_FOREACH(Value& tv, tests) + { + Array test = tv.get_array(); + string strTest = write_string(tv, false); + if (test.size() < 2) // Allow size > 2; extra stuff ignored (useful for comments) + { + BOOST_ERROR("Bad test: " << strTest); + continue; + } + string scriptSigString = test[0].get_str(); + CScript scriptSig = ParseScript(scriptSigString); + string scriptPubKeyString = test[1].get_str(); + CScript scriptPubKey = ParseScript(scriptPubKeyString); + + CTransaction tx; + BOOST_CHECK_MESSAGE(VerifyScript(scriptSig, scriptPubKey, tx, 0, true, SIGHASH_NONE), strTest); + } +} + +BOOST_AUTO_TEST_CASE(script_invalid) +{ + // Scripts that should evaluate as invalid + Array tests = read_json("script_invalid.json"); + + BOOST_FOREACH(Value& tv, tests) + { + Array test = tv.get_array(); + string strTest = write_string(tv, false); + if (test.size() < 2) // Allow size > 2; extra stuff ignored (useful for comments) + { + BOOST_ERROR("Bad test: " << strTest); + continue; + } + string scriptSigString = test[0].get_str(); + CScript scriptSig = ParseScript(scriptSigString); + string scriptPubKeyString = test[1].get_str(); + CScript scriptPubKey = ParseScript(scriptPubKeyString); + + CTransaction tx; + BOOST_CHECK_MESSAGE(!VerifyScript(scriptSig, scriptPubKey, tx, 0, true, SIGHASH_NONE), strTest); + } +} + BOOST_AUTO_TEST_CASE(script_PushData) { // Check that PUSHDATA1, PUSHDATA2, and PUSHDATA4 create the same value on diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index 99163e55f2..b680ede9a5 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -12,7 +12,7 @@ BOOST_AUTO_TEST_CASE(basic_transaction_tests) // Random real transaction (e2769b09e784f32f62ef849763d4f45b98e07ba658647343b915ff832b110436) unsigned char ch[] = {0x01, 0x00, 0x00, 0x00, 0x01, 0x6b, 0xff, 0x7f, 0xcd, 0x4f, 0x85, 0x65, 0xef, 0x40, 0x6d, 0xd5, 0xd6, 0x3d, 0x4f, 0xf9, 0x4f, 0x31, 0x8f, 0xe8, 0x20, 0x27, 0xfd, 0x4d, 0xc4, 0x51, 0xb0, 0x44, 0x74, 0x01, 0x9f, 0x74, 0xb4, 0x00, 0x00, 0x00, 0x00, 0x8c, 0x49, 0x30, 0x46, 0x02, 0x21, 0x00, 0xda, 0x0d, 0xc6, 0xae, 0xce, 0xfe, 0x1e, 0x06, 0xef, 0xdf, 0x05, 0x77, 0x37, 0x57, 0xde, 0xb1, 0x68, 0x82, 0x09, 0x30, 0xe3, 0xb0, 0xd0, 0x3f, 0x46, 0xf5, 0xfc, 0xf1, 0x50, 0xbf, 0x99, 0x0c, 0x02, 0x21, 0x00, 0xd2, 0x5b, 0x5c, 0x87, 0x04, 0x00, 0x76, 0xe4, 0xf2, 0x53, 0xf8, 0x26, 0x2e, 0x76, 0x3e, 0x2d, 0xd5, 0x1e, 0x7f, 0xf0, 0xbe, 0x15, 0x77, 0x27, 0xc4, 0xbc, 0x42, 0x80, 0x7f, 0x17, 0xbd, 0x39, 0x01, 0x41, 0x04, 0xe6, 0xc2, 0x6e, 0xf6, 0x7d, 0xc6, 0x10, 0xd2, 0xcd, 0x19, 0x24, 0x84, 0x78, 0x9a, 0x6c, 0xf9, 0xae, 0xa9, 0x93, 0x0b, 0x94, 0x4b, 0x7e, 0x2d, 0xb5, 0x34, 0x2b, 0x9d, 0x9e, 0x5b, 0x9f, 0xf7, 0x9a, 0xff, 0x9a, 0x2e, 0xe1, 0x97, 0x8d, 0xd7, 0xfd, 0x01, 0xdf, 0xc5, 0x22, 0xee, 0x02, 0x28, 0x3d, 0x3b, 0x06, 0xa9, 0xd0, 0x3a, 0xcf, 0x80, 0x96, 0x96, 0x8d, 0x7d, 0xbb, 0x0f, 0x91, 0x78, 0xff, 0xff, 0xff, 0xff, 0x02, 0x8b, 0xa7, 0x94, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x19, 0x76, 0xa9, 0x14, 0xba, 0xde, 0xec, 0xfd, 0xef, 0x05, 0x07, 0x24, 0x7f, 0xc8, 0xf7, 0x42, 0x41, 0xd7, 0x3b, 0xc0, 0x39, 0x97, 0x2d, 0x7b, 0x88, 0xac, 0x40, 0x94, 0xa8, 0x02, 0x00, 0x00, 0x00, 0x00, 0x19, 0x76, 0xa9, 0x14, 0xc1, 0x09, 0x32, 0x48, 0x3f, 0xec, 0x93, 0xed, 0x51, 0xf5, 0xfe, 0x95, 0xe7, 0x25, 0x59, 0xf2, 0xcc, 0x70, 0x43, 0xf9, 0x88, 0xac, 0x00, 0x00, 0x00, 0x00, 0x00}; vector<unsigned char> vch(ch, ch + sizeof(ch) -1); - CDataStream stream(vch); + CDataStream stream(vch, SER_DISK, CLIENT_VERSION); CTransaction tx; stream >> tx; BOOST_CHECK_MESSAGE(tx.CheckTransaction(), "Simple deserialized transaction should be valid."); diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index 94c0c77a44..0393edb1a7 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -15,14 +15,15 @@ BOOST_AUTO_TEST_CASE(util_criticalsection) CCriticalSection cs; do { - CRITICAL_BLOCK(cs) - break; + LOCK(cs); + break; BOOST_ERROR("break was swallowed!"); } while(0); do { - TRY_CRITICAL_BLOCK(cs) + TRY_LOCK(cs, lockTest); + if (lockTest) break; BOOST_ERROR("break was swallowed!"); @@ -87,8 +88,19 @@ BOOST_AUTO_TEST_CASE(util_HexStr) BOOST_CHECK_EQUAL( HexStr(ParseHex_expected, ParseHex_expected + 5, true), "04 67 8a fd b0"); + + BOOST_CHECK_EQUAL( + HexStr(ParseHex_expected, ParseHex_expected, true), + ""); + + std::vector<unsigned char> ParseHex_vec(ParseHex_expected, ParseHex_expected + 5); + + BOOST_CHECK_EQUAL( + HexStr(ParseHex_vec, true), + "04 67 8a fd b0"); } + BOOST_AUTO_TEST_CASE(util_DateTimeStrFormat) { BOOST_CHECK_EQUAL(DateTimeStrFormat("%x %H:%M:%S", 0), "01/01/70 00:00:00"); diff --git a/src/qtui.h b/src/ui_interface.h index e6ca0cb17b..6f3aa48926 100644 --- a/src/qtui.h +++ b/src/ui_interface.h @@ -1,14 +1,13 @@ // Copyright (c) 2010 Satoshi Nakamoto +// Copyright (c) 2012 The Bitcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_EXTERNUI_H -#define BITCOIN_EXTERNUI_H +#ifndef BITCOIN_UI_INTERFACE_H +#define BITCOIN_UI_INTERFACE_H #include <string> -#include <boost/function/function0.hpp> -#include "wallet.h" +#include "util.h" // for int64 -typedef void wxWindow; #define wxYES 0x00000002 #define wxOK 0x00000004 #define wxNO 0x00000008 @@ -38,14 +37,13 @@ typedef void wxWindow; // Force blocking, modal message box dialog (not just notification) #define wxMODAL 0x00040000 -extern int MyMessageBox(const std::string& message, const std::string& caption="Message", int style=wxOK, wxWindow* parent=NULL, int x=-1, int y=-1); -#define wxMessageBox MyMessageBox -extern int ThreadSafeMessageBox(const std::string& message, const std::string& caption, int style=wxOK, wxWindow* parent=NULL, int x=-1, int y=-1); -extern bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption, wxWindow* parent); +/* These UI communication functions are implemented in bitcoin.cpp (for ui) and noui.cpp (no ui) */ + +extern int ThreadSafeMessageBox(const std::string& message, const std::string& caption, int style=wxOK); +extern bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption); extern void ThreadSafeHandleURI(const std::string& strURI); -extern void CalledSetStatusBar(const std::string& strText, int nField); -extern void UIThreadCall(boost::function0<void> fn); extern void MainFrameRepaint(); +extern void AddressBookRepaint(); extern void QueueShutdown(); extern void InitMessage(const std::string &message); extern std::string _(const char* psz); diff --git a/src/uint256.h b/src/uint256.h index c07bce4ea0..fc5ed26592 100644 --- a/src/uint256.h +++ b/src/uint256.h @@ -5,10 +5,9 @@ #ifndef BITCOIN_UINT256_H #define BITCOIN_UINT256_H -#include "serialize.h" - #include <limits.h> #include <stdio.h> +#include <string.h> #include <string> #include <vector> @@ -355,19 +354,22 @@ public: return pn[2*n] | (uint64)pn[2*n+1] << 32; } - unsigned int GetSerializeSize(int nType=0, int nVersion=PROTOCOL_VERSION) const +// unsigned int GetSerializeSize(int nType=0, int nVersion=PROTOCOL_VERSION) const + unsigned int GetSerializeSize(int nType, int nVersion) const { return sizeof(pn); } template<typename Stream> - void Serialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) const +// void Serialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) const + void Serialize(Stream& s, int nType, int nVersion) const { s.write((char*)pn, sizeof(pn)); } template<typename Stream> - void Unserialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) +// void Unserialize(Stream& s, int nType=0, int nVersion=PROTOCOL_VERSION) + void Unserialize(Stream& s, int nType, int nVersion) { s.read((char*)pn, sizeof(pn)); } diff --git a/src/util.cpp b/src/util.cpp index 4c884173fb..07319f0df0 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -2,8 +2,11 @@ // Copyright (c) 2009-2012 The Bitcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "headers.h" + +#include "util.h" #include "strlcpy.h" +#include "version.h" +#include "ui_interface.h" #include <boost/algorithm/string/join.hpp> // Work around clang compilation problem in Boost 1.46: @@ -24,6 +27,31 @@ namespace boost { #include <boost/interprocess/sync/interprocess_recursive_mutex.hpp> #include <boost/foreach.hpp> #include <boost/thread.hpp> +#include <openssl/crypto.h> +#include <openssl/rand.h> + +#ifdef WIN32 +#ifdef _MSC_VER +#pragma warning(disable:4786) +#pragma warning(disable:4804) +#pragma warning(disable:4805) +#pragma warning(disable:4717) +#endif +#ifdef _WIN32_WINNT +#undef _WIN32_WINNT +#endif +#define _WIN32_WINNT 0x0501 +#ifdef _WIN32_IE +#undef _WIN32_IE +#endif +#define _WIN32_IE 0x0400 +#define WIN32_LEAN_AND_MEAN 1 +#ifndef NOMINMAX +#define NOMINMAX +#endif +#include "shlobj.h" +#include "shlwapi.h" +#endif using namespace std; using namespace boost; @@ -33,7 +61,6 @@ map<string, vector<string> > mapMultiArgs; bool fDebug = false; bool fPrintToConsole = false; bool fPrintToDebugger = false; -char pszSetDataDir[MAX_PATH] = ""; bool fRequestShutdown = false; bool fShutdown = false; bool fDaemon = false; @@ -45,16 +72,6 @@ bool fNoListen = false; bool fLogTimestamps = false; CMedianFilter<int64> vTimeOffsets(200,0); - - -// Workaround for "multiple definition of `_tls_used'" -// http://svn.boost.org/trac/boost/ticket/4258 -extern "C" void tss_cleanup_implemented() { } - - - - - // Init OpenSSL library multithreading support static boost::interprocess::interprocess_mutex** ppmutexOpenSSL; void locking_callback(int mode, int i, const char* file, int line) @@ -158,6 +175,12 @@ int GetRandInt(int nMax) return GetRand(nMax); } +uint256 GetRandHash() +{ + uint256 hash; + RAND_bytes((unsigned char*)&hash, sizeof(hash)); + return hash; +} @@ -186,10 +209,8 @@ inline int OutputDebugStringF(const char* pszFormat, ...) if (!fileout) { - char pszFile[MAX_PATH+100]; - GetDataDir(pszFile); - strlcat(pszFile, "/debug.log", sizeof(pszFile)); - fileout = fopen(pszFile, "a"); + boost::filesystem::path pathDebug = GetDataDir() / "debug.log"; + fileout = fopen(pathDebug.string().c_str(), "a"); if (fileout) setbuf(fileout, NULL); // unbuffered } if (fileout) @@ -225,8 +246,8 @@ inline int OutputDebugStringF(const char* pszFormat, ...) static CCriticalSection cs_OutputDebugStringF; // accumulate a line at a time - CRITICAL_BLOCK(cs_OutputDebugStringF) { + LOCK(cs_OutputDebugStringF); static char pszBuffer[50000]; static char* pend; if (pend == NULL) @@ -277,7 +298,7 @@ int my_snprintf(char* buffer, size_t limit, const char* format, ...) va_start(arg_ptr, format); int ret = _vsnprintf(buffer, limit, format, arg_ptr); va_end(arg_ptr); - if (ret < 0 || ret >= limit) + if (ret < 0 || ret >= (int)limit) { ret = limit - 1; buffer[limit-1] = 0; @@ -285,7 +306,7 @@ int my_snprintf(char* buffer, size_t limit, const char* format, ...) return ret; } -string strprintf(const std::string &format, ...) +string real_strprintf(const std::string &format, int dummy, ...) { char buffer[50000]; char* p = buffer; @@ -294,7 +315,7 @@ string strprintf(const std::string &format, ...) loop { va_list arg_ptr; - va_start(arg_ptr, format); + va_start(arg_ptr, dummy); ret = _vsnprintf(p, limit, format.c_str(), arg_ptr); va_end(arg_ptr); if (ret >= 0 && ret < limit) @@ -312,17 +333,16 @@ string strprintf(const std::string &format, ...) return str; } -bool error(const std::string &format, ...) +bool error(const char *format, ...) { char buffer[50000]; int limit = sizeof(buffer); va_list arg_ptr; va_start(arg_ptr, format); - int ret = _vsnprintf(buffer, limit, format.c_str(), arg_ptr); + int ret = _vsnprintf(buffer, limit, format, arg_ptr); va_end(arg_ptr); if (ret < 0 || ret >= limit) { - ret = limit - 1; buffer[limit-1] = 0; } printf("ERROR: %s\n", buffer); @@ -797,129 +817,113 @@ void PrintExceptionContinue(std::exception* pex, const char* pszThread) } #ifdef WIN32 -string MyGetSpecialFolderPath(int nFolder, bool fCreate) +boost::filesystem::path MyGetSpecialFolderPath(int nFolder, bool fCreate) { + namespace fs = boost::filesystem; + char pszPath[MAX_PATH] = ""; if(SHGetSpecialFolderPathA(NULL, pszPath, nFolder, fCreate)) { - return pszPath; + return fs::path(pszPath); } else if (nFolder == CSIDL_STARTUP) { - return string(getenv("USERPROFILE")) + "\\Start Menu\\Programs\\Startup"; + return fs::path(getenv("USERPROFILE")) / "Start Menu" / "Programs" / "Startup"; } else if (nFolder == CSIDL_APPDATA) { - return getenv("APPDATA"); + return fs::path(getenv("APPDATA")); } - return ""; + return fs::path(""); } #endif -string GetDefaultDataDir() +boost::filesystem::path GetDefaultDataDir() { + namespace fs = boost::filesystem; + // Windows: C:\Documents and Settings\username\Application Data\Bitcoin // Mac: ~/Library/Application Support/Bitcoin // Unix: ~/.bitcoin #ifdef WIN32 // Windows - return MyGetSpecialFolderPath(CSIDL_APPDATA, true) + "\\Bitcoin"; + return MyGetSpecialFolderPath(CSIDL_APPDATA, true) / "Bitcoin"; #else + fs::path pathRet; char* pszHome = getenv("HOME"); if (pszHome == NULL || strlen(pszHome) == 0) - pszHome = (char*)"/"; - string strHome = pszHome; - if (strHome[strHome.size()-1] != '/') - strHome += '/'; + pathRet = fs::path("/"); + else + pathRet = fs::path(pszHome); #ifdef MAC_OSX // Mac - strHome += "Library/Application Support/"; - filesystem::create_directory(strHome.c_str()); - return strHome + "Bitcoin"; + pathRet /= "Library/Application Support"; + fs::create_directory(pathRet); + return pathRet / "Bitcoin"; #else // Unix - return strHome + ".bitcoin"; + return pathRet / ".bitcoin"; #endif #endif } -void GetDataDir(char* pszDir) +const boost::filesystem::path &GetDataDir(bool fNetSpecific) { - // pszDir must be at least MAX_PATH length. - int nVariation; - if (pszSetDataDir[0] != 0) - { - strlcpy(pszDir, pszSetDataDir, MAX_PATH); - nVariation = 0; - } - else - { - // This can be called during exceptions by printf, so we cache the - // value so we don't have to do memory allocations after that. - static char pszCachedDir[MAX_PATH]; - if (pszCachedDir[0] == 0) - strlcpy(pszCachedDir, GetDefaultDataDir().c_str(), sizeof(pszCachedDir)); - strlcpy(pszDir, pszCachedDir, MAX_PATH); - nVariation = 1; - } - if (fTestNet) - { - char* p = pszDir + strlen(pszDir); - if (p > pszDir && p[-1] != '/' && p[-1] != '\\') - *p++ = '/'; - strcpy(p, "testnet"); - nVariation += 2; - } - static bool pfMkdir[4]; - if (!pfMkdir[nVariation]) - { - pfMkdir[nVariation] = true; - boost::filesystem::create_directory(pszDir); + namespace fs = boost::filesystem; + + static fs::path pathCached[2]; + static CCriticalSection csPathCached; + static bool cachedPath[2] = {false, false}; + + fs::path &path = pathCached[fNetSpecific]; + + // This can be called during exceptions by printf, so we cache the + // value so we don't have to do memory allocations after that. + if (cachedPath[fNetSpecific]) + return path; + + LOCK(csPathCached); + + if (mapArgs.count("-datadir")) { + path = fs::system_complete(mapArgs["-datadir"]); + if (!fs::is_directory(path)) { + path = ""; + return path; + } + } else { + path = GetDefaultDataDir(); } -} + if (fNetSpecific && GetBoolArg("-testnet", false)) + path /= "testnet"; -string GetDataDir() -{ - char pszDir[MAX_PATH]; - GetDataDir(pszDir); - return pszDir; + fs::create_directory(path); + + cachedPath[fNetSpecific]=true; + return path; } -string GetConfigFile() +boost::filesystem::path GetConfigFile() { namespace fs = boost::filesystem; - fs::path pathConfig(GetArg("-conf", "bitcoin.conf")); - if (!pathConfig.is_complete()) - pathConfig = fs::path(GetDataDir()) / pathConfig; - return pathConfig.string(); + + fs::path pathConfigFile(GetArg("-conf", "bitcoin.conf")); + if (!pathConfigFile.is_complete()) pathConfigFile = GetDataDir(false) / pathConfigFile; + return pathConfigFile; } -bool ReadConfigFile(map<string, string>& mapSettingsRet, +void ReadConfigFile(map<string, string>& mapSettingsRet, map<string, vector<string> >& mapMultiSettingsRet) { namespace fs = boost::filesystem; namespace pod = boost::program_options::detail; - if (mapSettingsRet.count("-datadir")) - { - if (fs::is_directory(fs::system_complete(mapSettingsRet["-datadir"]))) - { - fs::path pathDataDir = fs::system_complete(mapSettingsRet["-datadir"]); - strlcpy(pszSetDataDir, pathDataDir.string().c_str(), sizeof(pszSetDataDir)); - } - else - { - return false; - } - } - fs::ifstream streamConfig(GetConfigFile()); if (!streamConfig.good()) - return true; // No bitcoin.conf file is OK + return; // No bitcoin.conf file is OK set<string> setOptions; setOptions.insert("*"); - + for (pod::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it) { // Don't overwrite existing settings so command line settings override bitcoin.conf @@ -932,21 +936,20 @@ bool ReadConfigFile(map<string, string>& mapSettingsRet, } mapMultiSettingsRet[strKey].push_back(it->value[0]); } - return true; } -string GetPidFile() +boost::filesystem::path GetPidFile() { namespace fs = boost::filesystem; - fs::path pathConfig(GetArg("-pid", "bitcoind.pid")); - if (!pathConfig.is_complete()) - pathConfig = fs::path(GetDataDir()) / pathConfig; - return pathConfig.string(); + + fs::path pathPidFile(GetArg("-pid", "bitcoind.pid")); + if (!pathPidFile.is_complete()) pathPidFile = GetDataDir() / pathPidFile; + return pathPidFile; } -void CreatePidFile(string pidFile, pid_t pid) +void CreatePidFile(const boost::filesystem::path &path, pid_t pid) { - FILE* file = fopen(pidFile.c_str(), "w"); + FILE* file = fopen(path.string().c_str(), "w"); if (file) { fprintf(file, "%d\n", pid); @@ -967,8 +970,8 @@ int GetFilesize(FILE* file) void ShrinkDebugFile() { // Scroll debug.log if it's getting too big - string strFile = GetDataDir() + "/debug.log"; - FILE* file = fopen(strFile.c_str(), "r"); + boost::filesystem::path pathLog = GetDataDir() / "debug.log"; + FILE* file = fopen(pathLog.string().c_str(), "r"); if (file && GetFilesize(file) > 10 * 1000000) { // Restart the file with some of the end @@ -977,7 +980,7 @@ void ShrinkDebugFile() int nBytes = fread(pch, 1, sizeof(pch), file); fclose(file); - file = fopen(strFile.c_str(), "w"); + file = fopen(pathLog.string().c_str(), "w"); if (file) { fwrite(pch, 1, nBytes, file); @@ -1061,7 +1064,7 @@ void AddTimeData(const CNetAddr& ip, int64 nTime) string strMessage = _("Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly."); strMiscWarning = strMessage; printf("*** %s\n", strMessage.c_str()); - boost::thread(boost::bind(ThreadSafeMessageBox, strMessage+" ", string("Bitcoin"), wxOK | wxICON_EXCLAMATION, (wxWindow*)NULL, -1, -1)); + ThreadSafeMessageBox(strMessage+" ", string("Bitcoin"), wxOK | wxICON_EXCLAMATION); } } } @@ -1091,12 +1094,7 @@ string FormatVersion(int nVersion) string FormatFullVersion() { - string s = FormatVersion(CLIENT_VERSION); - if (VERSION_IS_BETA) { - s += "-"; - s += _("beta"); - } - return s; + return CLIENT_BUILD; } // Format the subversion field according to BIP 14 spec (https://en.bitcoin.it/wiki/BIP_0014) @@ -1111,6 +1109,149 @@ std::string FormatSubVersion(const std::string& name, int nClientVersion, const return ss.str(); } +#ifdef WIN32 +boost::filesystem::path static StartupShortcutPath() +{ + return MyGetSpecialFolderPath(CSIDL_STARTUP, true) / "Bitcoin.lnk"; +} + +bool GetStartOnSystemStartup() +{ + return filesystem::exists(StartupShortcutPath()); +} + +bool SetStartOnSystemStartup(bool fAutoStart) +{ + // If the shortcut exists already, remove it for updating + boost::filesystem::remove(StartupShortcutPath()); + + if (fAutoStart) + { + CoInitialize(NULL); + + // Get a pointer to the IShellLink interface. + IShellLink* psl = NULL; + HRESULT hres = CoCreateInstance(CLSID_ShellLink, NULL, + CLSCTX_INPROC_SERVER, IID_IShellLink, + reinterpret_cast<void**>(&psl)); + + if (SUCCEEDED(hres)) + { + // Get the current executable path + TCHAR pszExePath[MAX_PATH]; + GetModuleFileName(NULL, pszExePath, sizeof(pszExePath)); + + TCHAR pszArgs[5] = TEXT("-min"); + + // Set the path to the shortcut target + psl->SetPath(pszExePath); + PathRemoveFileSpec(pszExePath); + psl->SetWorkingDirectory(pszExePath); + psl->SetShowCmd(SW_SHOWMINNOACTIVE); + psl->SetArguments(pszArgs); + + // Query IShellLink for the IPersistFile interface for + // saving the shortcut in persistent storage. + IPersistFile* ppf = NULL; + hres = psl->QueryInterface(IID_IPersistFile, + reinterpret_cast<void**>(&ppf)); + if (SUCCEEDED(hres)) + { + WCHAR pwsz[MAX_PATH]; + // Ensure that the string is ANSI. + MultiByteToWideChar(CP_ACP, 0, StartupShortcutPath().string().c_str(), -1, pwsz, MAX_PATH); + // Save the link by calling IPersistFile::Save. + hres = ppf->Save(pwsz, TRUE); + ppf->Release(); + psl->Release(); + CoUninitialize(); + return true; + } + psl->Release(); + } + CoUninitialize(); + return false; + } + return true; +} + +#elif defined(LINUX) + +// Follow the Desktop Application Autostart Spec: +// http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html + +boost::filesystem::path static GetAutostartDir() +{ + namespace fs = boost::filesystem; + + char* pszConfigHome = getenv("XDG_CONFIG_HOME"); + if (pszConfigHome) return fs::path(pszConfigHome) / "autostart"; + char* pszHome = getenv("HOME"); + if (pszHome) return fs::path(pszHome) / ".config" / "autostart"; + return fs::path(); +} + +boost::filesystem::path static GetAutostartFilePath() +{ + return GetAutostartDir() / "bitcoin.desktop"; +} + +bool GetStartOnSystemStartup() +{ + boost::filesystem::ifstream optionFile(GetAutostartFilePath()); + if (!optionFile.good()) + return false; + // Scan through file for "Hidden=true": + string line; + while (!optionFile.eof()) + { + getline(optionFile, line); + if (line.find("Hidden") != string::npos && + line.find("true") != string::npos) + return false; + } + optionFile.close(); + + return true; +} + +bool SetStartOnSystemStartup(bool fAutoStart) +{ + if (!fAutoStart) + boost::filesystem::remove(GetAutostartFilePath()); + else + { + char pszExePath[MAX_PATH+1]; + memset(pszExePath, 0, sizeof(pszExePath)); + if (readlink("/proc/self/exe", pszExePath, sizeof(pszExePath)-1) == -1) + return false; + + boost::filesystem::create_directories(GetAutostartDir()); + + boost::filesystem::ofstream optionFile(GetAutostartFilePath(), ios_base::out|ios_base::trunc); + if (!optionFile.good()) + return false; + // Write a bitcoin.desktop file to the autostart directory: + optionFile << "[Desktop Entry]\n"; + optionFile << "Type=Application\n"; + optionFile << "Name=Bitcoin\n"; + optionFile << "Exec=" << pszExePath << " -min\n"; + optionFile << "Terminal=false\n"; + optionFile << "Hidden=false\n"; + optionFile.close(); + } + return true; +} +#else + +// TODO: OSX startup stuff; see: +// https://developer.apple.com/library/mac/#documentation/MacOSX/Conceptual/BPSystemStartup/Articles/CustomLogin.html + +bool GetStartOnSystemStartup() { return false; } +bool SetStartOnSystemStartup(bool fAutoStart) { return false; } + +#endif + #ifdef DEBUG_LOCKORDER @@ -1145,25 +1286,25 @@ private: int sourceLine; }; -typedef std::vector< std::pair<CCriticalSection*, CLockLocation> > LockStack; +typedef std::vector< std::pair<void*, CLockLocation> > LockStack; static boost::interprocess::interprocess_mutex dd_mutex; -static std::map<std::pair<CCriticalSection*, CCriticalSection*>, LockStack> lockorders; +static std::map<std::pair<void*, void*>, LockStack> lockorders; static boost::thread_specific_ptr<LockStack> lockstack; -static void potential_deadlock_detected(const std::pair<CCriticalSection*, CCriticalSection*>& mismatch, const LockStack& s1, const LockStack& s2) +static void potential_deadlock_detected(const std::pair<void*, void*>& mismatch, const LockStack& s1, const LockStack& s2) { printf("POTENTIAL DEADLOCK DETECTED\n"); printf("Previous lock order was:\n"); - BOOST_FOREACH(const PAIRTYPE(CCriticalSection*, CLockLocation)& i, s2) + BOOST_FOREACH(const PAIRTYPE(void*, CLockLocation)& i, s2) { if (i.first == mismatch.first) printf(" (1)"); if (i.first == mismatch.second) printf(" (2)"); printf(" %s\n", i.second.ToString().c_str()); } printf("Current lock order is:\n"); - BOOST_FOREACH(const PAIRTYPE(CCriticalSection*, CLockLocation)& i, s1) + BOOST_FOREACH(const PAIRTYPE(void*, CLockLocation)& i, s1) { if (i.first == mismatch.first) printf(" (1)"); if (i.first == mismatch.second) printf(" (2)"); @@ -1171,7 +1312,7 @@ static void potential_deadlock_detected(const std::pair<CCriticalSection*, CCrit } } -static void push_lock(CCriticalSection* c, const CLockLocation& locklocation) +static void push_lock(void* c, const CLockLocation& locklocation, bool fTry) { bool fOrderOK = true; if (lockstack.get() == NULL) @@ -1182,16 +1323,16 @@ static void push_lock(CCriticalSection* c, const CLockLocation& locklocation) (*lockstack).push_back(std::make_pair(c, locklocation)); - BOOST_FOREACH(const PAIRTYPE(CCriticalSection*, CLockLocation)& i, (*lockstack)) + if (!fTry) BOOST_FOREACH(const PAIRTYPE(void*, CLockLocation)& i, (*lockstack)) { if (i.first == c) break; - std::pair<CCriticalSection*, CCriticalSection*> p1 = std::make_pair(i.first, c); + std::pair<void*, void*> p1 = std::make_pair(i.first, c); if (lockorders.count(p1)) continue; lockorders[p1] = (*lockstack); - std::pair<CCriticalSection*, CCriticalSection*> p2 = std::make_pair(c, i.first); + std::pair<void*, void*> p2 = std::make_pair(c, i.first); if (lockorders.count(p2)) { potential_deadlock_detected(p1, lockorders[p2], lockorders[p1]); @@ -1213,62 +1354,14 @@ static void pop_lock() dd_mutex.unlock(); } -void CCriticalSection::Enter(const char* pszName, const char* pszFile, int nLine) -{ - push_lock(this, CLockLocation(pszName, pszFile, nLine)); -#ifdef DEBUG_LOCKCONTENTION - bool result = mutex.try_lock(); - if (!result) - { - printf("LOCKCONTENTION: %s\n", pszName); - printf("Locker: %s:%d\n", pszFile, nLine); - mutex.lock(); - printf("Locked\n"); - } -#else - mutex.lock(); -#endif -} -void CCriticalSection::Leave() -{ - mutex.unlock(); - pop_lock(); -} -bool CCriticalSection::TryEnter(const char* pszName, const char* pszFile, int nLine) -{ - push_lock(this, CLockLocation(pszName, pszFile, nLine)); - bool result = mutex.try_lock(); - if (!result) pop_lock(); - return result; -} - -#else - -void CCriticalSection::Enter(const char* pszName, const char* pszFile, int nLine) +void EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs, bool fTry) { -#ifdef DEBUG_LOCKCONTENTION - bool result = mutex.try_lock(); - if (!result) - { - printf("LOCKCONTENTION: %s\n", pszName); - printf("Locker: %s:%d\n", pszFile, nLine); - mutex.lock(); - } -#else - mutex.lock(); -#endif -} - -void CCriticalSection::Leave() -{ - mutex.unlock(); + push_lock(cs, CLockLocation(pszName, pszFile, nLine), fTry); } -bool CCriticalSection::TryEnter(const char*, const char*, int) +void LeaveCritical() { - bool result = mutex.try_lock(); - return result; + pop_lock(); } #endif /* DEBUG_LOCKORDER */ - diff --git a/src/util.h b/src/util.h index 9910c338af..a19387f7e7 100644 --- a/src/util.h +++ b/src/util.h @@ -11,24 +11,34 @@ #include <sys/types.h> #include <sys/time.h> #include <sys/resource.h> +#else +typedef int pid_t; /* define for Windows compatibility */ #endif #include <map> #include <vector> #include <string> #include <boost/thread.hpp> +#include <boost/filesystem.hpp> +#include <boost/filesystem/path.hpp> #include <boost/interprocess/sync/interprocess_recursive_mutex.hpp> +#include <boost/interprocess/sync/scoped_lock.hpp> +#include <boost/interprocess/sync/interprocess_semaphore.hpp> +#include <boost/interprocess/sync/lock_options.hpp> #include <boost/date_time/gregorian/gregorian_types.hpp> #include <boost/date_time/posix_time/posix_time_types.hpp> #include <openssl/sha.h> #include <openssl/ripemd.h> -#include "netbase.h" +#include "netbase.h" // for AddTimeData typedef long long int64; typedef unsigned long long uint64; +static const int64 COIN = 100000000; +static const int64 CENT = 1000000; + #define loop for (;;) #define BEGIN(a) ((char*)&(a)) #define END(a) ((char*)&((&(a))[1])) @@ -93,13 +103,6 @@ inline void Sleep(int64 n) } #endif -#if !defined(QT_GUI) -inline const char* _(const char* psz) -{ - return psz; -} -#endif - @@ -113,7 +116,6 @@ extern std::map<std::string, std::vector<std::string> > mapMultiArgs; extern bool fDebug; extern bool fPrintToConsole; extern bool fPrintToDebugger; -extern char pszSetDataDir[MAX_PATH]; extern bool fRequestShutdown; extern bool fShutdown; extern bool fDaemon; @@ -128,8 +130,15 @@ void RandAddSeed(); void RandAddSeedPerfmon(); int OutputDebugStringF(const char* pszFormat, ...); int my_snprintf(char* buffer, size_t limit, const char* format, ...); -std::string strprintf(const std::string &format, ...); -bool error(const std::string &format, ...); + +/* It is not allowed to use va_start with a pass-by-reference argument. + (C++ standard, 18.7, paragraph 3). Use a dummy argument to work around this, and use a + macro to keep similar semantics. +*/ +std::string real_strprintf(const std::string &format, int dummy, ...); +#define strprintf(format, ...) real_strprintf(format, 0, __VA_ARGS__) + +bool error(const char *format, ...); void LogException(std::exception* pex, const char* pszThread); void PrintException(std::exception* pex, const char* pszThread); void PrintExceptionContinue(std::exception* pex, const char* pszThread); @@ -148,19 +157,18 @@ void ParseParameters(int argc, const char*const argv[]); bool WildcardMatch(const char* psz, const char* mask); bool WildcardMatch(const std::string& str, const std::string& mask); int GetFilesize(FILE* file); -void GetDataDir(char* pszDirRet); -std::string GetConfigFile(); -std::string GetPidFile(); -void CreatePidFile(std::string pidFile, pid_t pid); -bool ReadConfigFile(std::map<std::string, std::string>& mapSettingsRet, std::map<std::string, std::vector<std::string> >& mapMultiSettingsRet); -#ifdef WIN32 -std::string MyGetSpecialFolderPath(int nFolder, bool fCreate); -#endif -std::string GetDefaultDataDir(); -std::string GetDataDir(); +boost::filesystem::path GetDefaultDataDir(); +const boost::filesystem::path &GetDataDir(bool fNetSpecific = true); +boost::filesystem::path GetConfigFile(); +boost::filesystem::path GetPidFile(); +void CreatePidFile(const boost::filesystem::path &path, pid_t pid); +void ReadConfigFile(std::map<std::string, std::string>& mapSettingsRet, std::map<std::string, std::vector<std::string> >& mapMultiSettingsRet); +bool GetStartOnSystemStartup(); +bool SetStartOnSystemStartup(bool fAutoStart); void ShrinkDebugFile(); int GetRandInt(int nMax); uint64 GetRand(uint64 nMax); +uint256 GetRandHash(); int64 GetTime(); void SetMockTime(int64 nMockTimeIn); int64 GetAdjustedTime(); @@ -178,95 +186,151 @@ void AddTimeData(const CNetAddr& ip, int64 nTime); +/** Wrapped boost mutex: supports recursive locking, but no waiting */ +typedef boost::interprocess::interprocess_recursive_mutex CCriticalSection; -/** Wrapper to automatically initialize mutex. */ -class CCriticalSection -{ -protected: - boost::interprocess::interprocess_recursive_mutex mutex; -public: - explicit CCriticalSection() { } - ~CCriticalSection() { } - void Enter(const char* pszName, const char* pszFile, int nLine); - void Leave(); - bool TryEnter(const char* pszName, const char* pszFile, int nLine); -}; +/** Wrapped boost mutex: supports waiting but not recursive locking */ +typedef boost::interprocess::interprocess_mutex CWaitableCriticalSection; -/** RAII object that acquires mutex. Needed for exception safety. */ -class CCriticalBlock -{ -protected: - CCriticalSection* pcs; +#ifdef DEBUG_LOCKORDER +void EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs, bool fTry = false); +void LeaveCritical(); +#else +void static inline EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs, bool fTry = false) {} +void static inline LeaveCritical() {} +#endif +/** Wrapper around boost::interprocess::scoped_lock */ +template<typename Mutex> +class CMutexLock +{ +private: + boost::interprocess::scoped_lock<Mutex> lock; public: - CCriticalBlock(CCriticalSection& csIn, const char* pszName, const char* pszFile, int nLine) + + void Enter(const char* pszName, const char* pszFile, int nLine) { - pcs = &csIn; - pcs->Enter(pszName, pszFile, nLine); + if (!lock.owns()) + { + EnterCritical(pszName, pszFile, nLine, (void*)(lock.mutex())); +#ifdef DEBUG_LOCKCONTENTION + if (!lock.try_lock()) + { + printf("LOCKCONTENTION: %s\n", pszName); + printf("Locker: %s:%d\n", pszFile, nLine); +#endif + lock.lock(); +#ifdef DEBUG_LOCKCONTENTION + } +#endif + } } - operator bool() const + void Leave() { - return true; + if (lock.owns()) + { + lock.unlock(); + LeaveCritical(); + } } - ~CCriticalBlock() + bool TryEnter(const char* pszName, const char* pszFile, int nLine) { - pcs->Leave(); + if (!lock.owns()) + { + EnterCritical(pszName, pszFile, nLine, (void*)(lock.mutex()), true); + lock.try_lock(); + if (!lock.owns()) + LeaveCritical(); + } + return lock.owns(); } -}; - -#define CRITICAL_BLOCK(cs) \ - if (CCriticalBlock criticalblock = CCriticalBlock(cs, #cs, __FILE__, __LINE__)) - -#define ENTER_CRITICAL_SECTION(cs) \ - (cs).Enter(#cs, __FILE__, __LINE__) - -#define LEAVE_CRITICAL_SECTION(cs) \ - (cs).Leave() -/** RAII object that tries to acquire mutex. Needed for exception safety. */ -class CTryCriticalBlock -{ -protected: - CCriticalSection* pcs; + CMutexLock(Mutex& mutexIn, const char* pszName, const char* pszFile, int nLine, bool fTry = false) : lock(mutexIn, boost::interprocess::defer_lock) + { + if (fTry) + TryEnter(pszName, pszFile, nLine); + else + Enter(pszName, pszFile, nLine); + } -public: - CTryCriticalBlock(CCriticalSection& csIn, const char* pszName, const char* pszFile, int nLine) + ~CMutexLock() { - pcs = (csIn.TryEnter(pszName, pszFile, nLine) ? &csIn : NULL); + if (lock.owns()) + LeaveCritical(); } - operator bool() const + operator bool() { - return Entered(); + return lock.owns(); } - ~CTryCriticalBlock() + boost::interprocess::scoped_lock<Mutex> &GetLock() { - if (pcs) - { - pcs->Leave(); - } + return lock; } - bool Entered() const { return pcs != NULL; } }; -#define TRY_CRITICAL_BLOCK(cs) \ - if (CTryCriticalBlock criticalblock = CTryCriticalBlock(cs, #cs, __FILE__, __LINE__)) - - - +typedef CMutexLock<CCriticalSection> CCriticalBlock; +#define LOCK(cs) CCriticalBlock criticalblock(cs, #cs, __FILE__, __LINE__) +#define LOCK2(cs1,cs2) CCriticalBlock criticalblock1(cs1, #cs1, __FILE__, __LINE__),criticalblock2(cs2, #cs2, __FILE__, __LINE__) +#define TRY_LOCK(cs,name) CCriticalBlock name(cs, #cs, __FILE__, __LINE__, true) +#define ENTER_CRITICAL_SECTION(cs) \ + { \ + EnterCritical(#cs, __FILE__, __LINE__, (void*)(&cs)); \ + (cs).lock(); \ + } -// This is exactly like std::string, but with a custom allocator. -// (secure_allocator<> is defined in serialize.h) -typedef std::basic_string<char, std::char_traits<char>, secure_allocator<char> > SecureString; +#define LEAVE_CRITICAL_SECTION(cs) \ + { \ + (cs).unlock(); \ + LeaveCritical(); \ + } +#ifdef MAC_OSX +// boost::interprocess::interprocess_semaphore seems to spinlock on OSX; prefer polling instead +class CSemaphore +{ +private: + CCriticalSection cs; + int val; +public: + CSemaphore(int init) : val(init) {} + + void wait() { + do { + { + LOCK(cs); + if (val>0) { + val--; + return; + } + } + Sleep(100); + } while(1); + } + bool try_wait() { + LOCK(cs); + if (val>0) { + val--; + return true; + } + return false; + } + void post() { + LOCK(cs); + val++; + } +}; +#else +typedef boost::interprocess::interprocess_semaphore CSemaphore; +#endif inline std::string i64tostr(int64 n) { @@ -319,15 +383,20 @@ inline int64 abs64(int64 n) template<typename T> std::string HexStr(const T itbegin, const T itend, bool fSpaces=false) { - if (itbegin == itend) - return ""; - const unsigned char* pbegin = (const unsigned char*)&itbegin[0]; - const unsigned char* pend = pbegin + (itend - itbegin) * sizeof(itbegin[0]); - std::string str; - str.reserve((pend-pbegin) * (fSpaces ? 3 : 2)); - for (const unsigned char* p = pbegin; p != pend; p++) - str += strprintf((fSpaces && p != pend-1 ? "%02x " : "%02x"), *p); - return str; + std::vector<char> rv; + static char hexmap[16] = { '0', '1', '2', '3', '4', '5', '6', '7', + '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; + rv.reserve((itend-itbegin)*3); + for(T it = itbegin; it < itend; ++it) + { + unsigned char val = (unsigned char)(*it); + if(fSpaces && it != itbegin) + rv.push_back(' '); + rv.push_back(hexmap[val>>4]); + rv.push_back(hexmap[val&15]); + } + + return std::string(rv.begin(), rv.end()); } inline std::string HexStr(const std::vector<unsigned char>& vch, bool fSpaces=false) @@ -532,9 +601,9 @@ template <typename T> class CMedianFilter private: std::vector<T> vValues; std::vector<T> vSorted; - int nSize; + unsigned int nSize; public: - CMedianFilter(int size, T initial_value): + CMedianFilter(unsigned int size, T initial_value): nSize(size) { vValues.reserve(size); @@ -666,26 +735,6 @@ inline void ExitThread(size_t nExitCode) -inline bool AffinityBugWorkaround(void(*pfn)(void*)) -{ -#ifdef WIN32 - // Sometimes after a few hours affinity gets stuck on one processor - DWORD_PTR dwProcessAffinityMask = -1; - DWORD_PTR dwSystemAffinityMask = -1; - GetProcessAffinityMask(GetCurrentProcess(), &dwProcessAffinityMask, &dwSystemAffinityMask); - DWORD dwPrev1 = SetThreadAffinityMask(GetCurrentThread(), dwProcessAffinityMask); - DWORD dwPrev2 = SetThreadAffinityMask(GetCurrentThread(), dwProcessAffinityMask); - if (dwPrev2 != dwProcessAffinityMask) - { - printf("AffinityBugWorkaround() : SetThreadAffinityMask=%d, ProcessAffinityMask=%d, restarting thread\n", dwPrev2, dwProcessAffinityMask); - if (!CreateThread(pfn, NULL)) - printf("Error: CreateThread() failed\n"); - return true; - } -#endif - return false; -} - inline uint32_t ByteReverse(uint32_t value) { value = ((value & 0xFF00FF00) >> 8) | ((value & 0x00FF00FF) << 8); diff --git a/src/version.cpp b/src/version.cpp new file mode 100644 index 0000000000..60b7aae2e5 --- /dev/null +++ b/src/version.cpp @@ -0,0 +1,67 @@ +// Copyright (c) 2012 The Bitcoin developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include <string> + +#include "version.h" + +// Name of client reported in the 'version' message. Report the same name +// for both bitcoind and bitcoin-qt, to make it harder for attackers to +// target servers or GUI users specifically. +const std::string CLIENT_NAME("Satoshi"); + +// Client version number +#define CLIENT_VERSION_SUFFIX "-beta" + + +// The following part of the code determines the CLIENT_BUILD variable. +// Several mechanisms are used for this: +// * first, if HAVE_BUILD_INFO is defined, include build.h, a file that is +// generated by the build environment, possibly containing the output +// of git-describe in a macro called BUILD_DESC +// * secondly, if this is an exported version of the code, GIT_ARCHIVE will +// be defined (automatically using the export-subst git attribute), and +// GIT_COMMIT will contain the commit id. +// * then, three options exist for determining CLIENT_BUILD: +// * if BUILD_DESC is defined, use that literally (output of git-describe) +// * if not, but GIT_COMMIT is defined, use v[maj].[min].[rev].[build]-g[commit] +// * otherwise, use v[maj].[min].[rev].[build]-unk +// finally CLIENT_VERSION_SUFFIX is added + +// First, include build.h if requested +#ifdef HAVE_BUILD_INFO +# include "build.h" +#endif + +// git will put "#define GIT_ARCHIVE 1" on the next line inside archives. $Format:%n#define GIT_ARCHIVE 1$ +#ifdef GIT_ARCHIVE +# define GIT_COMMIT_ID "$Format:%h$" +# define GIT_COMMIT_DATE "$Format:%cD" +#endif + +#define STRINGIFY(s) #s + +#define BUILD_DESC_FROM_COMMIT(maj,min,rev,build,commit) \ + "v" STRINGIFY(maj) "." STRINGIFY(min) "." STRINGIFY(rev) "." STRINGIFY(build) "-g" commit + +#define BUILD_DESC_FROM_UNKNOWN(maj,min,rev,build) \ + "v" STRINGIFY(maj) "." STRINGIFY(min) "." STRINGIFY(rev) "." STRINGIFY(build) "-unk" + +#ifndef BUILD_DESC +# ifdef GIT_COMMIT_ID +# define BUILD_DESC BUILD_DESC_FROM_COMMIT(CLIENT_VERSION_MAJOR, CLIENT_VERSION_MINOR, CLIENT_VERSION_REVISION, CLIENT_VERSION_BUILD, GIT_COMMIT_ID) +# else +# define BUILD_DESC BUILD_DESC_FROM_UNKNOWN(CLIENT_VERSION_MAJOR, CLIENT_VERSION_MINOR, CLIENT_VERSION_REVISION, CLIENT_VERSION_BUILD) +# endif +#endif + +#ifndef BUILD_DATE +# ifdef GIT_COMMIT_DATE +# define BUILD_DATE GIT_COMMIT_DATE +# else +# define BUILD_DATE __DATE__ ", " __TIME__ +# endif +#endif + +const std::string CLIENT_BUILD(BUILD_DESC CLIENT_VERSION_SUFFIX); +const std::string CLIENT_DATE(BUILD_DATE); diff --git a/src/version.h b/src/version.h new file mode 100644 index 0000000000..38bf9ce45a --- /dev/null +++ b/src/version.h @@ -0,0 +1,49 @@ +// Copyright (c) 2012 The Bitcoin developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. +#ifndef BITCOIN_VERSION_H +#define BITCOIN_VERSION_H + +#include <string> + +// +// client versioning +// + +// These need to be macros, as version.cpp's voodoo requires it +#define CLIENT_VERSION_MAJOR 0 +#define CLIENT_VERSION_MINOR 6 +#define CLIENT_VERSION_REVISION 4 +#define CLIENT_VERSION_BUILD 0 + +static const int CLIENT_VERSION = + 1000000 * CLIENT_VERSION_MAJOR + + 10000 * CLIENT_VERSION_MINOR + + 100 * CLIENT_VERSION_REVISION + + 1 * CLIENT_VERSION_BUILD; + +extern const std::string CLIENT_NAME; +extern const std::string CLIENT_BUILD; +extern const std::string CLIENT_DATE; + +// +// network protocol versioning +// + +static const int PROTOCOL_VERSION = 60001; + +// earlier versions not supported as of Feb 2012, and are disconnected +static const int MIN_PROTO_VERSION = 209; + +// nTime field added to CAddress, starting with this version; +// if possible, avoid requesting addresses nodes older than this +static const int CADDR_TIME_VERSION = 31402; + +// only request blocks from nodes outside this range of versions +static const int NOBLKS_VERSION_START = 32000; +static const int NOBLKS_VERSION_END = 32400; + +// BIP 0031, pong message, is enabled for all versions AFTER this one +static const int BIP0031_VERSION = 60000; + +#endif diff --git a/src/wallet.cpp b/src/wallet.cpp index fb2fc7efbc..c115a53340 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -3,9 +3,10 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "headers.h" -#include "db.h" +#include "wallet.h" +#include "walletdb.h" #include "crypter.h" +#include "ui_interface.h" using namespace std; @@ -49,8 +50,8 @@ bool CWallet::AddCryptedKey(const vector<unsigned char> &vchPubKey, const vector return false; if (!fFileBacked) return true; - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); if (pwalletdbEncryption) return pwalletdbEncryption->WriteCryptedKey(vchPubKey, vchCryptedSecret); else @@ -76,7 +77,8 @@ bool CWallet::Unlock(const SecureString& strWalletPassphrase) CCrypter crypter; CKeyingMaterial vMasterKey; - CRITICAL_BLOCK(cs_wallet) + { + LOCK(cs_wallet); BOOST_FOREACH(const MasterKeyMap::value_type& pMasterKey, mapMasterKeys) { if(!crypter.SetKeyFromPassphrase(strWalletPassphrase, pMasterKey.second.vchSalt, pMasterKey.second.nDeriveIterations, pMasterKey.second.nDerivationMethod)) @@ -86,6 +88,7 @@ bool CWallet::Unlock(const SecureString& strWalletPassphrase) if (CCryptoKeyStore::Unlock(vMasterKey)) return true; } + } return false; } @@ -93,8 +96,8 @@ bool CWallet::ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase, { bool fWasLocked = IsLocked(); - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); Lock(); CCrypter crypter; @@ -135,6 +138,11 @@ bool CWallet::ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase, return false; } +void CWallet::SetBestChain(const CBlockLocator& loc) +{ + CWalletDB walletdb(strWalletFile); + walletdb.WriteBestBlock(loc); +} // This class implements an addrIncoming entry that causes pre-0.4 // clients to crash on startup if reading a private-key-encrypted wallet. @@ -228,8 +236,8 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase) if (!crypter.Encrypt(vMasterKey, kMasterKey.vchCryptedKey)) return false; - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); mapMasterKeys[++nMasterKeyMaxID] = kMasterKey; if (fFileBacked) { @@ -276,8 +284,8 @@ void CWallet::WalletUpdateSpent(const CTransaction &tx) // Anytime a signature is successfully verified, it's proof the outpoint is spent. // Update the wallet spent flag if it doesn't know due to wallet.dat being // restored from backup or the user making copies of wallet.dat. - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); BOOST_FOREACH(const CTxIn& txin, tx.vin) { map<uint256, CWalletTx>::iterator mi = mapWallet.find(txin.prevout.hash); @@ -298,8 +306,8 @@ void CWallet::WalletUpdateSpent(const CTransaction &tx) void CWallet::MarkDirty() { - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); BOOST_FOREACH(PAIRTYPE(const uint256, CWalletTx)& item, mapWallet) item.second.MarkDirty(); } @@ -308,8 +316,8 @@ void CWallet::MarkDirty() bool CWallet::AddToWallet(const CWalletTx& wtxIn) { uint256 hash = wtxIn.GetHash(); - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); // Inserts only if not already there, returns tx inserted or tx found pair<map<uint256, CWalletTx>::iterator, bool> ret = mapWallet.insert(make_pair(hash, wtxIn)); CWalletTx& wtx = (*ret.first).second; @@ -383,8 +391,8 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn) bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate, bool fFindBlock) { uint256 hash = tx.GetHash(); - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); bool fExisted = mapWallet.count(hash); if (fExisted && !fUpdate) return false; if (fExisted || IsMine(tx) || IsFromMe(tx)) @@ -405,8 +413,8 @@ bool CWallet::EraseFromWallet(uint256 hash) { if (!fFileBacked) return false; - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); if (mapWallet.erase(hash)) CWalletDB(strWalletFile).EraseTx(hash); } @@ -416,8 +424,8 @@ bool CWallet::EraseFromWallet(uint256 hash) bool CWallet::IsMine(const CTxIn &txin) const { - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); map<uint256, CWalletTx>::const_iterator mi = mapWallet.find(txin.prevout.hash); if (mi != mapWallet.end()) { @@ -432,8 +440,8 @@ bool CWallet::IsMine(const CTxIn &txin) const int64 CWallet::GetDebit(const CTxIn &txin) const { - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); map<uint256, CWalletTx>::const_iterator mi = mapWallet.find(txin.prevout.hash); if (mi != mapWallet.end()) { @@ -458,9 +466,11 @@ bool CWallet::IsChange(const CTxOut& txout) const // 'the change' will need to be implemented (maybe extend CWalletTx to remember // which output, if any, was change). if (ExtractAddress(txout.scriptPubKey, address) && HaveKey(address)) - CRITICAL_BLOCK(cs_wallet) - if (!mapAddressBook.count(address)) - return true; + { + LOCK(cs_wallet); + if (!mapAddressBook.count(address)) + return true; + } return false; } @@ -473,8 +483,8 @@ int CWalletTx::GetRequestCount() const { // Returns -1 if it wasn't being tracked int nRequests = -1; - CRITICAL_BLOCK(pwallet->cs_wallet) { + LOCK(pwallet->cs_wallet); if (IsCoinBase()) { // Generated block @@ -578,8 +588,8 @@ void CWalletTx::GetAccountAmounts(const string& strAccount, int64& nGenerated, i nSent += s.second; nFee = allFee; } - CRITICAL_BLOCK(pwallet->cs_wallet) { + LOCK(pwallet->cs_wallet); BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress,int64)& r, listReceived) { if (pwallet->mapAddressBook.count(r.first)) @@ -608,8 +618,8 @@ void CWalletTx::AddSupportingTransactions(CTxDB& txdb) vWorkQueue.push_back(txin.prevout.hash); // This critsect is OK because txdb is already open - CRITICAL_BLOCK(pwallet->cs_wallet) { + LOCK(pwallet->cs_wallet); map<uint256, const CMerkleTx*> mapWalletPrev; set<uint256> setAlreadyDone; for (unsigned int i = 0; i < vWorkQueue.size(); i++) @@ -669,8 +679,8 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate) int ret = 0; CBlockIndex* pindex = pindexStart; - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); while (pindex) { CBlock block; @@ -699,8 +709,9 @@ void CWallet::ReacceptWalletTransactions() { CTxDB txdb("r"); bool fRepeat = true; - while (fRepeat) CRITICAL_BLOCK(cs_wallet) + while (fRepeat) { + LOCK(cs_wallet); fRepeat = false; vector<CDiskTxPos> vMissingTx; BOOST_FOREACH(PAIRTYPE(const uint256, CWalletTx)& item, mapWallet) @@ -802,8 +813,8 @@ void CWallet::ResendWalletTransactions() // Rebroadcast any of our txes that aren't in a block yet printf("ResendWalletTransactions()\n"); CTxDB txdb("r"); - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); // Sort them in chronological order multimap<unsigned int, CWalletTx*> mapSorted; BOOST_FOREACH(PAIRTYPE(const uint256, CWalletTx)& item, mapWallet) @@ -836,8 +847,8 @@ void CWallet::ResendWalletTransactions() int64 CWallet::GetBalance() const { int64 nTotal = 0; - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { const CWalletTx* pcoin = &(*it).second; @@ -853,8 +864,8 @@ int64 CWallet::GetBalance() const int64 CWallet::GetUnconfirmedBalance() const { int64 nTotal = 0; - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { const CWalletTx* pcoin = &(*it).second; @@ -878,8 +889,8 @@ bool CWallet::SelectCoinsMinConf(int64 nTargetValue, int nConfMine, int nConfThe vector<pair<int64, pair<const CWalletTx*,unsigned int> > > vValue; int64 nTotalLower = 0; - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); vector<const CWalletTx*> vCoins; vCoins.reserve(mapWallet.size()); for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) @@ -1035,9 +1046,8 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW wtxNew.BindWallet(this); - CRITICAL_BLOCK(cs_main) - CRITICAL_BLOCK(cs_wallet) { + LOCK2(cs_main, cs_wallet); // txdb must be opened before the mapWallet lock CTxDB txdb("r"); { @@ -1113,7 +1123,7 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW return false; // Limit size - unsigned int nBytes = ::GetSerializeSize(*(CTransaction*)&wtxNew, SER_NETWORK); + unsigned int nBytes = ::GetSerializeSize(*(CTransaction*)&wtxNew, SER_NETWORK, PROTOCOL_VERSION); if (nBytes >= MAX_BLOCK_SIZE_GEN/5) return false; dPriority /= nBytes; @@ -1149,9 +1159,8 @@ bool CWallet::CreateTransaction(CScript scriptPubKey, int64 nValue, CWalletTx& w // Call after CreateTransaction unless you want to abort bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey) { - CRITICAL_BLOCK(cs_main) - CRITICAL_BLOCK(cs_wallet) { + LOCK2(cs_main, cs_wallet); printf("CommitTransaction:\n%s", wtxNew.ToString().c_str()); { // This is only to keep the database open to defeat the auto-flush for the @@ -1222,7 +1231,7 @@ string CWallet::SendMoney(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew, return strError; } - if (fAskFee && !ThreadSafeAskFee(nFeeRequired, _("Sending..."), NULL)) + if (fAskFee && !ThreadSafeAskFee(nFeeRequired, _("Sending..."))) return "ABORTED"; if (!CommitTransaction(wtxNew, reservekey)) @@ -1282,6 +1291,7 @@ int CWallet::LoadWallet(bool& fFirstRunRet) bool CWallet::SetAddressBookName(const CBitcoinAddress& address, const string& strName) { mapAddressBook[address] = strName; + AddressBookRepaint(); if (!fFileBacked) return false; return CWalletDB(strWalletFile).WriteName(address.ToString(), strName); @@ -1290,6 +1300,7 @@ bool CWallet::SetAddressBookName(const CBitcoinAddress& address, const string& s bool CWallet::DelAddressBookName(const CBitcoinAddress& address) { mapAddressBook.erase(address); + AddressBookRepaint(); if (!fFileBacked) return false; return CWalletDB(strWalletFile).EraseName(address.ToString()); @@ -1298,8 +1309,8 @@ bool CWallet::DelAddressBookName(const CBitcoinAddress& address) void CWallet::PrintWallet(const CBlock& block) { - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); if (mapWallet.count(block.vtx[0].GetHash())) { CWalletTx& wtx = mapWallet[block.vtx[0].GetHash()]; @@ -1311,8 +1322,8 @@ void CWallet::PrintWallet(const CBlock& block) bool CWallet::GetTransaction(const uint256 &hashTx, CWalletTx& wtx) { - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); map<uint256, CWalletTx>::iterator mi = mapWallet.find(hashTx); if (mi != mapWallet.end()) { @@ -1348,8 +1359,8 @@ bool GetWalletFile(CWallet* pwallet, string &strWalletFileOut) // bool CWallet::NewKeyPool() { - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); CWalletDB walletdb(strWalletFile); BOOST_FOREACH(int64 nIndex, setKeyPool) walletdb.ErasePool(nIndex); @@ -1372,16 +1383,17 @@ bool CWallet::NewKeyPool() bool CWallet::TopUpKeyPool() { - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); + if (IsLocked()) return false; CWalletDB walletdb(strWalletFile); // Top up key pool - int64 nTargetSize = max(GetArg("-keypool", 100), (int64)0); - while (setKeyPool.size() < nTargetSize+1) + unsigned int nTargetSize = max(GetArg("-keypool", 100), 0LL); + while (setKeyPool.size() < (nTargetSize + 1)) { int64 nEnd = 1; if (!setKeyPool.empty()) @@ -1399,8 +1411,9 @@ void CWallet::ReserveKeyFromKeyPool(int64& nIndex, CKeyPool& keypool) { nIndex = -1; keypool.vchPubKey.clear(); - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); + if (!IsLocked()) TopUpKeyPool(); @@ -1423,9 +1436,8 @@ void CWallet::ReserveKeyFromKeyPool(int64& nIndex, CKeyPool& keypool) int64 CWallet::AddReserveKey(const CKeyPool& keypool) { - CRITICAL_BLOCK(cs_main) - CRITICAL_BLOCK(cs_wallet) { + LOCK2(cs_main, cs_wallet); CWalletDB walletdb(strWalletFile); int64 nIndex = 1 + *(--setKeyPool.end()); @@ -1451,8 +1463,10 @@ void CWallet::KeepKey(int64 nIndex) void CWallet::ReturnKey(int64 nIndex) { // Return to key pool - CRITICAL_BLOCK(cs_wallet) + { + LOCK(cs_wallet); setKeyPool.insert(nIndex); + } printf("keypool return %"PRI64d"\n", nIndex); } @@ -1460,8 +1474,8 @@ bool CWallet::GetKeyFromPool(vector<unsigned char>& result, bool fAllowReuse) { int64 nIndex = 0; CKeyPool keypool; - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); ReserveKeyFromKeyPool(nIndex, keypool); if (nIndex == -1) { @@ -1531,8 +1545,7 @@ void CWallet::GetAllReserveAddresses(set<CBitcoinAddress>& setAddress) CWalletDB walletdb(strWalletFile); - CRITICAL_BLOCK(cs_main) - CRITICAL_BLOCK(cs_wallet) + LOCK2(cs_main, cs_wallet); BOOST_FOREACH(const int64& id, setKeyPool) { CKeyPool keypool; diff --git a/src/wallet.h b/src/wallet.h index 6fe3ca67c0..1e5182073c 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -5,7 +5,7 @@ #ifndef BITCOIN_WALLET_H #define BITCOIN_WALLET_H -#include "bignum.h" +#include "main.h" #include "key.h" #include "keystore.h" #include "script.h" @@ -25,6 +25,34 @@ enum WalletFeature FEATURE_LATEST = 60000 }; + +/** A key pool entry */ +class CKeyPool +{ +public: + int64 nTime; + std::vector<unsigned char> vchPubKey; + + CKeyPool() + { + nTime = GetTime(); + } + + CKeyPool(const std::vector<unsigned char>& vchPubKeyIn) + { + nTime = GetTime(); + vchPubKey = vchPubKeyIn; + } + + IMPLEMENT_SERIALIZE + ( + if (!(nType & SER_GETHASH)) + READWRITE(nVersion); + READWRITE(nTime); + READWRITE(vchPubKey); + ) +}; + /** A CWallet is an extension of a keystore, which also maintains a set of transactions and balances, * and provides the ability to create new transactions. */ @@ -196,11 +224,7 @@ public: } return nChange; } - void SetBestChain(const CBlockLocator& loc) - { - CWalletDB walletdb(strWalletFile); - walletdb.WriteBestBlock(loc); - } + void SetBestChain(const CBlockLocator& loc); int LoadWallet(bool& fFirstRunRet); @@ -210,16 +234,18 @@ public: void UpdatedTransaction(const uint256 &hashTx) { - CRITICAL_BLOCK(cs_wallet) + { + LOCK(cs_wallet); vWalletUpdated.push_back(hashTx); + } } void PrintWallet(const CBlock& block); void Inventory(const uint256 &hash) { - CRITICAL_BLOCK(cs_wallet) { + LOCK(cs_wallet); std::map<uint256, int>::iterator mi = mapRequestCount.find(hash); if (mi != mapRequestCount.end()) (*mi).second++; @@ -290,20 +316,15 @@ public: std::vector<char> vfSpent; // which outputs are already spent // memory only - mutable char fDebitCached; - mutable char fCreditCached; - mutable char fAvailableCreditCached; - mutable char fChangeCached; + mutable bool fDebitCached; + mutable bool fCreditCached; + mutable bool fAvailableCreditCached; + mutable bool fChangeCached; mutable int64 nDebitCached; mutable int64 nCreditCached; mutable int64 nAvailableCreditCached; mutable int64 nChangeCached; - // memory only UI hints - mutable unsigned int nTimeDisplayed; - mutable int nLinesDisplayed; - mutable char fConfirmedDisplayed; - CWalletTx() { Init(NULL); @@ -343,9 +364,6 @@ public: nCreditCached = 0; nAvailableCreditCached = 0; nChangeCached = 0; - nTimeDisplayed = 0; - nLinesDisplayed = 0; - fConfirmedDisplayed = false; } IMPLEMENT_SERIALIZE diff --git a/src/walletdb.cpp b/src/walletdb.cpp new file mode 100644 index 0000000000..865911c434 --- /dev/null +++ b/src/walletdb.cpp @@ -0,0 +1,428 @@ +// Copyright (c) 2009-2010 Satoshi Nakamoto +// Copyright (c) 2009-2012 The Bitcoin developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include "walletdb.h" +#include "wallet.h" +#include <boost/filesystem.hpp> + +using namespace std; +using namespace boost; + + +static uint64 nAccountingEntryNumber = 0; + +extern CCriticalSection cs_db; +extern map<string, int> mapFileUseCount; +extern void CloseDb(const string& strFile); + +// +// CWalletDB +// + +bool CWalletDB::WriteName(const string& strAddress, const string& strName) +{ + nWalletDBUpdated++; + return Write(make_pair(string("name"), strAddress), strName); +} + +bool CWalletDB::EraseName(const string& strAddress) +{ + // This should only be used for sending addresses, never for receiving addresses, + // receiving addresses must always have an address book entry if they're not change return. + nWalletDBUpdated++; + return Erase(make_pair(string("name"), strAddress)); +} + +bool CWalletDB::ReadAccount(const string& strAccount, CAccount& account) +{ + account.SetNull(); + return Read(make_pair(string("acc"), strAccount), account); +} + +bool CWalletDB::WriteAccount(const string& strAccount, const CAccount& account) +{ + return Write(make_pair(string("acc"), strAccount), account); +} + +bool CWalletDB::WriteAccountingEntry(const CAccountingEntry& acentry) +{ + return Write(boost::make_tuple(string("acentry"), acentry.strAccount, ++nAccountingEntryNumber), acentry); +} + +int64 CWalletDB::GetAccountCreditDebit(const string& strAccount) +{ + list<CAccountingEntry> entries; + ListAccountCreditDebit(strAccount, entries); + + int64 nCreditDebit = 0; + BOOST_FOREACH (const CAccountingEntry& entry, entries) + nCreditDebit += entry.nCreditDebit; + + return nCreditDebit; +} + +void CWalletDB::ListAccountCreditDebit(const string& strAccount, list<CAccountingEntry>& entries) +{ + bool fAllAccounts = (strAccount == "*"); + + Dbc* pcursor = GetCursor(); + if (!pcursor) + throw runtime_error("CWalletDB::ListAccountCreditDebit() : cannot create DB cursor"); + unsigned int fFlags = DB_SET_RANGE; + loop + { + // Read next record + CDataStream ssKey(SER_DISK, CLIENT_VERSION); + if (fFlags == DB_SET_RANGE) + ssKey << boost::make_tuple(string("acentry"), (fAllAccounts? string("") : strAccount), uint64(0)); + CDataStream ssValue(SER_DISK, CLIENT_VERSION); + int ret = ReadAtCursor(pcursor, ssKey, ssValue, fFlags); + fFlags = DB_NEXT; + if (ret == DB_NOTFOUND) + break; + else if (ret != 0) + { + pcursor->close(); + throw runtime_error("CWalletDB::ListAccountCreditDebit() : error scanning DB"); + } + + // Unserialize + string strType; + ssKey >> strType; + if (strType != "acentry") + break; + CAccountingEntry acentry; + ssKey >> acentry.strAccount; + if (!fAllAccounts && acentry.strAccount != strAccount) + break; + + ssValue >> acentry; + entries.push_back(acentry); + } + + pcursor->close(); +} + + +int CWalletDB::LoadWallet(CWallet* pwallet) +{ + pwallet->vchDefaultKey.clear(); + int nFileVersion = 0; + vector<uint256> vWalletUpgrade; + bool fIsEncrypted = false; + + //// todo: shouldn't we catch exceptions and try to recover and continue? + { + LOCK(pwallet->cs_wallet); + int nMinVersion = 0; + if (Read((string)"minversion", nMinVersion)) + { + if (nMinVersion > CLIENT_VERSION) + return DB_TOO_NEW; + pwallet->LoadMinVersion(nMinVersion); + } + + // Get cursor + Dbc* pcursor = GetCursor(); + if (!pcursor) + { + printf("Error getting wallet database cursor\n"); + return DB_CORRUPT; + } + + loop + { + // Read next record + CDataStream ssKey(SER_DISK, CLIENT_VERSION); + CDataStream ssValue(SER_DISK, CLIENT_VERSION); + int ret = ReadAtCursor(pcursor, ssKey, ssValue); + if (ret == DB_NOTFOUND) + break; + else if (ret != 0) + { + printf("Error reading next record from wallet database\n"); + return DB_CORRUPT; + } + + // Unserialize + // Taking advantage of the fact that pair serialization + // is just the two items serialized one after the other + string strType; + ssKey >> strType; + if (strType == "name") + { + string strAddress; + ssKey >> strAddress; + ssValue >> pwallet->mapAddressBook[strAddress]; + } + else if (strType == "tx") + { + uint256 hash; + ssKey >> hash; + CWalletTx& wtx = pwallet->mapWallet[hash]; + ssValue >> wtx; + wtx.BindWallet(pwallet); + + if (wtx.GetHash() != hash) + printf("Error in wallet.dat, hash mismatch\n"); + + // Undo serialize changes in 31600 + if (31404 <= wtx.fTimeReceivedIsTxTime && wtx.fTimeReceivedIsTxTime <= 31703) + { + if (!ssValue.empty()) + { + char fTmp; + char fUnused; + ssValue >> fTmp >> fUnused >> wtx.strFromAccount; + printf("LoadWallet() upgrading tx ver=%d %d '%s' %s\n", wtx.fTimeReceivedIsTxTime, fTmp, wtx.strFromAccount.c_str(), hash.ToString().c_str()); + wtx.fTimeReceivedIsTxTime = fTmp; + } + else + { + printf("LoadWallet() repairing tx ver=%d %s\n", wtx.fTimeReceivedIsTxTime, hash.ToString().c_str()); + wtx.fTimeReceivedIsTxTime = 0; + } + vWalletUpgrade.push_back(hash); + } + + //// debug print + //printf("LoadWallet %s\n", wtx.GetHash().ToString().c_str()); + //printf(" %12"PRI64d" %s %s %s\n", + // wtx.vout[0].nValue, + // DateTimeStrFormat("%x %H:%M:%S", wtx.GetBlockTime()).c_str(), + // wtx.hashBlock.ToString().substr(0,20).c_str(), + // wtx.mapValue["message"].c_str()); + } + else if (strType == "acentry") + { + string strAccount; + ssKey >> strAccount; + uint64 nNumber; + ssKey >> nNumber; + if (nNumber > nAccountingEntryNumber) + nAccountingEntryNumber = nNumber; + } + else if (strType == "key" || strType == "wkey") + { + vector<unsigned char> vchPubKey; + ssKey >> vchPubKey; + CKey key; + if (strType == "key") + { + CPrivKey pkey; + ssValue >> pkey; + key.SetPubKey(vchPubKey); + key.SetPrivKey(pkey); + if (key.GetPubKey() != vchPubKey) + { + printf("Error reading wallet database: CPrivKey pubkey inconsistency\n"); + return DB_CORRUPT; + } + if (!key.IsValid()) + { + printf("Error reading wallet database: invalid CPrivKey\n"); + return DB_CORRUPT; + } + } + else + { + CWalletKey wkey; + ssValue >> wkey; + key.SetPubKey(vchPubKey); + key.SetPrivKey(wkey.vchPrivKey); + if (key.GetPubKey() != vchPubKey) + { + printf("Error reading wallet database: CWalletKey pubkey inconsistency\n"); + return DB_CORRUPT; + } + if (!key.IsValid()) + { + printf("Error reading wallet database: invalid CWalletKey\n"); + return DB_CORRUPT; + } + } + if (!pwallet->LoadKey(key)) + { + printf("Error reading wallet database: LoadKey failed\n"); + return DB_CORRUPT; + } + } + else if (strType == "mkey") + { + unsigned int nID; + ssKey >> nID; + CMasterKey kMasterKey; + ssValue >> kMasterKey; + if(pwallet->mapMasterKeys.count(nID) != 0) + { + printf("Error reading wallet database: duplicate CMasterKey id %u\n", nID); + return DB_CORRUPT; + } + pwallet->mapMasterKeys[nID] = kMasterKey; + if (pwallet->nMasterKeyMaxID < nID) + pwallet->nMasterKeyMaxID = nID; + } + else if (strType == "ckey") + { + vector<unsigned char> vchPubKey; + ssKey >> vchPubKey; + vector<unsigned char> vchPrivKey; + ssValue >> vchPrivKey; + if (!pwallet->LoadCryptedKey(vchPubKey, vchPrivKey)) + { + printf("Error reading wallet database: LoadCryptedKey failed\n"); + return DB_CORRUPT; + } + fIsEncrypted = true; + } + else if (strType == "defaultkey") + { + ssValue >> pwallet->vchDefaultKey; + } + else if (strType == "pool") + { + int64 nIndex; + ssKey >> nIndex; + pwallet->setKeyPool.insert(nIndex); + } + else if (strType == "version") + { + ssValue >> nFileVersion; + if (nFileVersion == 10300) + nFileVersion = 300; + } + else if (strType == "cscript") + { + uint160 hash; + ssKey >> hash; + CScript script; + ssValue >> script; + if (!pwallet->LoadCScript(script)) + { + printf("Error reading wallet database: LoadCScript failed\n"); + return DB_CORRUPT; + } + } + } + pcursor->close(); + } + + BOOST_FOREACH(uint256 hash, vWalletUpgrade) + WriteTx(hash, pwallet->mapWallet[hash]); + + printf("nFileVersion = %d\n", nFileVersion); + + + // Rewrite encrypted wallets of versions 0.4.0 and 0.5.0rc: + if (fIsEncrypted && (nFileVersion == 40000 || nFileVersion == 50000)) + return DB_NEED_REWRITE; + + if (nFileVersion < CLIENT_VERSION) // Update + WriteVersion(CLIENT_VERSION); + + return DB_LOAD_OK; +} + +void ThreadFlushWalletDB(void* parg) +{ + const string& strFile = ((const string*)parg)[0]; + static bool fOneThread; + if (fOneThread) + return; + fOneThread = true; + if (!GetBoolArg("-flushwallet", true)) + return; + + unsigned int nLastSeen = nWalletDBUpdated; + unsigned int nLastFlushed = nWalletDBUpdated; + int64 nLastWalletUpdate = GetTime(); + while (!fShutdown) + { + Sleep(500); + + if (nLastSeen != nWalletDBUpdated) + { + nLastSeen = nWalletDBUpdated; + nLastWalletUpdate = GetTime(); + } + + if (nLastFlushed != nWalletDBUpdated && GetTime() - nLastWalletUpdate >= 2) + { + TRY_LOCK(cs_db,lockDb); + if (lockDb) + { + // Don't do this if any databases are in use + int nRefCount = 0; + map<string, int>::iterator mi = mapFileUseCount.begin(); + while (mi != mapFileUseCount.end()) + { + nRefCount += (*mi).second; + mi++; + } + + if (nRefCount == 0 && !fShutdown) + { + map<string, int>::iterator mi = mapFileUseCount.find(strFile); + if (mi != mapFileUseCount.end()) + { + printf("%s ", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str()); + printf("Flushing wallet.dat\n"); + nLastFlushed = nWalletDBUpdated; + int64 nStart = GetTimeMillis(); + + // Flush wallet.dat so it's self contained + CloseDb(strFile); + dbenv.txn_checkpoint(0, 0, 0); + dbenv.lsn_reset(strFile.c_str(), 0); + + mapFileUseCount.erase(mi++); + printf("Flushed wallet.dat %"PRI64d"ms\n", GetTimeMillis() - nStart); + } + } + } + } + } +} + +bool BackupWallet(const CWallet& wallet, const string& strDest) +{ + if (!wallet.fFileBacked) + return false; + while (!fShutdown) + { + { + LOCK(cs_db); + if (!mapFileUseCount.count(wallet.strWalletFile) || mapFileUseCount[wallet.strWalletFile] == 0) + { + // Flush log data to the dat file + CloseDb(wallet.strWalletFile); + dbenv.txn_checkpoint(0, 0, 0); + dbenv.lsn_reset(wallet.strWalletFile.c_str(), 0); + mapFileUseCount.erase(wallet.strWalletFile); + + // Copy wallet.dat + filesystem::path pathSrc = GetDataDir() / wallet.strWalletFile; + filesystem::path pathDest(strDest); + if (filesystem::is_directory(pathDest)) + pathDest /= wallet.strWalletFile; + + try { +#if BOOST_VERSION >= 104000 + filesystem::copy_file(pathSrc, pathDest, filesystem::copy_option::overwrite_if_exists); +#else + filesystem::copy_file(pathSrc, pathDest); +#endif + printf("copied wallet.dat to %s\n", pathDest.string().c_str()); + return true; + } catch(const filesystem::filesystem_error &e) { + printf("error copying wallet.dat to %s - %s\n", pathDest.string().c_str(), e.what()); + return false; + } + } + } + Sleep(100); + } + return false; +} diff --git a/src/walletdb.h b/src/walletdb.h new file mode 100644 index 0000000000..dee1750262 --- /dev/null +++ b/src/walletdb.h @@ -0,0 +1,179 @@ +// Copyright (c) 2009-2010 Satoshi Nakamoto +// Copyright (c) 2009-2012 The Bitcoin developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. +#ifndef BITCOIN_WALLETDB_H +#define BITCOIN_WALLETDB_H + +#include "db.h" + +class CKeyPool; +class CAccount; +class CAccountingEntry; + +/** Error statuses for the wallet database */ +enum DBErrors +{ + DB_LOAD_OK, + DB_CORRUPT, + DB_TOO_NEW, + DB_LOAD_FAIL, + DB_NEED_REWRITE +}; + +/** Access to the wallet database (wallet.dat) */ +class CWalletDB : public CDB +{ +public: + CWalletDB(std::string strFilename, const char* pszMode="r+") : CDB(strFilename.c_str(), pszMode) + { + } +private: + CWalletDB(const CWalletDB&); + void operator=(const CWalletDB&); +public: + bool ReadName(const std::string& strAddress, std::string& strName) + { + strName = ""; + return Read(std::make_pair(std::string("name"), strAddress), strName); + } + + bool WriteName(const std::string& strAddress, const std::string& strName); + + bool EraseName(const std::string& strAddress); + + bool ReadTx(uint256 hash, CWalletTx& wtx) + { + return Read(std::make_pair(std::string("tx"), hash), wtx); + } + + bool WriteTx(uint256 hash, const CWalletTx& wtx) + { + nWalletDBUpdated++; + return Write(std::make_pair(std::string("tx"), hash), wtx); + } + + bool EraseTx(uint256 hash) + { + nWalletDBUpdated++; + return Erase(std::make_pair(std::string("tx"), hash)); + } + + bool ReadKey(const std::vector<unsigned char>& vchPubKey, CPrivKey& vchPrivKey) + { + vchPrivKey.clear(); + return Read(std::make_pair(std::string("key"), vchPubKey), vchPrivKey); + } + + bool WriteKey(const std::vector<unsigned char>& vchPubKey, const CPrivKey& vchPrivKey) + { + nWalletDBUpdated++; + return Write(std::make_pair(std::string("key"), vchPubKey), vchPrivKey, false); + } + + bool WriteCryptedKey(const std::vector<unsigned char>& vchPubKey, const std::vector<unsigned char>& vchCryptedSecret, bool fEraseUnencryptedKey = true) + { + nWalletDBUpdated++; + if (!Write(std::make_pair(std::string("ckey"), vchPubKey), vchCryptedSecret, false)) + return false; + if (fEraseUnencryptedKey) + { + Erase(std::make_pair(std::string("key"), vchPubKey)); + Erase(std::make_pair(std::string("wkey"), vchPubKey)); + } + return true; + } + + bool WriteMasterKey(unsigned int nID, const CMasterKey& kMasterKey) + { + nWalletDBUpdated++; + return Write(std::make_pair(std::string("mkey"), nID), kMasterKey, true); + } + + // Support for BIP 0013 : see https://en.bitcoin.it/wiki/BIP_0013 + bool ReadCScript(const uint160 &hash, CScript& redeemScript) + { + redeemScript.clear(); + return Read(std::make_pair(std::string("cscript"), hash), redeemScript); + } + + bool WriteCScript(const uint160& hash, const CScript& redeemScript) + { + nWalletDBUpdated++; + return Write(std::make_pair(std::string("cscript"), hash), redeemScript, false); + } + + bool WriteBestBlock(const CBlockLocator& locator) + { + nWalletDBUpdated++; + return Write(std::string("bestblock"), locator); + } + + bool ReadBestBlock(CBlockLocator& locator) + { + return Read(std::string("bestblock"), locator); + } + + bool ReadDefaultKey(std::vector<unsigned char>& vchPubKey) + { + vchPubKey.clear(); + return Read(std::string("defaultkey"), vchPubKey); + } + + bool WriteDefaultKey(const std::vector<unsigned char>& vchPubKey) + { + nWalletDBUpdated++; + return Write(std::string("defaultkey"), vchPubKey); + } + + bool ReadPool(int64 nPool, CKeyPool& keypool) + { + return Read(std::make_pair(std::string("pool"), nPool), keypool); + } + + bool WritePool(int64 nPool, const CKeyPool& keypool) + { + nWalletDBUpdated++; + return Write(std::make_pair(std::string("pool"), nPool), keypool); + } + + bool ErasePool(int64 nPool) + { + nWalletDBUpdated++; + return Erase(std::make_pair(std::string("pool"), nPool)); + } + + // Settings are no longer stored in wallet.dat; these are + // used only for backwards compatibility: + template<typename T> + bool ReadSetting(const std::string& strKey, T& value) + { + return Read(std::make_pair(std::string("setting"), strKey), value); + } + template<typename T> + bool WriteSetting(const std::string& strKey, const T& value) + { + nWalletDBUpdated++; + return Write(std::make_pair(std::string("setting"), strKey), value); + } + bool EraseSetting(const std::string& strKey) + { + nWalletDBUpdated++; + return Erase(std::make_pair(std::string("setting"), strKey)); + } + + bool WriteMinVersion(int nVersion) + { + return Write(std::string("minversion"), nVersion); + } + + bool ReadAccount(const std::string& strAccount, CAccount& account); + bool WriteAccount(const std::string& strAccount, const CAccount& account); + bool WriteAccountingEntry(const CAccountingEntry& acentry); + int64 GetAccountCreditDebit(const std::string& strAccount); + void ListAccountCreditDebit(const std::string& strAccount, std::list<CAccountingEntry>& acentries); + + int LoadWallet(CWallet* pwallet); +}; + +#endif // BITCOIN_WALLETDB_H |
