diff options
105 files changed, 6648 insertions, 5770 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 92103f1e39..cdd3bc2b81 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = bitcoin-qt -VERSION = 0.6.99 +VERSION = 0.7.0 INCLUDEPATH += src src/json src/qt DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE CONFIG += no_include_pwd @@ -75,12 +75,12 @@ contains(FIRST_CLASS_MESSAGING, 1) { # or: qmake "USE_IPV6=0" (disabled by default) # or: qmake "USE_IPV6=-" (not supported) contains(USE_IPV6, -) { - message(Building without IPv6 support) + message(Building without IPv6 support) } else { - count(USE_IPV6, 0) { - USE_IPV6=1 - } - DEFINES += USE_IPV6=$$USE_IPV6 + count(USE_IPV6, 0) { + USE_IPV6=1 + } + DEFINES += USE_IPV6=$$USE_IPV6 } contains(BITCOIN_NEED_QT_PLUGINS, 1) { @@ -92,7 +92,7 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) { # for extra security against potential buffer overflows QMAKE_CXXFLAGS += -fstack-protector QMAKE_LFLAGS += -fstack-protector - # do not enable this on windows, as it will result in a non-working executable! + # do not enable this on windows cross compile with mingw 4.2.x, as it will result in a non-working executable! } # regenerate src/build.h @@ -119,6 +119,7 @@ HEADERS += src/qt/bitcoingui.h \ src/qt/aboutdialog.h \ src/qt/editaddressdialog.h \ src/qt/bitcoinaddressvalidator.h \ + src/alert.h \ src/addrman.h \ src/base58.h \ src/bignum.h \ @@ -176,7 +177,9 @@ HEADERS += src/qt/bitcoingui.h \ src/allocators.h \ src/ui_interface.h \ src/qt/rpcconsole.h \ - src/version.h + src/version.h \ + src/netbase.h \ + src/clientversion.h SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/qt/transactiontablemodel.cpp \ @@ -188,6 +191,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/qt/aboutdialog.cpp \ src/qt/editaddressdialog.cpp \ src/qt/bitcoinaddressvalidator.cpp \ + src/alert.cpp \ src/version.cpp \ src/sync.cpp \ src/util.cpp \ @@ -202,9 +206,6 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/addrman.cpp \ src/db.cpp \ src/walletdb.cpp \ - src/json/json_spirit_writer.cpp \ - src/json/json_spirit_value.cpp \ - src/json/json_spirit_reader.cpp \ src/qt/clientmodel.cpp \ src/qt/guiutil.cpp \ src/qt/transactionrecord.cpp \ @@ -298,7 +299,7 @@ OTHER_FILES += \ # platform specific defaults, if not overridden on command line isEmpty(BOOST_LIB_SUFFIX) { macx:BOOST_LIB_SUFFIX = -mt - windows:BOOST_LIB_SUFFIX = -mgw44-mt-s-1_49 + windows:BOOST_LIB_SUFFIX = -mgw44-mt-s-1_50 } isEmpty(BOOST_THREAD_LIB_SUFFIX) { @@ -359,6 +360,7 @@ LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX # -lgdi32 has to happen after -lcrypto (see #681) windows:LIBS += -lole32 -luuid -lgdi32 LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX +windows:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX contains(RELEASE, 1) { !windows:!macx { diff --git a/contrib/debian/copyright b/contrib/debian/copyright index 71913c5a3a..b99604913c 100644 --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -55,8 +55,7 @@ Comment: Icon Pack: Human-O2 Files: src/qt/res/icons/transaction*.png Copyright: md2k7 -License: You are free to do with these icons as you wish, including selling, - copying, modifying etc. +License: Expat Comment: Site: https://bitcointalk.org/index.php?topic=15276.0 Files: src/qt/res/icons/configure.png, src/qt/res/icons/quit.png, diff --git a/contrib/gitian-descriptors/README b/contrib/gitian-descriptors/README index a2d902e210..66a0509ac6 100644 --- a/contrib/gitian-descriptors/README +++ b/contrib/gitian-descriptors/README @@ -1,31 +1,86 @@ -Gavin's notes on getting gitian builds up and running: +Gavin's notes on getting gitian builds up and running using KVM: + +These instructions distilled from: + https://help.ubuntu.com/community/KVM/Installation +... see there for complete details. You need the right hardware: you need a 64-bit-capable CPU with hardware virtualization support (Intel VT-x or AMD-V). Not all modern CPUs support hardware virtualization. You probably need to enable hardware virtualization in your machine's BIOS. You need to be running a recent version of 64-bit-Ubuntu, and you need to install several prerequisites: - sudo apt-get install apache2 git apt-cacher-ng python-vm-builder qemu-kvm + sudo apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm Sanity checks: sudo service apt-cacher-ng status # Should return apt-cacher-ng is running ls -l /dev/kvm # Should show a /dev/kvm device + Once you've got the right hardware and software: git clone git://github.com/bitcoin/bitcoin.git git clone git://github.com/devrandom/gitian-builder.git mkdir gitian-builder/inputs - wget 'http://miniupnp.tuxfamily.org/files/download.php?file=miniupnpc-1.6.tar.gz' -O gitian-builder/inputs/miniupnpc-1.6.tar.gz + cd gitian-builder/inputs + # Inputs for Linux and Win32: + wget -O miniupnpc-1.6.tar.gz 'http://miniupnp.tuxfamily.org/files/download.php?file=miniupnpc-1.6.tar.gz' + wget 'http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2' + # Inputs for Win32: (Linux has packages for these) + wget 'https://downloads.sourceforge.net/project/boost/boost/1.50.0/boost_1_50_0.tar.bz2' + wget 'http://www.openssl.org/source/openssl-1.0.1b.tar.gz' + wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz' + wget 'https://downloads.sourceforge.net/project/libpng/zlib/1.2.6/zlib-1.2.6.tar.gz' + wget 'https://downloads.sourceforge.net/project/libpng/libpng15/older-releases/1.5.9/libpng-1.5.9.tar.gz' + wget 'ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz' + cd ../.. cd gitian-builder bin/make-base-vm --arch i386 bin/make-base-vm --arch amd64 cd .. - # To build + # Build Linux release: cd bitcoin git pull cd ../gitian-builder git pull - ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian.yml + ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/gitian.yml + + # Build Win32 dependencies: (only needs to be done once, or when dependency versions change) + ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/boost-win32.yml + ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/deps-win32.yml + ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/qt-win32.yml + + # Build Win32 release: + ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml + +--------------------- + +gitian-builder now also supports building using LXC. See + https://help.ubuntu.com/12.04/serverguide/lxc.html +... for how to get LXC up and running under Ubuntu. + +If your main machine is a 64-bit Mac or PC with a few gigabytes of memory +and at least 10 gigabytes of free disk space, you can gitian-build using +LXC running inside a virtual machine. + +Here's a description of Gavin's setup on OSX 10.6: + +1. Download and install VirtualBox from https://www.virtualbox.org/ + +2. Download the 64-bit Ubuntu Desktop 12.04 LTS .iso CD image from + http://www.ubuntu.com/ + +3. Run VirtualBox and create a new virtual machine, using the + Ubuntu .iso (see the VirtualBox documentation for details). + Create it with at least 2 gigabytes of memory and a disk + that is at least 20 gigabytes big. + +4. Inside the running Ubuntu desktop, install: + sudo apt-get install debootstrap lxc ruby apache2 git apt-cacher-ng python-vm-builder + +5. Still inside Ubuntu, tell gitian-builder to use LXC, then follow the "Once you've got the right + hardware and software" instructions above: + export USE_LXC=1 + git clone git://github.com/bitcoin/bitcoin.git + ... etc diff --git a/contrib/gitian-descriptors/boost-win32.yml b/contrib/gitian-descriptors/boost-win32.yml index d9a0bed539..1eeb9eaa28 100644 --- a/contrib/gitian-descriptors/boost-win32.yml +++ b/contrib/gitian-descriptors/boost-win32.yml @@ -11,28 +11,12 @@ packages: reference_datetime: "2011-01-30 00:00:00" remotes: [] files: -- "boost_1_49_0.tar.bz2" +- "boost_1_50_0.tar.bz2" script: | TMPDIR="$HOME/tmpdir" mkdir -p $TMPDIR/bin/$GBUILD_BITS $TMPDIR/include - tar xjf boost_1_49_0.tar.bz2 - cd boost_1_49_0 - echo "--- tmp_dir_helpers.orig.hpp 2012-06-10 01:39:25.403268210 +0200 -+++ tmp_dir_helpers.hpp 2012-06-10 01:41:14.653823479 +0200 -@@ -19,9 +19,9 @@ - #include <string> - - #if defined(BOOST_INTERPROCESS_WINDOWS) -- //#define BOOST_INTERPROCESS_HAS_WINDOWS_KERNEL_BOOTTIME -- //#define BOOST_INTERPROCESS_HAS_KERNEL_BOOTTIME -- //#include <boost/interprocess/detail/win32_api.hpp> -+ #define BOOST_INTERPROCESS_HAS_WINDOWS_KERNEL_BOOTTIME -+ #define BOOST_INTERPROCESS_HAS_KERNEL_BOOTTIME -+ #include <boost/interprocess/detail/win32_api.hpp> - #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) - //#include <sys/sysctl.h> - //#if defined(CTL_KERN) && defined (KERN_BOOTTIME)" > useboottime.patch - patch boost/interprocess/detail/tmp_dir_helpers.hpp useboottime.patch + tar xjf boost_1_50_0.tar.bz2 + cd boost_1_50_0 echo "using gcc : 4.4 : i586-mingw32msvc-g++ : <rc>i586-mingw32msvc-windres @@ -50,5 +34,5 @@ script: | cd $TMPDIR export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME - zip -r boost-win32-1.49.0-gitian2.zip * - cp boost-win32-1.49.0-gitian2.zip $OUTDIR + zip -r boost-win32-1.50.0-gitian2.zip * + cp boost-win32-1.50.0-gitian2.zip $OUTDIR diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml index 6f0e4e2318..7948bbe45d 100644 --- a/contrib/gitian-descriptors/gitian-win32.yml +++ b/contrib/gitian-descriptors/gitian-win32.yml @@ -15,21 +15,21 @@ remotes: - "url": "https://github.com/bitcoin/bitcoin.git" "dir": "bitcoin" files: -- "qt-win32-4.7.4-gitian.zip" -- "boost-win32-1.49.0-gitian2.zip" +- "qt-win32-4.7.4-gitian-r1.zip" +- "boost-win32-1.50.0-gitian2.zip" - "bitcoin-deps-0.0.4.zip" script: | # mkdir $HOME/qt cd $HOME/qt - unzip ../build/qt-win32-4.7.4-gitian.zip + unzip ../build/qt-win32-4.7.4-gitian-r1.zip cd $HOME/build/ export PATH=$PATH:$HOME/qt/bin/ # - mkdir boost_1_49_0 - cd boost_1_49_0 + mkdir boost_1_50_0 + cd boost_1_50_0 mkdir -p stage/lib - unzip ../boost-win32-1.49.0-gitian2.zip + unzip ../boost-win32-1.50.0-gitian2.zip cd bin/$GBUILD_BITS for lib in *; do i586-mingw32msvc-ar rc ../../stage/lib/libboost_${lib}-mt-s.a $lib/*.o @@ -51,7 +51,7 @@ script: | 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 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 + $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_50_0/stage/lib BOOST_INCLUDE_PATH=$HOME/build/boost_1_50_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/ # diff --git a/contrib/gitian-descriptors/qt-win32.yml b/contrib/gitian-descriptors/qt-win32.yml index 6eb76b2170..fa3a84b321 100644 --- a/contrib/gitian-descriptors/qt-win32.yml +++ b/contrib/gitian-descriptors/qt-win32.yml @@ -40,7 +40,7 @@ script: | #export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC - ./configure -prefix $INSTDIR -confirm-license -release -opensource -static -no-qt3support -xplatform unsupported/win32-g++-cross -no-multimedia -no-audio-backend -no-phonon -no-phonon-backend -no-declarative -no-script -no-scripttools -no-javascript-jit -no-webkit -no-svg -no-xmlpatterns -no-sql-sqlite -no-nis -no-cups -no-iconv -no-dbus -no-gif -no-libtiff -opengl no -nomake examples -nomake demos -nomake docs + ./configure -prefix $INSTDIR -confirm-license -release -opensource -static -no-qt3support -xplatform unsupported/win32-g++-cross -no-multimedia -no-audio-backend -no-phonon -no-phonon-backend -no-declarative -no-script -no-scripttools -no-javascript-jit -no-webkit -no-svg -no-xmlpatterns -no-sql-sqlite -no-nis -no-cups -no-iconv -no-dbus -no-gif -no-libtiff -no-opengl -nomake examples -nomake demos -nomake docs -no-feature-style-plastique -no-feature-style-cleanlooks -no-feature-style-motif -no-feature-style-cde -no-feature-style-windowsce -no-feature-style-windowsmobile -no-feature-style-s60 find . -name *.prl | xargs -l sed 's|/\.||' -i find . -name *.prl | xargs -l sed 's|/$||' -i make $MAKEOPTS install @@ -51,4 +51,4 @@ script: | # as zip stores file timestamps, use faketime to intercept stat calls to set dates for all files to reference date export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - zip -r $OUTDIR/qt-win32-4.7.4-gitian.zip * + zip -r $OUTDIR/qt-win32-4.7.4-gitian-r1.zip * diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index e159f9bbc3..16daa59b08 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -169,6 +169,9 @@ class DeploymentInfo(object): elif os.path.exists(os.path.join(parentDir, "share", "qt4", "translations")): # MacPorts layout, e.g. "/opt/local/share/qt4" self.qtPath = os.path.join(parentDir, "share", "qt4") + elif os.path.exists(os.path.join(os.path.dirname(parentDir), "share", "qt4", "translations")): + # Newer Macports layout + self.qtPath = os.path.join(os.path.dirname(parentDir), "share", "qt4") if self.qtPath is not None: pluginPath = os.path.join(self.qtPath, "plugins") @@ -725,7 +728,7 @@ if config.dmg is not None: disk.close() if bg_path is not None: subprocess.call(["SetFile", "-a", "V", bg_path]) - disk.update(registering_applications=False) +# disk.update(registering_applications=False) sleep(2) disk.eject() diff --git a/doc/README b/doc/README index ee6478d59e..bc6468e673 100644 --- a/doc/README +++ b/doc/README @@ -1,4 +1,4 @@ -Bitcoin 0.6.99 BETA +Bitcoin 0.7.0 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 dd8a62a448..4d9b4b20a4 100644 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -1,4 +1,4 @@ -Bitcoin 0.6.99 BETA
+Bitcoin 0.7.0 BETA
Copyright (c) 2009-2012 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
diff --git a/doc/Tor.txt b/doc/Tor.txt index e088d87105..f515f96f49 100644 --- a/doc/Tor.txt +++ b/doc/Tor.txt @@ -28,10 +28,6 @@ outgoing connections be anonimized, but more is possible. need to set this if it's the same as -proxy. You can use -notor to explicitly disable access to hidden service. --dnsseed DNS seeds are not resolved directly when a SOCKS5 proxy server is - set. Rather, a short-lived proxy connection to the dns seed - hostname is attempted, and peer addresses are requested. - -listen When using -proxy, listening is disabled by default. If you want to run a hidden service (see next section), you'll need to enable it explicitly. diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt index 4a4ab08685..c66665d012 100644 --- a/doc/assets-attribution.txt +++ b/doc/assets-attribution.txt @@ -29,6 +29,7 @@ Designer: md2k7 Site: https://bitcointalk.org/index.php?topic=15276.0 License: You are free to do with these icons as you wish, including selling, copying, modifying etc. +License: MIT Icon: src/qt/res/icons/configure.png, src/qt/res/icons/quit.png, src/qt/res/icons/editcopy.png, src/qt/res/icons/editpaste.png, diff --git a/doc/build-unix.txt b/doc/build-unix.txt index 784d86e63d..b02a20a760 100644 --- a/doc/build-unix.txt +++ b/doc/build-unix.txt @@ -28,7 +28,6 @@ Dependencies libdb4.8 Berkeley DB Blockchain & wallet storage libboost Boost C++ Library miniupnpc UPnP Support Optional firewall-jumping support - libqrencode QRCode generation Optional QRCode generation miniupnpc may be used for UPnP port mapping. It can be downloaded from http://miniupnp.tuxfamily.org/files/. UPnP support is compiled in and @@ -37,13 +36,7 @@ turned off by default. Set USE_UPNP to a different value to control this: USE_UPNP=0 (the default) UPnP support turned off by default at runtime USE_UPNP=1 UPnP support turned on by default at runtime -libqrencode may be used for QRCode image generation. It can be downloaded -from http://fukuchi.org/works/qrencode/index.html.en, or installed via -your package manager. Set USE_QRCODE to control this: - USE_QRCODE=0 (the default) No QRCode support - libqrcode not required - USE_QRCODE=1 QRCode support enabled - -IPv6 support may be enabled by setting +IPv6 support may be enabled by setting: USE_IPV6=1 Enable IPv6 support Licenses of statically linked libraries: @@ -61,15 +54,27 @@ Versions used in this release: Dependency Build Instructions: Ubuntu & Debian ---------------------------------------------- -sudo apt-get install build-essential -sudo apt-get install libssl-dev -sudo apt-get install libdb4.8-dev -sudo apt-get install libdb4.8++-dev - Boost 1.40+: sudo apt-get install libboost-all-dev - or Boost 1.37: sudo apt-get install libboost1.37-dev -sudo apt-get install libqrencode-dev - -If using Boost 1.37, append -mt to the boost libraries in the makefile. +Build requirements: + sudo apt-get install build-essential + sudo apt-get install libssl-dev + +for Ubuntu 12.04: + sudo apt-get install libboost-all-dev + + db4.8 packages are available at: + https://launchpad.net/~bitcoin/+archive/bitcoin + + Ubuntu precise has packages for libdb5.1-dev and libdb5.1++-dev, + but using these will break binary wallet compatibility, and is not recommended. + +for other Ubuntu & Debian: + sudo apt-get install libdb4.8-dev + sudo apt-get install libdb4.8++-dev + sudo apt-get install libboost1.37-dev + (If using Boost 1.37, append -mt to the boost libraries in the makefile) + +Optional: + sudo apt-get install libminiupnpc-dev (see USE_UPNP compile flag) Dependency Build Instructions: Gentoo diff --git a/doc/coding.txt b/doc/coding.txt index b3c812a486..0813105e73 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-notes.txt b/doc/release-notes.txt index 99ba67690b..3c975af92f 100644 --- a/doc/release-notes.txt +++ b/doc/release-notes.txt @@ -1,71 +1,26 @@ - (note: this is a temporary file, to be added-to by anybody, and deleted at release time) Building this from - $ git shortlog --no-merges v0.6.3.. - - - -Core bitcoin handling and blockchain database ---------------------------------------------- -* Reduced CPU usage, by eliminating some redundant hash calculations -* Cache signature verifications, to eliminate redundant signature checks -* Mining: when creating new blocks, sort 'paid' area by fee-per-kb -* Database: better validation of on-disk stored data -* Database: minor optimizations and reliability improvements -* -loadblock=FILE will import an external block file - - -JSON-RPC API ------------- -* Internal HTTP server is now thread-per-connection, rather than - a single-threaded queue that would stall on network I/O. -* Internal HTTP server supports HTTP/1.1, pipelined requests and - connection keep-alive. -* Support JSON-RPC 2.0 batches, to encapsulate multiple JSON-RPC requests - within a single HTTP request. -* IPv6 support -* Added raw transaction API. See https://gist.github.com/2839617 -* Added 'getrawmempool', to list contents of TX memory pool -* Added 'getpeerinfo', to list data about each connected network peer -* Rework gettransaction, getblock calls. 'gettransaction' responds for - non-wallet TXs now. -* Remove deprecated RPC 'getblocknumber' - + $ git shortlog --no-merges v0.7.0.. -P2P networking +How to Upgrade -------------- -* IPv6 support -* Tor/I2P hidden service support -* Attempts to fix "stuck blockchain download" problems -* Replace BDB database "addr.dat" with internally-managed "peers.dat" - file containing peer address data. -* Lower default send buffer from 10MB to 1MB -* proxy: SOCKS5 by default -* Support connecting by hostnames passed to proxy (-proxydns) -* Add -seednode connections, and use this for -dnsseed + -proxydns -* Added -externalip and -discover -* Add -onlynet to prevent connections to a given network -* Separate listening sockets, -bind=<addr> - - -Qt GUI ---------------------- -????? - - -Internal codebase ------------------ -* Additional unit tests -* Compile warning fixes - - -Miscellaneous -------------- -* Reopen debug.log upon SIGHUP -* Bash programmable completion for bitcoind(1) -* On supported OS's, each thread is given a useful name +If you are running an older version, shut it down. Wait +until it has completely shut down (which might take a few minutes for older +versions), then run the installer (on Windows) or just copy over +/Applications/Bitcoin-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). + +If you were running on Linux with a version that might have been compiled +with a different version of Berkeley DB (for example, if you were using an +Ubuntu PPA version), then run the old version again with the -detachdb +argument and shut it down; if you do not, then the new version will not +be able to read the database files and will exit with an error. + +Bug fixes +--------- +* Fixed an uninitialized variable bug that could cause transactions to + be reported out of order. diff --git a/doc/release-process.txt b/doc/release-process.txt index 59488a7bfe..8443961d27 100644 --- a/doc/release-process.txt +++ b/doc/release-process.txt @@ -2,7 +2,7 @@ * update (commit) version in sources bitcoin-qt.pro - src/version.h + src/clientversion.h share/setup.nsi doc/README* @@ -21,7 +21,7 @@ export VERSION=0.5.1 cd ./gitian-builder - * Fetch and build inputs: + * Fetch and build inputs: (first time, or when dependency versions change) mkdir -p inputs; cd inputs/ wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.6.tar.gz' -O miniupnpc-1.6.tar.gz wget 'http://www.openssl.org/source/openssl-1.0.1b.tar.gz' @@ -29,15 +29,15 @@ wget 'http://zlib.net/zlib-1.2.6.tar.gz' wget 'ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.9.tar.gz' wget 'http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2' - wget 'http://downloads.sourceforge.net/project/boost/boost/1.47.0/boost_1_47_0.tar.bz2' + wget 'http://downloads.sourceforge.net/project/boost/boost/1.50.0/boost_1_50_0.tar.bz2' wget 'http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz' cd .. ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-win32.yml - cp build/out/boost-win32-1.47.0-gitian.zip inputs/ + mv build/out/boost-win32-1.50.0-gitian2.zip inputs/ ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/qt-win32.yml - cp build/out/qt-win32-4.7.4-gitian.zip inputs/ + mv build/out/qt-win32-4.7.4-gitian.zip inputs/ ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-win32.yml - cp build/out/bitcoin-deps-0.0.3.zip inputs/ + mv build/out/bitcoin-deps-0.0.3.zip inputs/ * Build bitcoind and bitcoin-qt on Linux32, Linux64, and Win32: ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian.yml diff --git a/share/setup.nsi b/share/setup.nsi index 87cd58a855..4e48718a49 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.99
+!define VERSION 0.7.0
!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.99-win32-setup.exe
+OutFile bitcoin-0.7.0-win32-setup.exe
InstallDir $PROGRAMFILES\Bitcoin
CRCCheck on
XPStyle on
BrandingText " "
ShowInstDetails show
-VIProductVersion 0.6.99.0
+VIProductVersion 0.7.0.3
VIAddVersionKey ProductName Bitcoin
VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"
diff --git a/src/addrman.cpp b/src/addrman.cpp index 321ebd1e2b..4428cd169a 100644 --- a/src/addrman.cpp +++ b/src/addrman.cpp @@ -187,7 +187,7 @@ int CAddrMan::ShrinkNew(int nUBucket) } assert(mapInfo.count(nOldest) == 1); CAddrInfo &info = mapInfo[nOldest]; - if (--info.nRefCount == 0) + if (--info.nRefCount == 0) { SwapRandom(info.nRandomPos, vRandom.size()-1); vRandom.pop_back(); @@ -241,7 +241,7 @@ void CAddrMan::MakeTried(CAddrInfo& info, int nId, int nOrigin) infoOld.nRefCount = 1; // do not update nTried, as we are going to move something else there immediately - // check whether there is place in that one, + // check whether there is place in that one, if (vNew.size() < ADDRMAN_NEW_BUCKET_SIZE) { // if so, move it back there diff --git a/src/addrman.h b/src/addrman.h index 7c141c427b..7af6afd78f 100644 --- a/src/addrman.h +++ b/src/addrman.h @@ -214,7 +214,7 @@ protected: // This is the only place where actual deletes occur. // They are never deleted while in the "tried" table, only possibly evicted back to the "new" table. int ShrinkNew(int nUBucket); - + // Move an entry from the "new" table(s) to the "tried" table // @pre vvUnkown[nOrigin].count(nId) != 0 void MakeTried(CAddrInfo& info, int nId, int nOrigin); diff --git a/src/alert.cpp b/src/alert.cpp new file mode 100644 index 0000000000..48920629e2 --- /dev/null +++ b/src/alert.cpp @@ -0,0 +1,239 @@ +// +// Alert system +// + +#include <boost/foreach.hpp> +#include <map> + +#include "alert.h" +#include "key.h" +#include "net.h" +#include "sync.h" +#include "ui_interface.h" + +using namespace std; + +map<uint256, CAlert> mapAlerts; +CCriticalSection cs_mapAlerts; + +static const char* pszMainKey = "04fc9702847840aaf195de8442ebecedf5b095cdbb9bc716bda9110971b28a49e0ead8564ff0db22209e0374782c093bb899692d524e9d6a6956e7c5ecbcd68284"; +static const char* pszTestKey = "04302390343f91cc401d56d68b123028bf52e5fca1939df127f63c6467cdf9c8e2c14b61104cf817d0b780da337893ecc4aaff1309e536162dabbdb45200ca2b0a"; + +void CUnsignedAlert::SetNull() +{ + nVersion = 1; + nRelayUntil = 0; + nExpiration = 0; + nID = 0; + nCancel = 0; + setCancel.clear(); + nMinVer = 0; + nMaxVer = 0; + setSubVer.clear(); + nPriority = 0; + + strComment.clear(); + strStatusBar.clear(); + strReserved.clear(); +} + +std::string CUnsignedAlert::ToString() const +{ + std::string strSetCancel; + BOOST_FOREACH(int n, setCancel) + strSetCancel += strprintf("%d ", n); + std::string strSetSubVer; + BOOST_FOREACH(std::string str, setSubVer) + strSetSubVer += "\"" + str + "\" "; + return strprintf( + "CAlert(\n" + " nVersion = %d\n" + " nRelayUntil = %"PRI64d"\n" + " nExpiration = %"PRI64d"\n" + " nID = %d\n" + " nCancel = %d\n" + " setCancel = %s\n" + " nMinVer = %d\n" + " nMaxVer = %d\n" + " setSubVer = %s\n" + " nPriority = %d\n" + " strComment = \"%s\"\n" + " strStatusBar = \"%s\"\n" + ")\n", + nVersion, + nRelayUntil, + nExpiration, + nID, + nCancel, + strSetCancel.c_str(), + nMinVer, + nMaxVer, + strSetSubVer.c_str(), + nPriority, + strComment.c_str(), + strStatusBar.c_str()); +} + +void CUnsignedAlert::print() const +{ + printf("%s", ToString().c_str()); +} + +void CAlert::SetNull() +{ + CUnsignedAlert::SetNull(); + vchMsg.clear(); + vchSig.clear(); +} + +bool CAlert::IsNull() const +{ + return (nExpiration == 0); +} + +uint256 CAlert::GetHash() const +{ + return Hash(this->vchMsg.begin(), this->vchMsg.end()); +} + +bool CAlert::IsInEffect() const +{ + return (GetAdjustedTime() < nExpiration); +} + +bool CAlert::Cancels(const CAlert& alert) const +{ + if (!IsInEffect()) + return false; // this was a no-op before 31403 + return (alert.nID <= nCancel || setCancel.count(alert.nID)); +} + +bool CAlert::AppliesTo(int nVersion, std::string strSubVerIn) const +{ + // TODO: rework for client-version-embedded-in-strSubVer ? + return (IsInEffect() && + nMinVer <= nVersion && nVersion <= nMaxVer && + (setSubVer.empty() || setSubVer.count(strSubVerIn))); +} + +bool CAlert::AppliesToMe() const +{ + return AppliesTo(PROTOCOL_VERSION, FormatSubVersion(CLIENT_NAME, CLIENT_VERSION, std::vector<std::string>())); +} + +bool CAlert::RelayTo(CNode* pnode) const +{ + if (!IsInEffect()) + return false; + // returns true if wasn't already contained in the set + if (pnode->setKnown.insert(GetHash()).second) + { + if (AppliesTo(pnode->nVersion, pnode->strSubVer) || + AppliesToMe() || + GetAdjustedTime() < nRelayUntil) + { + pnode->PushMessage("alert", *this); + return true; + } + } + return false; +} + +bool CAlert::CheckSignature() const +{ + CKey key; + if (!key.SetPubKey(ParseHex(fTestNet ? pszTestKey : pszMainKey))) + return error("CAlert::CheckSignature() : SetPubKey failed"); + if (!key.Verify(Hash(vchMsg.begin(), vchMsg.end()), vchSig)) + return error("CAlert::CheckSignature() : verify signature failed"); + + // Now unserialize the data + CDataStream sMsg(vchMsg, SER_NETWORK, PROTOCOL_VERSION); + sMsg >> *(CUnsignedAlert*)this; + return true; +} + +CAlert CAlert::getAlertByHash(const uint256 &hash) +{ + CAlert retval; + { + LOCK(cs_mapAlerts); + map<uint256, CAlert>::iterator mi = mapAlerts.find(hash); + if(mi != mapAlerts.end()) + retval = mi->second; + } + return retval; +} + +bool CAlert::ProcessAlert() +{ + if (!CheckSignature()) + return false; + if (!IsInEffect()) + return false; + + // alert.nID=max is reserved for if the alert key is + // compromised. It must have a pre-defined message, + // must never expire, must apply to all versions, + // and must cancel all previous + // alerts or it will be ignored (so an attacker can't + // send an "everything is OK, don't panic" version that + // cannot be overridden): + int maxInt = std::numeric_limits<int>::max(); + if (nID == maxInt) + { + if (!( + nExpiration == maxInt && + nCancel == (maxInt-1) && + nMinVer == 0 && + nMaxVer == maxInt && + setSubVer.empty() && + nPriority == maxInt && + strStatusBar == "URGENT: Alert key compromised, upgrade required" + )) + return false; + } + + { + LOCK(cs_mapAlerts); + // Cancel previous alerts + for (map<uint256, CAlert>::iterator mi = mapAlerts.begin(); mi != mapAlerts.end();) + { + const CAlert& alert = (*mi).second; + if (Cancels(alert)) + { + printf("cancelling alert %d\n", alert.nID); + uiInterface.NotifyAlertChanged((*mi).first, CT_DELETED); + mapAlerts.erase(mi++); + } + else if (!alert.IsInEffect()) + { + printf("expiring alert %d\n", alert.nID); + uiInterface.NotifyAlertChanged((*mi).first, CT_DELETED); + mapAlerts.erase(mi++); + } + else + mi++; + } + + // Check if this alert has been cancelled + BOOST_FOREACH(PAIRTYPE(const uint256, CAlert)& item, mapAlerts) + { + const CAlert& alert = item.second; + if (alert.Cancels(*this)) + { + printf("alert already cancelled by %d\n", alert.nID); + return false; + } + } + + // Add to mapAlerts + mapAlerts.insert(make_pair(GetHash(), *this)); + // Notify UI if it applies to me + if(AppliesToMe()) + uiInterface.NotifyAlertChanged(GetHash(), CT_NEW); + } + + printf("accepted alert %d, AppliesToMe()=%d\n", nID, AppliesToMe()); + return true; +} diff --git a/src/alert.h b/src/alert.h new file mode 100644 index 0000000000..7949c76972 --- /dev/null +++ b/src/alert.h @@ -0,0 +1,102 @@ +// 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 _BITCOINALERT_H_ +#define _BITCOINALERT_H_ 1 + +#include <set> +#include <string> + +#include "uint256.h" +#include "util.h" + +class CNode; + +/** Alerts are for notifying old versions if they become too obsolete and + * need to upgrade. The message is displayed in the status bar. + * Alert messages are broadcast as a vector of signed data. Unserializing may + * not read the entire buffer if the alert is for a newer version, but older + * versions can still relay the original data. + */ +class CUnsignedAlert +{ +public: + int nVersion; + int64 nRelayUntil; // when newer nodes stop relaying to newer nodes + int64 nExpiration; + int nID; + int nCancel; + std::set<int> setCancel; + int nMinVer; // lowest version inclusive + int nMaxVer; // highest version inclusive + std::set<std::string> setSubVer; // empty matches all + int nPriority; + + // Actions + std::string strComment; + std::string strStatusBar; + std::string strReserved; + + IMPLEMENT_SERIALIZE + ( + READWRITE(this->nVersion); + nVersion = this->nVersion; + READWRITE(nRelayUntil); + READWRITE(nExpiration); + READWRITE(nID); + READWRITE(nCancel); + READWRITE(setCancel); + READWRITE(nMinVer); + READWRITE(nMaxVer); + READWRITE(setSubVer); + READWRITE(nPriority); + + READWRITE(strComment); + READWRITE(strStatusBar); + READWRITE(strReserved); + ) + + void SetNull(); + + std::string ToString() const; + void print() const; +}; + +/** An alert is a combination of a serialized CUnsignedAlert and a signature. */ +class CAlert : public CUnsignedAlert +{ +public: + std::vector<unsigned char> vchMsg; + std::vector<unsigned char> vchSig; + + CAlert() + { + SetNull(); + } + + IMPLEMENT_SERIALIZE + ( + READWRITE(vchMsg); + READWRITE(vchSig); + ) + + void SetNull(); + bool IsNull() const; + uint256 GetHash() const; + bool IsInEffect() const; + bool Cancels(const CAlert& alert) const; + bool AppliesTo(int nVersion, std::string strSubVerIn) const; + bool AppliesToMe() const; + bool RelayTo(CNode* pnode) const; + bool CheckSignature() const; + bool ProcessAlert(); + + /* + * Get copy of (active) alert object by hash. Returns a null alert if it is not found. + */ + static CAlert getAlertByHash(const uint256 &hash); +}; + +#endif diff --git a/src/allocators.h b/src/allocators.h index ddeabc48c5..99afa10c25 100644 --- a/src/allocators.h +++ b/src/allocators.h @@ -7,6 +7,8 @@ #include <string.h> #include <string> +#include <boost/thread/mutex.hpp> +#include <map> #ifdef WIN32 #ifdef _WIN32_WINNT @@ -22,23 +24,156 @@ // 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) +#include <limits.h> // for PAGESIZE +#include <unistd.h> // for sysconf #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)))) + +/** + * Thread-safe class to keep track of locked (ie, non-swappable) memory pages. + * + * Memory locks do not stack, that is, pages which have been locked several times by calls to mlock() + * will be unlocked by a single call to munlock(). This can result in keying material ending up in swap when + * those functions are used naively. This class simulates stacking memory locks by keeping a counter per page. + * + * @note By using a map from each page base address to lock count, this class is optimized for + * small objects that span up to a few pages, mostly smaller than a page. To support large allocations, + * something like an interval tree would be the preferred data structure. + */ +template <class Locker> class LockedPageManagerBase +{ +public: + LockedPageManagerBase(size_t page_size): + page_size(page_size) + { + // Determine bitmask for extracting page from address + assert(!(page_size & (page_size-1))); // size must be power of two + page_mask = ~(page_size - 1); + } + + // For all pages in affected range, increase lock count + void LockRange(void *p, size_t size) + { + boost::mutex::scoped_lock lock(mutex); + if(!size) return; + const size_t base_addr = reinterpret_cast<size_t>(p); + const size_t start_page = base_addr & page_mask; + const size_t end_page = (base_addr + size - 1) & page_mask; + for(size_t page = start_page; page <= end_page; page += page_size) + { + Histogram::iterator it = histogram.find(page); + if(it == histogram.end()) // Newly locked page + { + locker.Lock(reinterpret_cast<void*>(page), page_size); + histogram.insert(std::make_pair(page, 1)); + } + else // Page was already locked; increase counter + { + it->second += 1; + } + } + } + + // For all pages in affected range, decrease lock count + void UnlockRange(void *p, size_t size) + { + boost::mutex::scoped_lock lock(mutex); + if(!size) return; + const size_t base_addr = reinterpret_cast<size_t>(p); + const size_t start_page = base_addr & page_mask; + const size_t end_page = (base_addr + size - 1) & page_mask; + for(size_t page = start_page; page <= end_page; page += page_size) + { + Histogram::iterator it = histogram.find(page); + assert(it != histogram.end()); // Cannot unlock an area that was not locked + // Decrease counter for page, when it is zero, the page will be unlocked + it->second -= 1; + if(it->second == 0) // Nothing on the page anymore that keeps it locked + { + // Unlock page and remove the count from histogram + locker.Unlock(reinterpret_cast<void*>(page), page_size); + histogram.erase(it); + } + } + } + + // Get number of locked pages for diagnostics + int GetLockedPageCount() + { + boost::mutex::scoped_lock lock(mutex); + return histogram.size(); + } + +private: + Locker locker; + boost::mutex mutex; + size_t page_size, page_mask; + // map of page base address to lock count + typedef std::map<size_t,int> Histogram; + Histogram histogram; +}; + +/** Determine system page size in bytes */ +static inline size_t GetSystemPageSize() +{ + size_t page_size; +#if defined(WIN32) + SYSTEM_INFO sSysInfo; + GetSystemInfo(&sSysInfo); + page_size = sSysInfo.dwPageSize; +#elif defined(PAGESIZE) // defined in limits.h + page_size = PAGESIZE; +#else // assume some POSIX OS + page_size = sysconf(_SC_PAGESIZE); +#endif + return page_size; +} + +/** + * OS-dependent memory page locking/unlocking. + * Defined as policy class to make stubbing for test possible. + */ +class MemoryPageLocker +{ +public: + /** Lock memory pages. + * addr and len must be a multiple of the system page size + */ + bool Lock(const void *addr, size_t len) + { +#ifdef WIN32 + return VirtualLock(const_cast<void*>(addr), len); +#else + return mlock(addr, len) == 0; +#endif + } + /** Unlock memory pages. + * addr and len must be a multiple of the system page size + */ + bool Unlock(const void *addr, size_t len) + { +#ifdef WIN32 + return VirtualUnlock(const_cast<void*>(addr), len); +#else + return munlock(addr, len) == 0; #endif + } +}; + +/** + * Singleton class to keep track of locked (ie, non-swappable) memory pages, for use in + * std::allocator templates. + */ +class LockedPageManager: public LockedPageManagerBase<MemoryPageLocker> +{ +public: + static LockedPageManager instance; // instantiated in util.cpp +private: + LockedPageManager(): + LockedPageManagerBase<MemoryPageLocker>(GetSystemPageSize()) + {} +}; // // Allocator that locks its contents from being paged @@ -69,7 +204,7 @@ struct secure_allocator : public std::allocator<T> T *p; p = std::allocator<T>::allocate(n, hint); if (p != NULL) - mlock(p, sizeof(T) * n); + LockedPageManager::instance.LockRange(p, sizeof(T) * n); return p; } @@ -78,7 +213,7 @@ struct secure_allocator : public std::allocator<T> if (p != NULL) { memset(p, 0, sizeof(T) * n); - munlock(p, sizeof(T) * n); + LockedPageManager::instance.UnlockRange(p, sizeof(T) * n); } std::allocator<T>::deallocate(p, n); } diff --git a/src/base58.h b/src/base58.h index fc8c8aa5de..9dfea86ff5 100644 --- a/src/base58.h +++ b/src/base58.h @@ -403,7 +403,7 @@ class CBitcoinSecret : public CBase58Data { public: void SetSecret(const CSecret& vchSecret, bool fCompressed) - { + { assert(vchSecret.size() == 32); SetData(fTestNet ? 239 : 128, &vchSecret[0], vchSecret.size()); if (fCompressed) diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 5537eb4815..1a3f51ea4d 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -104,8 +104,7 @@ Value ValueFromAmount(int64 amount) return (double)amount / (double)COIN; } -std::string -HexBits(unsigned int nBits) +std::string HexBits(unsigned int nBits) { union { int32_t nBits; @@ -231,6 +230,7 @@ static const CRPCCommand vRPCCommands[] = { "getblockhash", &getblockhash, false, false }, { "gettransaction", &gettransaction, false, false }, { "listtransactions", &listtransactions, false, false }, + { "listaddressgroupings", &listaddressgroupings, false, false }, { "signmessage", &signmessage, false, false }, { "verifymessage", &verifymessage, false, false }, { "getwork", &getwork, true, false }, @@ -697,7 +697,7 @@ static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol, } // start HTTP client thread - else if (!CreateThread(ThreadRPCServer3, conn)) { + else if (!NewThread(ThreadRPCServer3, conn)) { printf("Failed to create RPC server client thread\n"); delete conn; } @@ -761,17 +761,19 @@ void ThreadRPCServer2(void* parg) const bool loopback = !mapArgs.count("-rpcallowip"); asio::ip::address bindAddress = loopback ? asio::ip::address_v6::loopback() : asio::ip::address_v6::any(); ip::tcp::endpoint endpoint(bindAddress, GetArg("-rpcport", 8332)); + boost::system::error_code v6_only_error; + boost::shared_ptr<ip::tcp::acceptor> acceptor(new ip::tcp::acceptor(io_service)); boost::signals2::signal<void ()> StopRequests; + bool fListening = false; + std::string strerr; try { - boost::shared_ptr<ip::tcp::acceptor> acceptor(new ip::tcp::acceptor(io_service)); acceptor->open(endpoint.protocol()); acceptor->set_option(boost::asio::ip::tcp::acceptor::reuse_address(true)); // Try making the socket dual IPv6/IPv4 (if listening on the "any" address) - boost::system::error_code v6_only_error; acceptor->set_option(boost::asio::ip::v6_only(loopback), v6_only_error); acceptor->bind(endpoint); @@ -783,8 +785,16 @@ void ThreadRPCServer2(void* parg) static_cast<void (ip::tcp::acceptor::*)()>(&ip::tcp::acceptor::close), acceptor.get()) .track(acceptor)); + fListening = true; + } + catch(boost::system::system_error &e) + { + strerr = strprintf(_("An error occurred while setting up the RPC port %i for listening on IPv6, falling back to IPv4: %s"), endpoint.port(), e.what()); + } + + try { // If dual IPv6/IPv4 failed (or we're opening loopback interfaces only), open IPv4 separately - if (loopback || v6_only_error) + if (!fListening || loopback || v6_only_error) { bindAddress = loopback ? asio::ip::address_v4::loopback() : asio::ip::address_v4::any(); endpoint.address(bindAddress); @@ -800,12 +810,17 @@ void ThreadRPCServer2(void* parg) StopRequests.connect(signals2::slot<void ()>( static_cast<void (ip::tcp::acceptor::*)()>(&ip::tcp::acceptor::close), acceptor.get()) .track(acceptor)); + + fListening = true; } } catch(boost::system::system_error &e) { - uiInterface.ThreadSafeMessageBox(strprintf(_("An error occurred while setting up the RPC port %i for listening: %s"), endpoint.port(), e.what()), - _("Error"), CClientUIInterface::OK | CClientUIInterface::MODAL); + strerr = strprintf(_("An error occurred while setting up the RPC port %i for listening on IPv4: %s"), endpoint.port(), e.what()); + } + + if (!fListening) { + uiInterface.ThreadSafeMessageBox(strerr, _("Error"), CClientUIInterface::OK | CClientUIInterface::MODAL); StartShutdown(); return; } @@ -968,7 +983,7 @@ void ThreadRPCServer3(void* parg) strReply = JSONRPCExecBatch(valRequest.get_array()); else throw JSONRPCError(-32700, "Top-level object parse error"); - + conn->stream() << HTTPReply(200, strReply, fRun) << std::flush; } catch (Object& objError) @@ -1139,6 +1154,7 @@ Array RPCConvertValues(const std::string &strMethod, const std::vector<std::stri if (strMethod == "addmultisigaddress" && n > 1) ConvertTo<Array>(params[1]); if (strMethod == "listunspent" && n > 0) ConvertTo<boost::int64_t>(params[0]); if (strMethod == "listunspent" && n > 1) ConvertTo<boost::int64_t>(params[1]); + if (strMethod == "listunspent" && n > 2) ConvertTo<Array>(params[2]); if (strMethod == "getrawtransaction" && n > 1) ConvertTo<boost::int64_t>(params[1]); if (strMethod == "createrawtransaction" && n > 0) ConvertTo<Array>(params[0]); if (strMethod == "createrawtransaction" && n > 1) ConvertTo<Object>(params[1]); diff --git a/src/bitcoinrpc.h b/src/bitcoinrpc.h index 6a1857cb44..94446c36bb 100644 --- a/src/bitcoinrpc.h +++ b/src/bitcoinrpc.h @@ -114,6 +114,7 @@ extern json_spirit::Value addmultisigaddress(const json_spirit::Array& params, b extern json_spirit::Value listreceivedbyaddress(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value listreceivedbyaccount(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value listtransactions(const json_spirit::Array& params, bool fHelp); +extern json_spirit::Value listaddressgroupings(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value listaccounts(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value listsinceblock(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value gettransaction(const json_spirit::Array& params, bool fHelp); diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 2df647e83d..8208854962 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -29,7 +29,7 @@ namespace Checkpoints (105000, uint256("0x00000000000291ce28027faea320c8d2b054b2e0fe44a773f3eefb151d6bdc97")) (134444, uint256("0x00000000000005b12ffd4cd315cd34ffd4a594f430ac814c91184a0d42d2b0fe")) (168000, uint256("0x000000000000099e61ea72015e79632f216fe6cb33d7899acb35b75c8303b763")) - (185333, uint256("0x00000000000002334c71b8706940c20348af897a9cfc0f1a6dab0d14d4ceb815")) + (193000, uint256("0x000000000000059f452a5f7340de6682a977387c17010ff6e6c3bd83ca8b1317")) ; static MapCheckpoints mapCheckpointsTestnet = diff --git a/src/clientversion.h b/src/clientversion.h new file mode 100644 index 0000000000..548105383c --- /dev/null +++ b/src/clientversion.h @@ -0,0 +1,19 @@ +#ifndef CLIENTVERSION_H +#define CLIENTVERSION_H + +// +// client versioning +// + +// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it +#define CLIENT_VERSION_MAJOR 0 +#define CLIENT_VERSION_MINOR 7 +#define CLIENT_VERSION_REVISION 0 +#define CLIENT_VERSION_BUILD 99 + +// Converts the parameter X to a string after macro replacement on X has been performed. +// Don't merge these into one macro! +#define STRINGIZE(X) DO_STRINGIZE(X) +#define DO_STRINGIZE(X) #X + +#endif // CLIENTVERSION_H diff --git a/src/crypter.cpp b/src/crypter.cpp index 411a1ee4c1..181b8fa00a 100644 --- a/src/crypter.cpp +++ b/src/crypter.cpp @@ -17,12 +17,6 @@ bool CCrypter::SetKeyFromPassphrase(const SecureString& strKeyData, const std::v if (nRounds < 1 || chSalt.size() != WALLET_CRYPTO_SALT_SIZE) return false; - // Try to keep the key data out of swap (and be a bit over-careful to keep the IV that we don't even use out of swap) - // Note that this does nothing about suspend-to-disk (which will put all our key data on disk) - // Note as well that at no point in this program is any attempt made to prevent stealing of keys by reading the memory of the running process. - mlock(&chKey[0], sizeof chKey); - mlock(&chIV[0], sizeof chIV); - int i = 0; if (nDerivationMethod == 0) i = EVP_BytesToKey(EVP_aes_256_cbc(), EVP_sha512(), &chSalt[0], @@ -44,12 +38,6 @@ bool CCrypter::SetKey(const CKeyingMaterial& chNewKey, const std::vector<unsigne if (chNewKey.size() != WALLET_CRYPTO_KEY_SIZE || chNewIV.size() != WALLET_CRYPTO_KEY_SIZE) return false; - // Try to keep the key data out of swap - // Note that this does nothing about suspend-to-disk (which will put all our key data on disk) - // Note as well that at no point in this program is any attempt made to prevent stealing of keys by reading the memory of the running process. - mlock(&chKey[0], sizeof chKey); - mlock(&chIV[0], sizeof chIV); - memcpy(&chKey[0], &chNewKey[0], sizeof chKey); memcpy(&chIV[0], &chNewIV[0], sizeof chIV); diff --git a/src/crypter.h b/src/crypter.h index d1bdb92c91..04538a3fa5 100644 --- a/src/crypter.h +++ b/src/crypter.h @@ -78,19 +78,26 @@ public: { memset(&chKey, 0, sizeof chKey); memset(&chIV, 0, sizeof chIV); - munlock(&chKey, sizeof chKey); - munlock(&chIV, sizeof chIV); fKeySet = false; } CCrypter() { fKeySet = false; + + // Try to keep the key data out of swap (and be a bit over-careful to keep the IV that we don't even use out of swap) + // Note that this does nothing about suspend-to-disk (which will put all our key data on disk) + // Note as well that at no point in this program is any attempt made to prevent stealing of keys by reading the memory of the running process. + LockedPageManager::instance.LockRange(&chKey[0], sizeof chKey); + LockedPageManager::instance.LockRange(&chIV[0], sizeof chIV); } ~CCrypter() { CleanKey(); + + LockedPageManager::instance.UnlockRange(&chKey[0], sizeof chKey); + LockedPageManager::instance.UnlockRange(&chIV[0], sizeof chIV); } }; diff --git a/src/db.cpp b/src/db.cpp index 5671993d37..867703fbd2 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -195,10 +195,7 @@ CDB::CDB(const char *pszFile, const char* pszMode) : { delete pdb; pdb = NULL; - { - LOCK(bitdb.cs_db); - --bitdb.mapFileUseCount[strFile]; - } + --bitdb.mapFileUseCount[strFile]; strFile = ""; throw runtime_error(strprintf("CDB() : can't open database file %s, error %d", pszFile, ret)); } @@ -284,7 +281,7 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip) { // surround usage of db with extra {} CDB db(strFile.c_str(), "r"); Db* pdbCopy = new Db(&bitdb.dbenv, 0); - + int ret = pdbCopy->open(NULL, // Txn pointer strFileRes.c_str(), // Filename "main", // Logical db name @@ -296,7 +293,7 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip) printf("Cannot create database file %s\n", strFileRes.c_str()); fSuccess = false; } - + Dbc* pcursor = db.GetCursor(); if (pcursor) while (fSuccess) diff --git a/src/init.cpp b/src/init.cpp index 25756c4e6f..dc425da644 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -46,7 +46,7 @@ void StartShutdown() uiInterface.QueueShutdown(); #else // Without UI, Shutdown() can simply be started in a new thread - CreateThread(Shutdown, NULL); + NewThread(Shutdown, NULL); #endif } @@ -78,7 +78,7 @@ void Shutdown(void* parg) boost::filesystem::remove(GetPidFile()); UnregisterWallet(pwalletMain); delete pwalletMain; - CreateThread(ExitTimeout, NULL); + NewThread(ExitTimeout, NULL); Sleep(50); printf("Bitcoin exited\n\n"); fExit = true; @@ -225,7 +225,7 @@ std::string HelpMessage() " -datadir=<dir> " + _("Specify data directory") + "\n" + " -dbcache=<n> " + _("Set database cache size in megabytes (default: 25)") + "\n" + " -dblogsize=<n> " + _("Set database disk log size in megabytes (default: 100)") + "\n" + - " -timeout=<n> " + _("Specify connection timeout (in milliseconds)") + "\n" + + " -timeout=<n> " + _("Specify connection timeout in milliseconds (default: 5000)") + "\n" + " -proxy=<ip:port> " + _("Connect through socks proxy") + "\n" + " -socks=<n> " + _("Select the version of socks proxy to use (4-5, default: 5)") + "\n" + " -tor=<ip:port> " + _("Use proxy to reach tor hidden services (default: same as -proxy)") + "\n" @@ -469,7 +469,8 @@ bool AppInit2() 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 (%s)\n", FormatFullVersion().c_str(), CLIENT_DATE.c_str()); printf("Using OpenSSL version %s\n", SSLeay_version(SSLEAY_VERSION)); - printf("Startup time: %s\n", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str()); + if (!fLogTimestamps) + printf("Startup time: %s\n", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str()); printf("Default data directory %s\n", GetDefaultDataDir().string().c_str()); printf("Used data directory %s\n", GetDataDir().string().c_str()); std::ostringstream strErrors; @@ -645,7 +646,7 @@ bool AppInit2() uiInterface.InitMessage(_("Loading wallet...")); printf("Loading wallet...\n"); nStart = GetTimeMillis(); - bool fFirstRun; + bool fFirstRun = true; pwalletMain = new CWallet("wallet.dat"); int nLoadWalletRet = pwalletMain->LoadWallet(fFirstRun); if (nLoadWalletRet != DB_LOAD_OK) @@ -759,11 +760,11 @@ bool AppInit2() printf("mapWallet.size() = %d\n", pwalletMain->mapWallet.size()); printf("mapAddressBook.size() = %d\n", pwalletMain->mapAddressBook.size()); - if (!CreateThread(StartNode, NULL)) + if (!NewThread(StartNode, NULL)) InitError(_("Error: could not start node")); if (fServer) - CreateThread(ThreadRPCServer, NULL); + NewThread(ThreadRPCServer, NULL); // ********************************************************* Step 11: finished diff --git a/src/irc.cpp b/src/irc.cpp index 50c6a5b4db..6991e6ee7e 100644 --- a/src/irc.cpp +++ b/src/irc.cpp @@ -207,16 +207,22 @@ void ThreadIRCSeed(void* parg) void ThreadIRCSeed2(void* parg) { - /* Don't advertise on IRC if we don't allow incoming connections */ - if (mapArgs.count("-connect") || fNoListen) + // Don't connect to IRC if we won't use IPv4 connections. + if (IsLimited(NET_IPV4)) return; + // ... or if we won't make outbound connections and won't accept inbound ones. + if (mapArgs.count("-connect") && fNoListen) + return; + + // ... or if IRC is not enabled. if (!GetBoolArg("-irc", false)) return; printf("ThreadIRCSeed started\n"); int nErrorWait = 10; int nRetryWait = 10; + int nNameRetry = 0; while (!fShutdown) { @@ -251,7 +257,9 @@ void ThreadIRCSeed2(void* parg) CNetAddr addrIPv4("1.2.3.4"); // arbitrary IPv4 address to make GetLocal prefer IPv4 addresses CService addrLocal; string strMyName; - if (GetLocal(addrLocal, &addrIPv4)) + // Don't use our IP as our nick if we're not listening + // or if it keeps failing because the nick is already in use. + if (!fNoListen && GetLocal(addrLocal, &addrIPv4) && nNameRetry<3) strMyName = EncodeAddress(GetLocalAddress(&addrConnect)); if (strMyName == "") strMyName = strprintf("x%u", GetRand(1000000000)); @@ -267,6 +275,7 @@ void ThreadIRCSeed2(void* parg) if (nRet == 2) { printf("IRC name already in use\n"); + nNameRetry++; Wait(10); continue; } @@ -276,6 +285,7 @@ void ThreadIRCSeed2(void* parg) else return; } + nNameRetry = 0; Sleep(500); // Get our external IP from the IRC server and re-nick before joining the channel @@ -283,7 +293,8 @@ void ThreadIRCSeed2(void* parg) if (GetIPFromIRC(hSocket, strMyName, addrFromIRC)) { printf("GetIPFromIRC() returned %s\n", addrFromIRC.ToString().c_str()); - if (addrFromIRC.IsRoutable()) + // Don't use our IP as our nick if we're not listening + if (!fNoListen && addrFromIRC.IsRoutable()) { // IRC lets you to re-nick AddLocal(addrFromIRC, LOCAL_IRC); @@ -291,7 +302,7 @@ void ThreadIRCSeed2(void* parg) Send(hSocket, strprintf("NICK %s\r", strMyName.c_str()).c_str()); } } - + if (fTestNet) { Send(hSocket, "JOIN #bitcoinTEST3\r"); Send(hSocket, "WHO #bitcoinTEST3\r"); @@ -99,7 +99,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) diff --git a/src/main.cpp b/src/main.cpp index 91aba149bc..fbaf05dfc7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,6 +3,7 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include "alert.h" #include "checkpoints.h" #include "db.h" #include "net.h" @@ -281,9 +282,12 @@ bool CTransaction::IsStandard() const if (!txin.scriptSig.IsPushOnly()) return false; } - BOOST_FOREACH(const CTxOut& txout, vout) + BOOST_FOREACH(const CTxOut& txout, vout) { if (!::IsStandard(txout.scriptPubKey)) return false; + if (txout.nValue == 0) + return false; + } return true; } @@ -473,6 +477,55 @@ bool CTransaction::CheckTransaction() const return true; } +int64 CTransaction::GetMinFee(unsigned int nBlockSize, bool fAllowFree, + enum GetMinFee_mode mode) const +{ + // 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, PROTOCOL_VERSION); + unsigned int nNewBlockSize = nBlockSize + nBytes; + int64 nMinFee = (1 + (int64)nBytes / 1000) * nBaseFee; + + if (fAllowFree) + { + if (nBlockSize == 1) + { + // Transactions under 10K are free + // (about 4500 BTC if made of 50 BTC inputs) + if (nBytes < 10000) + nMinFee = 0; + } + else + { + // Free transaction area + if (nNewBlockSize < 27000) + nMinFee = 0; + } + } + + // To limit dust spam, require MIN_TX_FEE/MIN_RELAY_TX_FEE if any output is less than 0.01 + if (nMinFee < nBaseFee) + { + BOOST_FOREACH(const CTxOut& txout, vout) + if (txout.nValue < CENT) + nMinFee = nBaseFee; + } + + // Raise the price as the block approaches full + if (nBlockSize != 1 && nNewBlockSize >= MAX_BLOCK_SIZE_GEN/2) + { + if (nNewBlockSize >= MAX_BLOCK_SIZE_GEN) + return MAX_MONEY; + nMinFee *= MAX_BLOCK_SIZE_GEN / (MAX_BLOCK_SIZE_GEN - nNewBlockSize); + } + + if (!MoneyRange(nMinFee)) + nMinFee = MAX_MONEY; + return nMinFee; +} + + bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs, bool* pfMissingInputs) { @@ -559,8 +612,11 @@ bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs, unsigned int nSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION); // Don't accept it if it can't get into a block - if (nFees < tx.GetMinFee(1000, true, GMF_RELAY)) - return error("CTxMemPool::accept() : not enough fees"); + int64 txMinFee = tx.GetMinFee(1000, true, GMF_RELAY); + if (nFees < txMinFee) + return error("CTxMemPool::accept() : not enough fees %s, %"PRI64d" < %"PRI64d, + hash.ToString().c_str(), + nFees, txMinFee); // Continuously rate-limit free transactions // This mitigates 'penny-flooding' -- sending thousands of free transactions just to @@ -653,8 +709,7 @@ bool CTxMemPool::remove(CTransaction &tx) return true; } -void -CTxMemPool::clear() +void CTxMemPool::clear() { LOCK(cs); mapTx.clear(); @@ -1357,9 +1412,12 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck) // See BIP30 and http://r6.ca/blog/20120206T005236Z.html for more information. // This logic is not necessary for memory pool transactions, as AcceptToMemoryPool // already refuses previously-known transaction ids entirely. - // This rule applies to all blocks whose timestamp is after March 15, 2012, 0:00 UTC. - int64 nBIP30SwitchTime = 1331769600; - bool fEnforceBIP30 = (pindex->nTime > nBIP30SwitchTime); + // This rule was originally applied all blocks whose timestamp was after March 15, 2012, 0:00 UTC. + // Now that the whole chain is irreversibly beyond that time it is applied to all blocks except the + // two in the chain that violate it. This prevents exploiting the issue against nodes in their + // initial block download. + bool fEnforceBIP30 = !((pindex->nHeight==91842 && pindex->GetBlockHash() == uint256("0x00000000000a4d0a398161ffc163c503763b1f4360639393e0e4c8e300e0caec")) || + (pindex->nHeight==91880 && pindex->GetBlockHash() == uint256("0x00000000000743f190a18c5577a3c2d2a1f610ae9601ac046a38084ccb7cd721"))); // BIP16 didn't become active until Apr 1 2012 int64 nBIP16SwitchTime = 1333238400; @@ -1989,11 +2047,17 @@ bool CheckDiskSpace(uint64 nAdditionalBytes) return true; } +static filesystem::path BlockFilePath(unsigned int nFile) +{ + string strBlockFn = strprintf("blk%04u.dat", nFile); + return GetDataDir() / strBlockFn; +} + FILE* OpenBlockFile(unsigned int nFile, unsigned int nBlockPos, const char* pszMode) { if ((nFile < 1) || (nFile == (unsigned int) -1)) return NULL; - FILE* file = fopen((GetDataDir() / strprintf("blk%04d.dat", nFile)).string().c_str(), pszMode); + FILE* file = fopen(BlockFilePath(nFile).string().c_str(), pszMode); if (!file) return NULL; if (nBlockPos != 0 && !strchr(pszMode, 'a') && !strchr(pszMode, 'w')) @@ -2254,8 +2318,8 @@ bool LoadExternalBlockFile(FILE* fileIn) // CAlert // -map<uint256, CAlert> mapAlerts; -CCriticalSection cs_mapAlerts; +extern map<uint256, CAlert> mapAlerts; +extern CCriticalSection cs_mapAlerts; string GetWarnings(string strFor) { @@ -2301,69 +2365,6 @@ string GetWarnings(string strFor) return "error"; } -CAlert CAlert::getAlertByHash(const uint256 &hash) -{ - CAlert retval; - { - LOCK(cs_mapAlerts); - map<uint256, CAlert>::iterator mi = mapAlerts.find(hash); - if(mi != mapAlerts.end()) - retval = mi->second; - } - return retval; -} - -bool CAlert::ProcessAlert() -{ - if (!CheckSignature()) - return false; - if (!IsInEffect()) - return false; - - { - LOCK(cs_mapAlerts); - // Cancel previous alerts - for (map<uint256, CAlert>::iterator mi = mapAlerts.begin(); mi != mapAlerts.end();) - { - const CAlert& alert = (*mi).second; - if (Cancels(alert)) - { - printf("cancelling alert %d\n", alert.nID); - uiInterface.NotifyAlertChanged((*mi).first, CT_DELETED); - mapAlerts.erase(mi++); - } - else if (!alert.IsInEffect()) - { - printf("expiring alert %d\n", alert.nID); - uiInterface.NotifyAlertChanged((*mi).first, CT_DELETED); - mapAlerts.erase(mi++); - } - else - mi++; - } - - // Check if this alert has been cancelled - BOOST_FOREACH(PAIRTYPE(const uint256, CAlert)& item, mapAlerts) - { - const CAlert& alert = item.second; - if (alert.Cancels(*this)) - { - printf("alert already cancelled by %d\n", alert.nID); - return false; - } - } - - // Add to mapAlerts - mapAlerts.insert(make_pair(GetHash(), *this)); - // Notify UI if it applies to me - if(AppliesToMe()) - uiInterface.NotifyAlertChanged(GetHash(), CT_NEW); - } - - printf("accepted alert %d, AppliesToMe()=%d\n", nID, AppliesToMe()); - return true; -} - @@ -2655,7 +2656,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) // In case we are on a very long side-chain, it is possible that we already have // the last block in an inv bundle sent in response to getblocks. Try to detect // this situation and push another getblocks to continue. - std::vector<CInv> vGetData(1,inv); pfrom->PushGetBlocks(mapBlockIndex[inv.hash], uint256(0)); if (fDebug) printf("force request: %s\n", inv.ToString().c_str()); @@ -2995,14 +2995,27 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) CAlert alert; vRecv >> alert; - if (alert.ProcessAlert()) + uint256 alertHash = alert.GetHash(); + if (pfrom->setKnown.count(alertHash) == 0) { - // Relay - pfrom->setKnown.insert(alert.GetHash()); + if (alert.ProcessAlert()) { - LOCK(cs_vNodes); - BOOST_FOREACH(CNode* pnode, vNodes) - alert.RelayTo(pnode); + // Relay + pfrom->setKnown.insert(alertHash); + { + LOCK(cs_vNodes); + BOOST_FOREACH(CNode* pnode, vNodes) + alert.RelayTo(pnode); + } + } + else { + // Small DoS penalty so peers that send us lots of + // duplicate/expired/invalid-signature/whatever alerts + // eventually get banned. + // This isn't a Misbehaving(100) (immediate ban) because the + // peer might be an older or different implementation with + // a different signature key, etc. + pfrom->Misbehaving(10); } } } @@ -3988,8 +4001,8 @@ void GenerateBitcoins(bool fGenerate, CWallet* pwallet) printf("Starting %d BitcoinMiner threads\n", nAddThreads); for (int i = 0; i < nAddThreads; i++) { - if (!CreateThread(ThreadBitcoinMiner, pwallet)) - printf("Error: CreateThread(ThreadBitcoinMiner) failed\n"); + if (!NewThread(ThreadBitcoinMiner, pwallet)) + printf("Error: NewThread(ThreadBitcoinMiner) failed\n"); Sleep(10); } } diff --git a/src/main.h b/src/main.h index cbc48e05c0..2e208fed4f 100644 --- a/src/main.h +++ b/src/main.h @@ -540,53 +540,7 @@ public: return dPriority > COIN * 144 / 250; } - int64 GetMinFee(unsigned int nBlockSize=1, bool fAllowFree=true, enum GetMinFee_mode mode=GMF_BLOCK) const - { - // 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, PROTOCOL_VERSION); - unsigned int nNewBlockSize = nBlockSize + nBytes; - int64 nMinFee = (1 + (int64)nBytes / 1000) * nBaseFee; - - if (fAllowFree) - { - if (nBlockSize == 1) - { - // Transactions under 10K are free - // (about 4500 BTC if made of 50 BTC inputs) - if (nBytes < 10000) - nMinFee = 0; - } - else - { - // Free transaction area - if (nNewBlockSize < 27000) - nMinFee = 0; - } - } - - // To limit dust spam, require MIN_TX_FEE/MIN_RELAY_TX_FEE if any output is less than 0.01 - if (nMinFee < nBaseFee) - { - BOOST_FOREACH(const CTxOut& txout, vout) - if (txout.nValue < CENT) - nMinFee = nBaseFee; - } - - // Raise the price as the block approaches full - if (nBlockSize != 1 && nNewBlockSize >= MAX_BLOCK_SIZE_GEN/2) - { - if (nNewBlockSize >= MAX_BLOCK_SIZE_GEN) - return MAX_MONEY; - nMinFee *= MAX_BLOCK_SIZE_GEN / (MAX_BLOCK_SIZE_GEN - nNewBlockSize); - } - - if (!MoneyRange(nMinFee)) - nMinFee = MAX_MONEY; - return nMinFee; - } - + int64 GetMinFee(unsigned int nBlockSize=1, bool fAllowFree=true, enum GetMinFee_mode mode=GMF_BLOCK) const; bool ReadFromDisk(CDiskTxPos pos, FILE** pfileRet=NULL) { @@ -799,7 +753,7 @@ public: return !(a == b); } int GetDepthInMainChain() const; - + }; @@ -1174,7 +1128,7 @@ public: std::string ToString() const { - return strprintf("CBlockIndex(nprev=%08x, pnext=%08x, nFile=%d, nBlockPos=%-6d nHeight=%d, merkle=%s, hashBlock=%s)", + return strprintf("CBlockIndex(pprev=%08x, pnext=%08x, nFile=%d, nBlockPos=%-6d nHeight=%d, merkle=%s, hashBlock=%s)", pprev, pnext, nFile, nBlockPos, nHeight, hashMerkleRoot.ToString().substr(0,10).c_str(), GetBlockHash().ToString().substr(0,20).c_str()); @@ -1397,212 +1351,6 @@ public: - -/** Alerts are for notifying old versions if they become too obsolete and - * need to upgrade. The message is displayed in the status bar. - * Alert messages are broadcast as a vector of signed data. Unserializing may - * not read the entire buffer if the alert is for a newer version, but older - * versions can still relay the original data. - */ -class CUnsignedAlert -{ -public: - int nVersion; - int64 nRelayUntil; // when newer nodes stop relaying to newer nodes - int64 nExpiration; - int nID; - int nCancel; - std::set<int> setCancel; - int nMinVer; // lowest version inclusive - int nMaxVer; // highest version inclusive - std::set<std::string> setSubVer; // empty matches all - int nPriority; - - // Actions - std::string strComment; - std::string strStatusBar; - std::string strReserved; - - IMPLEMENT_SERIALIZE - ( - READWRITE(this->nVersion); - nVersion = this->nVersion; - READWRITE(nRelayUntil); - READWRITE(nExpiration); - READWRITE(nID); - READWRITE(nCancel); - READWRITE(setCancel); - READWRITE(nMinVer); - READWRITE(nMaxVer); - READWRITE(setSubVer); - READWRITE(nPriority); - - READWRITE(strComment); - READWRITE(strStatusBar); - READWRITE(strReserved); - ) - - void SetNull() - { - nVersion = 1; - nRelayUntil = 0; - nExpiration = 0; - nID = 0; - nCancel = 0; - setCancel.clear(); - nMinVer = 0; - nMaxVer = 0; - setSubVer.clear(); - nPriority = 0; - - strComment.clear(); - strStatusBar.clear(); - strReserved.clear(); - } - - std::string ToString() const - { - std::string strSetCancel; - BOOST_FOREACH(int n, setCancel) - strSetCancel += strprintf("%d ", n); - std::string strSetSubVer; - BOOST_FOREACH(std::string str, setSubVer) - strSetSubVer += "\"" + str + "\" "; - return strprintf( - "CAlert(\n" - " nVersion = %d\n" - " nRelayUntil = %"PRI64d"\n" - " nExpiration = %"PRI64d"\n" - " nID = %d\n" - " nCancel = %d\n" - " setCancel = %s\n" - " nMinVer = %d\n" - " nMaxVer = %d\n" - " setSubVer = %s\n" - " nPriority = %d\n" - " strComment = \"%s\"\n" - " strStatusBar = \"%s\"\n" - ")\n", - nVersion, - nRelayUntil, - nExpiration, - nID, - nCancel, - strSetCancel.c_str(), - nMinVer, - nMaxVer, - strSetSubVer.c_str(), - nPriority, - strComment.c_str(), - strStatusBar.c_str()); - } - - void print() const - { - printf("%s", ToString().c_str()); - } -}; - -/** An alert is a combination of a serialized CUnsignedAlert and a signature. */ -class CAlert : public CUnsignedAlert -{ -public: - std::vector<unsigned char> vchMsg; - std::vector<unsigned char> vchSig; - - CAlert() - { - SetNull(); - } - - IMPLEMENT_SERIALIZE - ( - READWRITE(vchMsg); - READWRITE(vchSig); - ) - - void SetNull() - { - CUnsignedAlert::SetNull(); - vchMsg.clear(); - vchSig.clear(); - } - - bool IsNull() const - { - return (nExpiration == 0); - } - - uint256 GetHash() const - { - return SerializeHash(*this); - } - - bool IsInEffect() const - { - return (GetAdjustedTime() < nExpiration); - } - - bool Cancels(const CAlert& alert) const - { - if (!IsInEffect()) - return false; // this was a no-op before 31403 - return (alert.nID <= nCancel || setCancel.count(alert.nID)); - } - - bool AppliesTo(int nVersion, std::string strSubVerIn) const - { - // TODO: rework for client-version-embedded-in-strSubVer ? - return (IsInEffect() && - nMinVer <= nVersion && nVersion <= nMaxVer && - (setSubVer.empty() || setSubVer.count(strSubVerIn))); - } - - bool AppliesToMe() const - { - return AppliesTo(PROTOCOL_VERSION, FormatSubVersion(CLIENT_NAME, CLIENT_VERSION, std::vector<std::string>())); - } - - bool RelayTo(CNode* pnode) const - { - if (!IsInEffect()) - return false; - // returns true if wasn't already contained in the set - if (pnode->setKnown.insert(GetHash()).second) - { - if (AppliesTo(pnode->nVersion, pnode->strSubVer) || - AppliesToMe() || - GetAdjustedTime() < nRelayUntil) - { - pnode->PushMessage("alert", *this); - return true; - } - } - return false; - } - - bool CheckSignature() - { - CKey key; - if (!key.SetPubKey(ParseHex("04fc9702847840aaf195de8442ebecedf5b095cdbb9bc716bda9110971b28a49e0ead8564ff0db22209e0374782c093bb899692d524e9d6a6956e7c5ecbcd68284"))) - return error("CAlert::CheckSignature() : SetPubKey failed"); - if (!key.Verify(Hash(vchMsg.begin(), vchMsg.end()), vchSig)) - return error("CAlert::CheckSignature() : verify signature failed"); - - // Now unserialize the data - CDataStream sMsg(vchMsg, SER_NETWORK, PROTOCOL_VERSION); - sMsg >> *(CUnsignedAlert*)this; - return true; - } - - bool ProcessAlert(); - - /* - * Get copy of (active) alert object by hash. Returns a null alert if it is not found. - */ - static CAlert getAlertByHash(const uint256 &hash); -}; - class CTxMemPool { public: diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index ad74aa6c91..4ba0cf06f0 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -10,13 +10,13 @@ USE_IPV6:=1 INCLUDEPATHS= \ -I"$(CURDIR)" \ -I"$(CURDIR)"/obj \ - -I"$(DEPSDIR)/boost_1_49_0" \ + -I"$(DEPSDIR)/boost_1_50_0" \ -I"$(DEPSDIR)/db-4.8.30.NC/build_unix" \ -I"$(DEPSDIR)/openssl-1.0.1b/include" \ -I"$(DEPSDIR)" LIBPATHS= \ - -L"$(DEPSDIR)/boost_1_49_0/stage/lib" \ + -L"$(DEPSDIR)/boost_1_50_0/stage/lib" \ -L"$(DEPSDIR)/db-4.8.30.NC/build_unix" \ -L"$(DEPSDIR)/openssl-1.0.1b" @@ -25,6 +25,7 @@ LIBS= \ -l boost_filesystem-mt-s \ -l boost_program_options-mt-s \ -l boost_thread_win32-mt-s \ + -l boost_chrono-mt-s \ -l db_cxx \ -l ssl \ -l crypto @@ -32,6 +33,7 @@ LIBS= \ DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE DEBUGFLAGS=-g CFLAGS=-O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) +LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data) @@ -54,6 +56,7 @@ LIBS += -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l w HEADERS = $(wildcard *.h) OBJS= \ + obj/alert.o \ obj/version.o \ obj/checkpoints.o \ obj/netbase.o \ @@ -92,7 +95,7 @@ obj/%.o: %.cpp $(HEADERS) i586-mingw32msvc-g++ -c $(CFLAGS) -o $@ $< bitcoind.exe: $(OBJS:obj/%=obj/%) - i586-mingw32msvc-g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) + i586-mingw32msvc-g++ $(CFLAGS) $(LDFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) @@ -100,7 +103,7 @@ obj-test/%.o: test/%.cpp $(HEADERS) i586-mingw32msvc-g++ -c $(TESTDEFS) $(CFLAGS) -o $@ $< 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) + i586-mingw32msvc-g++ $(CFLAGS) $(LDFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework-mt-s $(LIBS) clean: diff --git a/src/makefile.mingw b/src/makefile.mingw index 6102dad613..9bbd739365 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -6,20 +6,21 @@ USE_UPNP:=0 USE_IPV6:=1 INCLUDEPATHS= \ - -I"C:\boost-1.49.0-mgw" \ + -I"C:\boost-1.50.0-mgw" \ -I"C:\db-4.8.30.NC-mgw\build_unix" \ -I"C:\openssl-1.0.1b-mgw\include" LIBPATHS= \ - -L"C:\boost-1.49.0-mgw\stage\lib" \ + -L"C:\boost-1.50.0-mgw\stage\lib" \ -L"C:\db-4.8.30.NC-mgw\build_unix" \ -L"C:\openssl-1.0.1b-mgw" LIBS= \ - -l boost_system-mgw45-mt-s-1_49 \ - -l boost_filesystem-mgw45-mt-s-1_49 \ - -l boost_program_options-mgw45-mt-s-1_49 \ - -l boost_thread-mgw45-mt-s-1_49 \ + -l boost_system-mgw45-mt-s-1_50 \ + -l boost_filesystem-mgw45-mt-s-1_50 \ + -l boost_program_options-mgw45-mt-s-1_50 \ + -l boost_thread-mgw45-mt-s-1_50 \ + -l boost_chrono-mgw45-mt-s-1_50 \ -l db_cxx \ -l ssl \ -l crypto @@ -27,6 +28,7 @@ LIBS= \ DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE DEBUGFLAGS=-g CFLAGS=-mthreads -O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) +LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data) @@ -50,6 +52,7 @@ LIBS += -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell HEADERS = $(wildcard *.h) OBJS= \ + obj/alert.o \ obj/version.o \ obj/checkpoints.o \ obj/netbase.o \ @@ -80,11 +83,14 @@ OBJS= \ all: bitcoind.exe +test check: test_bitcoin.exe FORCE + test_bitcoin.exe + obj/%.o: %.cpp $(HEADERS) g++ -c $(CFLAGS) -o $@ $< bitcoind.exe: $(OBJS:obj/%=obj/%) - g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) + g++ $(CFLAGS) $(LDFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) @@ -92,10 +98,12 @@ 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) + g++ $(CFLAGS) $(LDFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework $(LIBS) clean: -del /Q bitcoind test_bitcoin -del /Q obj\* -del /Q obj-test\* -del /Q build.h + +FORCE: diff --git a/src/makefile.osx b/src/makefile.osx index de829b9eb1..547f751aba 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -70,6 +70,7 @@ CFLAGS += -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \ $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) OBJS= \ + obj/alert.o \ obj/version.o \ obj/checkpoints.o \ obj/netbase.o \ @@ -115,6 +116,9 @@ endif all: bitcoind +test check: test_bitcoin FORCE + ./test_bitcoin + # auto-generated dependencies: -include obj/*.P -include obj-test/*.P diff --git a/src/makefile.unix b/src/makefile.unix index ac42743d8e..6f8f96e3af 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -101,6 +101,7 @@ xCXXFLAGS=-O2 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-para xLDFLAGS=$(LDHARDENING) $(LDFLAGS) OBJS= \ + obj/alert.o \ obj/version.o \ obj/checkpoints.o \ obj/netbase.o \ @@ -131,6 +132,9 @@ OBJS= \ all: bitcoind +test check: test_bitcoin FORCE + ./test_bitcoin + # auto-generated dependencies: -include obj/*.P -include obj-test/*.P diff --git a/src/net.cpp b/src/net.cpp index aaf7883e51..c0693306af 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -233,8 +233,8 @@ bool AddLocal(const CService& addr, int nScore) bool fAlready = mapLocalHost.count(addr) > 0; LocalServiceInfo &info = mapLocalHost[addr]; if (!fAlready || nScore >= info.nScore) { - info.nScore = nScore; - info.nPort = addr.GetPort() + (fAlready ? 1 : 0); + info.nScore = nScore + (fAlready ? 1 : 0); + info.nPort = addr.GetPort(); } SetReachable(addr.GetNetwork()); } @@ -752,10 +752,12 @@ void ThreadSocketHandler2(void* parg) FD_ZERO(&fdsetSend); FD_ZERO(&fdsetError); SOCKET hSocketMax = 0; + bool have_fds = false; BOOST_FOREACH(SOCKET hListenSocket, vhListenSocket) { FD_SET(hListenSocket, &fdsetRecv); hSocketMax = max(hSocketMax, hListenSocket); + have_fds = true; } { LOCK(cs_vNodes); @@ -766,6 +768,7 @@ void ThreadSocketHandler2(void* parg) FD_SET(pnode->hSocket, &fdsetRecv); FD_SET(pnode->hSocket, &fdsetError); hSocketMax = max(hSocketMax, pnode->hSocket); + have_fds = true; { TRY_LOCK(pnode->cs_vSend, lockSend); if (lockSend && !pnode->vSend.empty()) @@ -775,15 +778,16 @@ void ThreadSocketHandler2(void* parg) } vnThreadsRunning[THREAD_SOCKETHANDLER]--; - int nSelect = select(hSocketMax + 1, &fdsetRecv, &fdsetSend, &fdsetError, &timeout); + int nSelect = select(have_fds ? hSocketMax + 1 : 0, + &fdsetRecv, &fdsetSend, &fdsetError, &timeout); vnThreadsRunning[THREAD_SOCKETHANDLER]++; if (fShutdown) return; if (nSelect == SOCKET_ERROR) { - int nErr = WSAGetLastError(); - if (hSocketMax != INVALID_SOCKET) + if (have_fds) { + int nErr = WSAGetLastError(); printf("socket select error %d\n", nErr); for (unsigned int i = 0; i <= hSocketMax; i++) FD_SET(i, &fdsetRecv); @@ -823,8 +827,9 @@ void ThreadSocketHandler2(void* parg) if (hSocket == INVALID_SOCKET) { - if (WSAGetLastError() != WSAEWOULDBLOCK) - printf("socket error accept failed: %d\n", WSAGetLastError()); + int nErr = WSAGetLastError(); + if (nErr != WSAEWOULDBLOCK) + printf("socket error accept failed: %d\n", nErr); } else if (nInbound >= GetArg("-maxconnections", 125) - MAX_OUTBOUND_CONNECTIONS) { @@ -1020,9 +1025,7 @@ void ThreadMapPort2(void* parg) { printf("ThreadMapPort started\n"); - char port[6]; - sprintf(port, "%d", GetListenPort()); - + std::string port = strprintf("%d", GetListenPort()); const char * multicastif = 0; const char * minissdpdpath = 0; struct UPNPDev * devlist = 0; @@ -1065,23 +1068,23 @@ void ThreadMapPort2(void* parg) #ifndef UPNPDISCOVER_SUCCESS /* miniupnpc 1.5 */ r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, - port, port, lanaddr, strDesc.c_str(), "TCP", 0); + port.c_str(), port.c_str(), lanaddr, strDesc.c_str(), "TCP", 0); #else /* miniupnpc 1.6 */ r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, - port, port, lanaddr, strDesc.c_str(), "TCP", 0, "0"); + port.c_str(), port.c_str(), lanaddr, strDesc.c_str(), "TCP", 0, "0"); #endif if(r!=UPNPCOMMAND_SUCCESS) printf("AddPortMapping(%s, %s, %s) failed with code %d (%s)\n", - port, port, lanaddr, r, strupnperror(r)); + port.c_str(), port.c_str(), lanaddr, r, strupnperror(r)); else printf("UPnP Port Mapping successful.\n"); int i = 1; loop { if (fShutdown || !fUseUPnP) { - r = UPNP_DeletePortMapping(urls.controlURL, data.first.servicetype, port, "TCP", 0); + r = UPNP_DeletePortMapping(urls.controlURL, data.first.servicetype, port.c_str(), "TCP", 0); printf("UPNP_DeletePortMapping() returned : %d\n", r); freeUPNPDevlist(devlist); devlist = 0; FreeUPNPUrls(&urls); @@ -1092,16 +1095,16 @@ void ThreadMapPort2(void* parg) #ifndef UPNPDISCOVER_SUCCESS /* miniupnpc 1.5 */ r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, - port, port, lanaddr, strDesc.c_str(), "TCP", 0); + port.c_str(), port.c_str(), lanaddr, strDesc.c_str(), "TCP", 0); #else /* miniupnpc 1.6 */ r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, - port, port, lanaddr, strDesc.c_str(), "TCP", 0, "0"); + port.c_str(), port.c_str(), lanaddr, strDesc.c_str(), "TCP", 0, "0"); #endif if(r!=UPNPCOMMAND_SUCCESS) printf("AddPortMapping(%s, %s, %s) failed with code %d (%s)\n", - port, port, lanaddr, r, strupnperror(r)); + port.c_str(), port.c_str(), lanaddr, r, strupnperror(r)); else printf("UPnP Port Mapping successful.\n");; } @@ -1125,7 +1128,7 @@ void MapPort() { if (fUseUPnP && vnThreadsRunning[THREAD_UPNP] < 1) { - if (!CreateThread(ThreadMapPort, NULL)) + if (!NewThread(ThreadMapPort, NULL)) printf("Error: ThreadMapPort(ThreadMapPort) failed\n"); } } @@ -1887,7 +1890,7 @@ void static Discover() // Don't use external IPv4 discovery, when -onlynet="IPv6" if (!IsLimited(NET_IPV4)) - CreateThread(ThreadGetMyExternalIP, NULL); + NewThread(ThreadGetMyExternalIP, NULL); } void StartNode(void* parg) @@ -1913,36 +1916,36 @@ void StartNode(void* parg) if (!GetBoolArg("-dnsseed", true)) printf("DNS seeding disabled\n"); else - if (!CreateThread(ThreadDNSAddressSeed, NULL)) - printf("Error: CreateThread(ThreadDNSAddressSeed) failed\n"); + if (!NewThread(ThreadDNSAddressSeed, NULL)) + printf("Error: NewThread(ThreadDNSAddressSeed) failed\n"); // Map ports with UPnP if (fUseUPnP) MapPort(); // Get addresses from IRC and advertise ours - if (!CreateThread(ThreadIRCSeed, NULL)) - printf("Error: CreateThread(ThreadIRCSeed) failed\n"); + if (!NewThread(ThreadIRCSeed, NULL)) + printf("Error: NewThread(ThreadIRCSeed) failed\n"); // Send and receive from sockets, accept connections - if (!CreateThread(ThreadSocketHandler, NULL)) - printf("Error: CreateThread(ThreadSocketHandler) failed\n"); + if (!NewThread(ThreadSocketHandler, NULL)) + printf("Error: NewThread(ThreadSocketHandler) failed\n"); // Initiate outbound connections from -addnode - if (!CreateThread(ThreadOpenAddedConnections, NULL)) - printf("Error: CreateThread(ThreadOpenAddedConnections) failed\n"); + if (!NewThread(ThreadOpenAddedConnections, NULL)) + printf("Error: NewThread(ThreadOpenAddedConnections) failed\n"); // Initiate outbound connections - if (!CreateThread(ThreadOpenConnections, NULL)) - printf("Error: CreateThread(ThreadOpenConnections) failed\n"); + if (!NewThread(ThreadOpenConnections, NULL)) + printf("Error: NewThread(ThreadOpenConnections) failed\n"); // Process messages - if (!CreateThread(ThreadMessageHandler, NULL)) - printf("Error: CreateThread(ThreadMessageHandler) failed\n"); + if (!NewThread(ThreadMessageHandler, NULL)) + printf("Error: NewThread(ThreadMessageHandler) failed\n"); // Dump network addresses - if (!CreateThread(ThreadDumpAddress, NULL)) - printf("Error; CreateThread(ThreadDumpAddress) failed\n"); + if (!NewThread(ThreadDumpAddress, NULL)) + printf("Error; NewThread(ThreadDumpAddress) failed\n"); // Generate coins in the background GenerateBitcoins(GetBoolArg("-gen", false), pwalletMain); diff --git a/src/netbase.cpp b/src/netbase.cpp index b66c366641..76a3d25d3a 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -246,7 +246,7 @@ bool static Socks5(string strDest, int port, SOCKET& hSocket) string strSocks5("\5\1"); strSocks5 += '\000'; strSocks5 += '\003'; strSocks5 += static_cast<char>(std::min((int)strDest.size(), 255)); - strSocks5 += strDest; + strSocks5 += strDest; strSocks5 += static_cast<char>((port >> 8) & 0xFF); strSocks5 += static_cast<char>((port >> 0) & 0xFF); ret = send(hSocket, strSocks5.c_str(), strSocks5.size(), MSG_NOSIGNAL); @@ -478,7 +478,7 @@ bool ConnectSocket(const CService &addrDest, SOCKET& hSocketRet, int nTimeout) // first connect to proxy server if (!ConnectSocketDirectly(proxy.first, hSocket, nTimeout)) return false; - + // do socks negotiation switch (proxy.second) { case 4: @@ -617,8 +617,8 @@ bool CNetAddr::IsIPv6() const bool CNetAddr::IsRFC1918() const { return IsIPv4() && ( - GetByte(3) == 10 || - (GetByte(3) == 192 && GetByte(2) == 168) || + GetByte(3) == 10 || + (GetByte(3) == 192 && GetByte(2) == 168) || (GetByte(3) == 172 && (GetByte(2) >= 16 && GetByte(2) <= 31))); } diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 42bfcfd0b2..ad145fdf9d 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -20,9 +20,6 @@ #include <QSplashScreen> #include <QLibraryInfo> -#include <boost/interprocess/ipc/message_queue.hpp> -#include <boost/algorithm/string/predicate.hpp> - #if defined(BITCOIN_NEED_QT_PLUGINS) && !defined(_BITCOIN_QT_PLUGINS_INCLUDED) #define _BITCOIN_QT_PLUGINS_INCLUDED #define __INSURE__ @@ -116,35 +113,8 @@ static void handleRunawayException(std::exception *e) #ifndef BITCOIN_QT_TEST int main(int argc, char *argv[]) { -// TODO: implement URI support on the Mac. -#if !defined(MAC_OSX) // Do this early as we don't want to bother initializing if we are just calling IPC - for (int i = 1; i < argc; i++) - { - if (boost::algorithm::istarts_with(argv[i], "bitcoin:")) - { - const char *strURI = argv[i]; - try { - boost::interprocess::message_queue mq(boost::interprocess::open_only, BITCOINURI_QUEUE_NAME); - if (mq.try_send(strURI, strlen(strURI), 0)) - // if URI could be sent to the message queue exit here - exit(0); - else - // if URI could not be sent to the message queue do a normal Bitcoin-Qt startup - break; - } - catch (boost::interprocess::interprocess_exception &ex) { - // don't log the "file not found" exception, because that's normal for - // the first start of the first instance - if (ex.get_error_code() != boost::interprocess::not_found_error) - { - printf("main() - boost interprocess exception #%d: %s\n", ex.get_error_code(), ex.what()); - break; - } - } - } - } -#endif + ipcScanRelay(argc, argv); // Internal string conversion is all UTF-8 QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); @@ -269,29 +239,10 @@ int main(int argc, char *argv[]) { window.show(); } -// TODO: implement URI support on the Mac. -#if !defined(MAC_OSX) // Place this here as guiref has to be defined if we don't want to lose URIs - ipcInit(); + ipcInit(argc, argv); - // Check for URI in argv - for (int i = 1; i < argc; i++) - { - if (boost::algorithm::istarts_with(argv[i], "bitcoin:")) - { - const char *strURI = argv[i]; - try { - boost::interprocess::message_queue mq(boost::interprocess::open_only, BITCOINURI_QUEUE_NAME); - mq.try_send(strURI, strlen(strURI), 0); - } - catch (boost::interprocess::interprocess_exception &ex) { - printf("main() - boost interprocess exception #%d: %s\n", ex.get_error_code(), ex.what()); - break; - } - } - } -#endif app.exec(); window.hide(); diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index b81b832a87..27b974b5c6 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -53,6 +53,7 @@ #include <QTimer> #include <QDragEnterEvent> #include <QUrl> +#include <QStyle> #include <iostream> @@ -148,6 +149,15 @@ BitcoinGUI::BitcoinGUI(QWidget *parent): progressBar->setAlignment(Qt::AlignCenter); progressBar->setVisible(false); + // Override style sheet for progress bar for styles that have a segmented progress bar, + // as they make the text unreadable (workaround for issue #1071) + // See https://qt-project.org/doc/qt-4.8/gallery.html + QString curStyle = qApp->style()->metaObject()->className(); + if(curStyle == "QWindowsStyle" || curStyle == "QWindowsXPStyle") + { + progressBar->setStyleSheet("QProgressBar { background-color: #e8e8e8; border: 1px solid grey; border-radius: 7px; padding: 1px; text-align: center; } QProgressBar::chunk { background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #FF8000, stop: 1 orange); border-radius: 7px; margin: 0px; }"); + } + statusBar()->addWidget(progressBarLabel); statusBar()->addWidget(progressBar); statusBar()->addPermanentWidget(frameBlocks); @@ -263,8 +273,7 @@ void BitcoinGUI::createActions() optionsAction = new QAction(QIcon(":/icons/options"), tr("&Options..."), this); optionsAction->setToolTip(tr("Modify configuration options for Bitcoin")); optionsAction->setMenuRole(QAction::PreferencesRole); - toggleHideAction = new QAction(QIcon(":/icons/bitcoin"), tr("Show/Hide &Bitcoin"), this); - toggleHideAction->setToolTip(tr("Show or hide the Bitcoin window")); + toggleHideAction = new QAction(QIcon(":/icons/bitcoin"), tr("&Show / Hide"), this); 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); @@ -453,7 +462,7 @@ void BitcoinGUI::trayIconActivated(QSystemTrayIcon::ActivationReason reason) { if(reason == QSystemTrayIcon::Trigger) { - // Click on system tray icon triggers "show/hide Bitcoin" + // Click on system tray icon triggers show/hide of the main window toggleHideAction->trigger(); } } diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 5fe9e5218a..20d1830486 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -92,6 +92,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Generate coins"), QT_TRANSLATE_NOOP("bitcoin-core", "Get help for a command"), QT_TRANSLATE_NOOP("bitcoin-core", "How many blocks to check at startup (default: 2500, 0 = all)"), QT_TRANSLATE_NOOP("bitcoin-core", "How thorough the block verification is (0-6, default: 1)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Importing blocks..."), QT_TRANSLATE_NOOP("bitcoin-core", "Imports blocks from external blk000?.dat file"), QT_TRANSLATE_NOOP("bitcoin-core", "Insufficient funds"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -proxy address: '%s'"), @@ -132,7 +133,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum block size in bytes (default: 250 QT_TRANSLATE_NOOP("bitcoin-core", "Set minimum block size in bytes (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Shrink debug.log file on client startup (default: 1 when no -debug)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: bitcoin.conf)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Specify connection timeout (in milliseconds)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Specify connection timeout in milliseconds (default: 5000)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: bitcoind.pid)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify your own public address"), diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index 43bce6f289..b820d16abf 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -4,6 +4,7 @@ #include "addresstablemodel.h" #include "transactiontablemodel.h" +#include "alert.h" #include "main.h" #include "ui_interface.h" diff --git a/src/qt/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui index 6632e311d0..b59c2445de 100644 --- a/src/qt/forms/aboutdialog.ui +++ b/src/qt/forms/aboutdialog.ui @@ -65,9 +65,6 @@ <property name="text"> <string notr="true">0.3.666-beta</string> </property> - <property name="textFormat"> - <enum>Qt::RichText</enum> - </property> <property name="textInteractionFlags"> <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> </property> @@ -89,13 +86,25 @@ </layout> </item> <item> + <widget class="QLabel" name="copyrightLabel"> + <property name="cursor"> + <cursorShape>IBeamCursor</cursorShape> + </property> + <property name="text"> + <string>Copyright © 2009-2012 The Bitcoin developers</string> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> + </property> + </widget> + </item> + <item> <widget class="QLabel" name="label_2"> <property name="cursor"> <cursorShape>IBeamCursor</cursorShape> </property> <property name="text"> - <string>Copyright © 2009-2012 Bitcoin Developers - + <string> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts index a4e4490cec..989db004d7 100644 --- a/src/qt/locale/bitcoin_bg.ts +++ b/src/qt/locale/bitcoin_bg.ts @@ -13,16 +13,19 @@ <translation><b>Биткоин</b> версия</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation>Copyright © 2009-2012 Биткоин разработчици</translation> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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 Биткоин разработчици - + <translation> Това е експериментален софтуер. Разпространява се под MIT/X11 софтуерен лиценз, виж COPYING или http://www.opensource.org/licenses/mit-license.php. @@ -55,7 +58,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-11"/> <source>&New Address</source> - <translation type="unfinished"/> + <translation>&Нов адрес</translation> </message> <message> <location line="-46"/> @@ -65,12 +68,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+60"/> <source>&Copy Address</source> - <translation type="unfinished"/> + <translation>&Копирай</translation> </message> <message> <location line="+11"/> <source>Show &QR Code</source> - <translation type="unfinished"/> + <translation>Покажи &QR код</translation> </message> <message> <location line="+11"/> @@ -80,7 +83,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+3"/> <source>&Sign Message</source> - <translation>&Подписване на съобщение</translation> + <translation>&Подпиши съобщение</translation> </message> <message> <location line="+11"/> @@ -90,7 +93,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+3"/> <source>&Verify Message</source> - <translation type="unfinished"/> + <translation>&Провери съобщение</translation> </message> <message> <location line="+11"/> @@ -105,12 +108,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../addressbookpage.cpp" line="+65"/> <source>Copy &Label</source> - <translation type="unfinished"/> + <translation>Копирай &име</translation> </message> <message> <location line="+2"/> <source>&Edit</source> - <translation type="unfinished"/> + <translation>&Редактирай</translation> </message> <message> <location line="+250"/> @@ -176,7 +179,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../askpassphrasedialog.cpp" line="+33"/> <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> + <translation>Въведете нова парола за портфейла.<br/>Моля използвайте <b>поне 10 случайни символа</b> или <b>8 или повече думи</b>.</translation> </message> <message> <location line="+1"/> @@ -206,7 +209,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+3"/> <source>Change passphrase</source> - <translation>Промяна на парола</translation> + <translation>Смяна на паролата</translation> </message> <message> <location line="+1"/> @@ -284,28 +287,23 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation>Паролата за портфейла беше променена успешно.</translation> + <translation>Паролата на портфейла беше променена успешно.</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation>Подписване на &съобщение...</translation> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Синхронизиране с мрежата...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Баланс</translation> </message> @@ -322,7 +320,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Browse transaction history</source> - <translation>История на входящи и изходящи транзакции</translation> + <translation>История на входящите и изходящи транзакции</translation> </message> <message> <location line="+5"/> @@ -380,19 +378,19 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Опции...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> - <translation type="unfinished"/> + <translation>&Криптиране на портфейла...</translation> </message> <message> <location line="+3"/> <source>&Backup Wallet...</source> - <translation type="unfinished"/> + <translation>&Запазване на портфейла...</translation> </message> <message> <location line="+2"/> <source>&Change Passphrase...</source> - <translation type="unfinished"/> + <translation>&Смяна на паролата...</translation> </message> <message numerus="yes"> <location line="+241"/> @@ -402,17 +400,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+6"/> <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> - <translation type="unfinished"/> + <translation>%1 (of %2) блока (%3%%).</translation> </message> <message> <location line="-254"/> <source>&Export...</source> - <translation>&Запазване...</translation> + <translation>&Експорт...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Изпращане към Биткоин адрес</translation> </message> <message> <location line="+6"/> @@ -435,14 +433,9 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> + <translation>Запишете данните от текущия раздел във файл</translation> </message> <message> <location line="+2"/> @@ -470,12 +463,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> - <translation type="unfinished"/> + <translation>&Проверка на съобщение...</translation> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Биткоин</translation> </message> @@ -485,12 +478,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Портфейл</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> <translation>&За Биткоин</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>&Файл</translation> </message> @@ -625,7 +623,7 @@ Address: %4 <message> <location line="+23"/> <source>Backup Wallet</source> - <translation type="unfinished"/> + <translation>Запазване на портфейла</translation> </message> <message> <location line="+0"/> @@ -643,7 +641,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -651,7 +649,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -727,7 +725,7 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation type="unfinished"/> @@ -750,7 +748,7 @@ Address: %4 <message> <location line="+4"/> <source>UI options</source> - <translation type="unfinished"/> + <translation>UI Опции</translation> </message> <message> <location line="+1"/> @@ -946,7 +944,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation type="unfinished"/> @@ -960,7 +958,7 @@ Address: %4 <message> <location line="+29"/> <source>The supplied proxy address is invalid.</source> - <translation type="unfinished"/> + <translation>Прокси адресът е невалиден.</translation> </message> </context> <context> @@ -1043,7 +1041,7 @@ Address: %4 <message> <location line="+59"/> <source>Request Payment</source> - <translation type="unfinished"/> + <translation>Изискай плащане</translation> </message> <message> <location line="+56"/> @@ -1073,7 +1071,7 @@ Address: %4 <message> <location line="+40"/> <source>The entered amount is invalid, please check.</source> - <translation type="unfinished"/> + <translation>Въведената сума е невалидна, моля проверете.</translation> </message> <message> <location line="+23"/> @@ -1108,7 +1106,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation>N/A</translation> </message> @@ -1220,7 +1218,7 @@ Address: %4 <message> <location line="+102"/> <source>Clear console</source> - <translation type="unfinished"/> + <translation>Изчисти конзолата</translation> </message> <message> <location filename="../rpcconsole.cpp" line="-33"/> @@ -1230,7 +1228,7 @@ Address: %4 <message> <location line="+1"/> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> - <translation type="unfinished"/> + <translation>Използвайте стрелки надолу и нагореза разглеждане на историятаот команди и <b>Ctrl-L</b> за изчистване на конзолата.</translation> </message> <message> <location line="+1"/> @@ -1242,7 +1240,7 @@ Address: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1260,7 +1258,7 @@ Address: %4 <message> <location line="+3"/> <source>&Add Recipient</source> - <translation type="unfinished"/> + <translation>&Добави получател</translation> </message> <message> <location line="+20"/> @@ -1270,7 +1268,7 @@ Address: %4 <message> <location line="+3"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>&Изчисти</translation> </message> <message> <location line="+22"/> @@ -1340,12 +1338,12 @@ Address: %4 <message> <location line="+5"/> <source>Error: Transaction creation failed.</source> - <translation type="unfinished"/> + <translation>Грешка: създаването на транзакция беше неуспешно.</translation> </message> <message> <location line="+5"/> <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>Грешка: транзакцията беше отхвърлена. Това е възможно ако част от парите в портфейла са вече похарчени, например при паралелно използване на копие на wallet.dat</translation> </message> </context> <context> @@ -1423,12 +1421,12 @@ Address: %4 <location line="+13"/> <location line="+124"/> <source>&Sign Message</source> - <translation>&Подписване на съобщение</translation> + <translation>&Подпиши</translation> </message> <message> <location line="-118"/> <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>Можете да подписвате съобщения като доказателство, че притежавате определен адрес. Бъдете внимателни и не подписвайте съобщения, които биха разкрили лична информация без вашето съгласие.</translation> + <translation>Можете да подпишете съобщение като доказателство, че притежавате определен адрес. Бъдете внимателни и не подписвайте съобщения, които биха разкрили лична информация без вашето съгласие.</translation> </message> <message> <location line="+18"/> @@ -1445,7 +1443,7 @@ Address: %4 <location line="-193"/> <location line="+203"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location line="-193"/> @@ -1455,7 +1453,7 @@ Address: %4 <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location line="+12"/> @@ -1470,7 +1468,7 @@ Address: %4 <message> <location line="+21"/> <source>Sign the message to prove you own this Bitcoin address</source> - <translation type="unfinished"/> + <translation>Подпишете съобщение като доказателство, че притежавате определен адрес</translation> </message> <message> <location line="+17"/> @@ -1481,13 +1479,13 @@ Address: %4 <location line="+3"/> <location line="+146"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>&Изчисти</translation> </message> <message> <location line="-87"/> <location line="+70"/> <source>&Verify Message</source> - <translation type="unfinished"/> + <translation>&Провери</translation> </message> <message> <location line="-64"/> @@ -1844,7 +1842,7 @@ Address: %4 <message> <location line="+43"/> <source>Received with</source> - <translation>Получаване</translation> + <translation>Получени с</translation> </message> <message> <location line="+2"/> @@ -1854,7 +1852,7 @@ Address: %4 <message> <location line="+3"/> <source>Sent to</source> - <translation>Изпращане</translation> + <translation>Изпратени на</translation> </message> <message> <location line="+2"/> @@ -1938,12 +1936,12 @@ Address: %4 <message> <location line="+11"/> <source>Received with</source> - <translation>Получаване</translation> + <translation>Получени</translation> </message> <message> <location line="+2"/> <source>Sent to</source> - <translation>Изпращане</translation> + <translation>Изпратени на</translation> </message> <message> <location line="+2"/> @@ -2077,7 +2075,7 @@ Address: %4 <translation>Биткоин версия</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation type="unfinished"/> </message> @@ -2092,14 +2090,14 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation type="unfinished"/> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> - <translation type="unfinished"/> + <translation>Опции:</translation> </message> <message> <location line="+23"/> @@ -2112,7 +2110,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation type="unfinished"/> </message> @@ -2122,7 +2120,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation type="unfinished"/> </message> @@ -2137,12 +2135,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2152,27 +2145,27 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -2187,7 +2180,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> @@ -2197,7 +2190,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -2252,11 +2245,16 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>Invalid -tor address: '%s'</source> + <location line="+6"/> + <source>Importing blocks...</source> <translation type="unfinished"/> </message> <message> + <location line="+4"/> + <source>Invalid -tor address: '%s'</source> + <translation>Невалиден -tor адрес: '%s'</translation> + </message> + <message> <location line="+10"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> <translation type="unfinished"/> @@ -2322,7 +2320,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2362,22 +2365,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> @@ -2392,7 +2395,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2402,7 +2405,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation type="unfinished"/> </message> @@ -2422,17 +2425,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-109"/> + <location line="-110"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"/> </message> <message> - <location line="+121"/> + <location line="+122"/> <source>This help message</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-119"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation>Достъпът до %s е невъзможен. Биткоин е вече стартитан?</translation> </message> @@ -2442,12 +2445,12 @@ Address: %4 <translation>Биткоин</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> @@ -2457,12 +2460,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Зареждане на адресите...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation type="unfinished"/> </message> @@ -2477,19 +2480,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> - <translation type="unfinished"/> + <translation>Невалиден -proxy address: '%s'</translation> </message> <message> <location line="+47"/> @@ -2502,7 +2505,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2512,12 +2515,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"/> </message> @@ -2529,7 +2532,7 @@ Address: %4 <message> <location line="-55"/> <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>Размерът на транзакцията ще надвиши максималният размер за безплатна транзакция. Можете да я изпратите срещу такса от %1, която ще бъде получена от участниците в мрежата, обработващи транзакции. Желаете ли да платите таксата?</translation> </message> <message> <location line="+54"/> @@ -2537,17 +2540,17 @@ Address: %4 <translation>Грешка: създаването на транзакция беше неуспешно </translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Изпращане...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation type="unfinished"/> </message> @@ -2559,10 +2562,10 @@ Address: %4 <message> <location line="+9"/> <source>Loading block index...</source> - <translation>Зареждане на индекса към блокове...</translation> + <translation>Зареждане на блок индекса...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2582,12 +2585,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Зареждане на портфейла...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -2602,22 +2605,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Преразглеждане на последовтелността от блокове...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Зареждането е завършено</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts index 39d9d5eaf2..404b9d1adc 100644 --- a/src/qt/locale/bitcoin_ca_ES.ts +++ b/src/qt/locale/bitcoin_ca_ES.ts @@ -13,9 +13,13 @@ <translation><b>Bitcoin</b> versió</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -284,22 +288,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation type="unfinished"/> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Sincronització amb la xarxa ...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation type="unfinished"/> </message> @@ -374,7 +373,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Opcions ...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation type="unfinished"/> </message> @@ -404,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -429,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation type="unfinished"/> </message> @@ -464,12 +458,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> @@ -479,12 +473,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation type="unfinished"/> </message> @@ -637,7 +636,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -645,7 +644,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -721,7 +720,7 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation type="unfinished"/> @@ -940,7 +939,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation type="unfinished"/> @@ -1102,7 +1101,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1236,7 +1235,7 @@ Address: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -2071,7 +2070,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation type="unfinished"/> </message> @@ -2086,12 +2085,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation type="unfinished"/> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation type="unfinished"/> </message> @@ -2106,7 +2105,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation type="unfinished"/> </message> @@ -2116,7 +2115,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation type="unfinished"/> </message> @@ -2131,12 +2130,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2146,27 +2140,27 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -2181,7 +2175,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> @@ -2191,7 +2185,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -2246,7 +2240,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation type="unfinished"/> </message> @@ -2316,7 +2315,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2356,22 +2360,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> @@ -2386,7 +2390,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2396,7 +2400,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation type="unfinished"/> </message> @@ -2416,17 +2420,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-109"/> + <location line="-110"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"/> </message> <message> - <location line="+121"/> + <location line="+122"/> <source>This help message</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-119"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation type="unfinished"/> </message> @@ -2436,12 +2440,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> @@ -2451,12 +2455,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation type="unfinished"/> </message> @@ -2471,17 +2475,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> @@ -2496,7 +2500,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2506,12 +2510,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"/> </message> @@ -2531,17 +2535,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>L'enviament de ...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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"/> </message> <message> - <location line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation type="unfinished"/> </message> @@ -2556,7 +2560,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2576,12 +2580,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -2596,22 +2600,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts index 81f94e388e..c48b08c6bf 100644 --- a/src/qt/locale/bitcoin_cs.ts +++ b/src/qt/locale/bitcoin_cs.ts @@ -13,15 +13,24 @@ <translation><b>Bitcoin</b> verze</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation>Copyright © 2009-2012 Vývojáři Bitcoinu</translation> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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 type="unfinished"/> + <translation> +Tohle je experimentální program. + +Šířen pod licencí MIT/X11, viz přiložený soubor COPYING nebo http://www.opensource.org/licenses/mit-license.php. + +Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v OpenSSL Toolkitu (http://www.openssl.org/) a kryptografický program od Erika Younga (eay@cryptsoft.com) a program UPnP od Thomase Bernarda.</translation> </message> </context> <context> @@ -215,18 +224,18 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"/> + <translation>Varování: Pokud si zašifruješ peněženku a ztratíš či zapomeneš heslo, <b>PŘIJDEŠ O VŠECHNY BITCOINY</b>!</translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> + <translation>Jsi si jistý, že chceš peněženku zašifrovat?</translation> </message> <message> <location line="+106"/> <location line="+24"/> <source>Warning: The Caps Lock key is on!</source> - <translation type="unfinished"/> + <translation>Upozornění: Caps Lock je zapnutý!</translation> </message> <message> <location line="-121"/> @@ -278,28 +287,23 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"/> + <translation>Heslo k peněžence bylo v pořádku změněno.</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation>Po&depiš zprávu...</translation> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>Zobrazit/Skrýt &Bitcoin</translation> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Synchronizuji se sítí...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Přehled</translation> </message> @@ -374,7 +378,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Možnosti...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation>Zaši&fruj peněženku...</translation> </message> @@ -404,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Export...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation>Pošli mince na Bitcoinovou adresu</translation> </message> @@ -429,12 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Uprav nastavení Bitcoinu</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>Zobraz nebo skryj okno Bitcoinu</translation> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation>Exportovat data z tohoto panelu do souboru</translation> </message> @@ -456,20 +455,20 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>&Debug window</source> - <translation>&Ladící okno</translation> + <translation>&Ladicí okno</translation> </message> <message> <location line="+1"/> <source>Open debugging and diagnostic console</source> - <translation>Otevři ladící a diagnostickou konzoli</translation> + <translation>Otevři ladicí a diagnostickou konzoli</translation> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation>&Ověř zprávu...</translation> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -479,12 +478,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Peněženka</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> + <translation>O &Bitcoinu</translation> + </message> + <message> + <location line="+9"/> + <source>&Show / Hide</source> <translation type="unfinished"/> </message> <message> - <location line="+44"/> + <location line="+34"/> <source>&File</source> <translation>&Soubor</translation> </message> @@ -641,15 +645,15 @@ Adresa: %4 <translation>Při ukládání peněženky na nové místo se přihodila nějaká chyba.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> - <translation type="unfinished"/> + <translation>Stala se fatální chyba. Bitcoin nemůže bezpečně pokračovat v činnosti, a proto skončí.</translation> </message> </context> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation>Upozornění sítě</translation> </message> @@ -725,10 +729,10 @@ Adresa: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> - <translation type="unfinished"/> + <translation>Bitcoin-Qt</translation> </message> <message> <location line="-12"/> @@ -944,7 +948,7 @@ Adresa: %4 <translation>výchozí</translation> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation>Upozornění</translation> @@ -997,12 +1001,12 @@ Adresa: %4 <message> <location line="+124"/> <source>Immature:</source> - <translation type="unfinished"/> + <translation>Nedozráno:</translation> </message> <message> <location line="+13"/> <source>Mined balance that has not yet matured</source> - <translation type="unfinished"/> + <translation>Vytěžené mince, které ještě nejsou zralé</translation> </message> <message> <location line="+46"/> @@ -1106,7 +1110,7 @@ Adresa: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation>N/A</translation> </message> @@ -1178,7 +1182,7 @@ Adresa: %4 <message> <location line="+7"/> <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation type="unfinished"/> + <translation>Seznam parametrů Bitcoinu pro příkazovou řádku získáš v nápovědě Bitcoinu Qt.</translation> </message> <message> <location line="+3"/> @@ -1198,22 +1202,22 @@ Adresa: %4 <message> <location line="-104"/> <source>Bitcoin - Debug window</source> - <translation type="unfinished"/> + <translation>Bitcoin - ladicí okno</translation> </message> <message> <location line="+25"/> <source>Bitcoin Core</source> - <translation type="unfinished"/> + <translation>Jádro Bitcoinu</translation> </message> <message> <location line="+279"/> <source>Debug log file</source> - <translation type="unfinished"/> + <translation>Soubor s ladicími záznamy</translation> </message> <message> <location line="+7"/> <source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source> - <translation type="unfinished"/> + <translation>Otevři soubor s ladicími záznamy Bitcoinu z aktuálního datového adresáře. U velkých logů to může pár vteřin zabrat.</translation> </message> <message> <location line="+102"/> @@ -1240,7 +1244,7 @@ Adresa: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1313,7 +1317,7 @@ Adresa: %4 <message> <location line="+23"/> <source>The recipient address is not valid, please recheck.</source> - <translation type="unfinished"/> + <translation>Adresa příjemce je neplatná, překontroluj ji prosím.</translation> </message> <message> <location line="+5"/> @@ -1415,7 +1419,7 @@ Adresa: %4 <message> <location filename="../forms/signverifymessagedialog.ui" line="+14"/> <source>Signatures - Sign / Verify a Message</source> - <translation type="unfinished"/> + <translation>Podpisy - podepsat/ověřit zprávu</translation> </message> <message> <location line="+13"/> @@ -1443,7 +1447,7 @@ Adresa: %4 <location line="-193"/> <location line="+203"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location line="-193"/> @@ -1453,7 +1457,7 @@ Adresa: %4 <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location line="+12"/> @@ -1490,17 +1494,17 @@ Adresa: %4 <message> <location line="-64"/> <source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source> - <translation type="unfinished"/> + <translation>K ověření podpisu zprávy zadej podepisující adresu, zprávu (ověř si, že správně kopíruješ zalomení řádků, mezery, tabulátory apod.) a podpis. Dávej pozor na to, abys nezkopíroval do podpisu víc, než co je v samotné podepsané zprávě, abys nebyl napálen man-in-the-middle útokem.</translation> </message> <message> <location line="+21"/> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Adresa, kterou je zpráva podepsána (např. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+40"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> - <translation type="unfinished"/> + <translation>Ověř zprávu, aby ses ujistil, že byla podepsána danou Bitcoinovou adresou</translation> </message> <message> <location line="+17"/> @@ -1535,18 +1539,18 @@ Adresa: %4 <location line="+73"/> <location line="+8"/> <source>Please check the address and try again.</source> - <translation type="unfinished"/> + <translation>Zkontroluj ji prosím a zkus to pak znovu.</translation> </message> <message> <location line="-81"/> <location line="+81"/> <source>The entered address does not refer to a key.</source> - <translation type="unfinished"/> + <translation>Zadaná adresa nepasuje ke klíči.</translation> </message> <message> <location line="-73"/> <source>Wallet unlock was cancelled.</source> - <translation type="unfinished"/> + <translation>Odemčení peněženky bylo zrušeno.</translation> </message> <message> <location line="+8"/> @@ -1556,23 +1560,23 @@ Adresa: %4 <message> <location line="+12"/> <source>Message signing failed.</source> - <translation type="unfinished"/> + <translation>Podepisování zprávy selhalo.</translation> </message> <message> <location line="+5"/> <source>Message signed.</source> - <translation type="unfinished"/> + <translation>Zpráv podepsána.</translation> </message> <message> <location line="+59"/> <source>The signature could not be decoded.</source> - <translation type="unfinished"/> + <translation>Podpis nejde dekódovat.</translation> </message> <message> <location line="+0"/> <location line="+13"/> <source>Please check the signature and try again.</source> - <translation type="unfinished"/> + <translation>Zkontroluj ho prosím a zkus to pak znovu.</translation> </message> <message> <location line="+0"/> @@ -1582,12 +1586,12 @@ Adresa: %4 <message> <location line="+7"/> <source>Message verification failed.</source> - <translation type="unfinished"/> + <translation>Ověřování zprávy selhalo.</translation> </message> <message> <location line="+5"/> <source>Message verified.</source> - <translation type="unfinished"/> + <translation>Zpráva ověřena.</translation> </message> </context> <context> @@ -1600,12 +1604,12 @@ Adresa: %4 <message numerus="yes"> <location line="-2"/> <source>Open for %n block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>Otevřeno pro 1 blok</numerusform><numerusform>Otevřeno pro %n bloky</numerusform><numerusform>Otevřeno pro %n bloků</numerusform></translation> </message> <message> <location line="+8"/> <source>%1/offline</source> - <translation type="unfinished"/> + <translation>%1/offline</translation> </message> <message> <location line="+2"/> @@ -1620,12 +1624,12 @@ Adresa: %4 <message> <location line="+18"/> <source>Status</source> - <translation type="unfinished"/> + <translation>Stav</translation> </message> <message numerus="yes"> <location line="+7"/> <source>, broadcast through %n node(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>, rozesláno přes 1 uzel</numerusform><numerusform>, rozesláno přes %n uzly</numerusform><numerusform>, rozesláno přes %n uzlů</numerusform></translation> </message> <message> <location line="+4"/> @@ -1635,36 +1639,36 @@ Adresa: %4 <message> <location line="+7"/> <source>Source</source> - <translation type="unfinished"/> + <translation>Zdroj</translation> </message> <message> <location line="+0"/> <source>Generated</source> - <translation type="unfinished"/> + <translation>Vygenerováno</translation> </message> <message> <location line="+6"/> <location line="+17"/> <source>From</source> - <translation type="unfinished"/> + <translation>Od</translation> </message> <message> <location line="+1"/> <location line="+22"/> <location line="+58"/> <source>To</source> - <translation type="unfinished"/> + <translation>Pro</translation> </message> <message> <location line="-77"/> <location line="+2"/> <source>own address</source> - <translation type="unfinished"/> + <translation>vlastní adresa</translation> </message> <message> <location line="-2"/> <source>label</source> - <translation type="unfinished"/> + <translation>označení</translation> </message> <message> <location line="+37"/> @@ -1673,17 +1677,17 @@ Adresa: %4 <location line="+17"/> <location line="+30"/> <source>Credit</source> - <translation type="unfinished"/> + <translation>Příjem</translation> </message> <message numerus="yes"> <location line="-102"/> <source>matures in %n more block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>dozraje po jednom bloku</numerusform><numerusform>dozraje po %n blocích</numerusform><numerusform>dozraje po %n blocích</numerusform></translation> </message> <message> <location line="+2"/> <source>not accepted</source> - <translation type="unfinished"/> + <translation>neakceptováno</translation> </message> <message> <location line="+44"/> @@ -1691,67 +1695,67 @@ Adresa: %4 <location line="+15"/> <location line="+30"/> <source>Debit</source> - <translation type="unfinished"/> + <translation>Výdaj</translation> </message> <message> <location line="-39"/> <source>Transaction fee</source> - <translation type="unfinished"/> + <translation>Transakční poplatek</translation> </message> <message> <location line="+16"/> <source>Net amount</source> - <translation type="unfinished"/> + <translation>Čistá částka</translation> </message> <message> <location line="+6"/> <source>Message</source> - <translation type="unfinished"/> + <translation>Zpráva</translation> </message> <message> <location line="+2"/> <source>Comment</source> - <translation type="unfinished"/> + <translation>Komentář</translation> </message> <message> <location line="+2"/> <source>Transaction ID</source> - <translation type="unfinished"/> + <translation>ID transakce</translation> </message> <message> <location line="+3"/> <source>Generated coins must mature 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, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> + <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. To se občas může stát, pokud jiný uzel vygeneruje blok zhruba ve stejném okamžiku jako ty.</translation> </message> <message> <location line="+7"/> <source>Debug information</source> - <translation type="unfinished"/> + <translation>Ladicí informace</translation> </message> <message> <location line="+8"/> <source>Transaction</source> - <translation type="unfinished"/> + <translation>Transakce</translation> </message> <message> <location line="+5"/> <source>Inputs</source> - <translation type="unfinished"/> + <translation>Vstupy</translation> </message> <message> <location line="+23"/> <source>Amount</source> - <translation>Množství</translation> + <translation>Částka</translation> </message> <message> <location line="+1"/> <source>true</source> - <translation type="unfinished"/> + <translation>true</translation> </message> <message> <location line="+0"/> <source>false</source> - <translation type="unfinished"/> + <translation>false</translation> </message> <message> <location line="-212"/> @@ -2075,7 +2079,7 @@ Adresa: %4 <translation>Verze Bitcoinu</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Užití:</translation> </message> @@ -2090,12 +2094,12 @@ Adresa: %4 <translation>Výpis příkazů</translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Získat nápovědu pro příkaz</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Možnosti:</translation> </message> @@ -2110,7 +2114,7 @@ Adresa: %4 <translation>PID soubor (výchozí: bitcoind.pid)</translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Generovat mince</translation> </message> @@ -2120,7 +2124,7 @@ Adresa: %4 <translation>Negenerovat mince</translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Adresář pro data</translation> </message> @@ -2135,12 +2139,7 @@ Adresa: %4 <translation>Nastavit velikost databázového souboru s logy v megabajtech (výchozí: 100)</translation> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Zadej časový limit spojení (v milisekundách)</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <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> @@ -2150,27 +2149,27 @@ Adresa: %4 <translation>Povol nejvýše <n> připojení k uzlům (výchozí: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Připojit se k uzlu, získat adresy jeho protějšků a odpojit se</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation>Specifikuj svou veřejnou adresu</translation> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation>Poslouchat na zadané adrese. Pro zápis IPv6 adresy použij notaci [adresa]:port</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <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 line="-104"/> + <location line="-105"/> <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> @@ -2185,7 +2184,7 @@ Adresa: %4 <translation>Akceptovat příkazy z příkazové řádky a přes JSON-RPC</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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> @@ -2195,144 +2194,154 @@ Adresa: %4 <translation>Použít testovací síť (testnet)</translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation type="unfinished"/> + <translation>Přijímat spojení zvenčí (výchozí: 1, pokud není zadáno -proxy nebo -connect)</translation> </message> <message> <location line="-20"/> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> - <translation type="unfinished"/> + <translation>Nastavit maximální velikost prioritních/nízkopoplatkových transakcí v bajtech (výchozí: 27000)</translation> </message> <message> <location line="+5"/> <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>Upozornění: -paytxfee je nastaveno velmi vysoko! Toto je transakční poplatek, který zaplatíš za každou poslanou transakci.</translation> </message> <message> <location line="+3"/> <source>Warning: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation type="unfinished"/> + <translation>Upozornění: Zobrazené transakce nemusí být správné! Možná potřebuješ aktualizovat nebo ostatní uzly potřebují aktualizovat.</translation> </message> <message> <location line="+3"/> <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>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 line="+13"/> <source>An error occurred while setting up the RPC port %i for listening: %s</source> - <translation type="unfinished"/> + <translation>Při nastavování naslouchacího RPC portu %i nastala chyba: %s</translation> </message> <message> <location line="+4"/> <source>Block creation options:</source> - <translation type="unfinished"/> + <translation>Možnosti vytvoření bloku:</translation> </message> <message> <location line="+6"/> <source>Connect only to the specified node(s)</source> - <translation type="unfinished"/> + <translation>Připojovat se pouze k zadaným uzlům</translation> </message> <message> <location line="+3"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation type="unfinished"/> + <translation>Zjistit vlastní IP adresu (výchozí: 1, pokud naslouchá a není zadáno -externalip)</translation> </message> <message> <location line="+11"/> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> - <translation type="unfinished"/> + <translation>Nepodařilo se naslouchat na žádném portu. Použij -listen=0, pokud to byl tvůj záměr.</translation> </message> <message> <location line="+2"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> + <translation>Hledat uzly přes DNS (výchozí: 1, pokud není zadáno -connect)</translation> + </message> + <message> + <location line="+6"/> + <source>Importing blocks...</source> <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> - <translation type="unfinished"/> + <translation>Neplatná -tor adresa: '%s'</translation> </message> <message> <location line="+10"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> - <translation type="unfinished"/> + <translation>Maximální velikost přijímacího bufferu pro každé spojení, <n>*1000 bajtů (výchozí: 5000)</translation> </message> <message> <location line="+1"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</source> - <translation type="unfinished"/> + <translation>Maximální velikost odesílacího bufferu pro každé spojení, <n>*1000 bajtů (výchozí: 1000)</translation> </message> <message> <location line="+1"/> <source>Only connect to nodes in network <net> (IPv4, IPv6 or Tor)</source> - <translation type="unfinished"/> + <translation>Připojovat se pouze k uzlům v <net> síti (IPv4, IPv6 nebo Tor)</translation> </message> <message> <location line="+2"/> <source>Output extra debugging information. Implies all other -debug* options</source> - <translation type="unfinished"/> + <translation>Tisknout speciální ladicí informace. Implikuje použití všechny -debug* voleb</translation> </message> <message> <location line="+1"/> <source>Output extra network debugging information</source> - <translation type="unfinished"/> + <translation>Tisknout speciální ladicí informace o síti</translation> </message> <message> <location line="+2"/> <source>Prepend debug output with timestamp</source> - <translation>Připojit před ladící výstup časové razítko</translation> + <translation>Připojit před ladicí výstup časové razítko</translation> </message> <message> <location line="+4"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation type="unfinished"/> + <translation>Možnosti SSL: (viz instrukce nastavení SSL v Bitcoin Wiki)</translation> </message> <message> <location line="+1"/> <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation type="unfinished"/> + <translation>Zvol verzi socks proxy (4-5, výchozí: 5)</translation> </message> <message> <location line="+3"/> <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Posílat stopovací/ladící informace do konzole místo do souboru debug.log</translation> + <translation>Posílat stopovací/ladicí informace do konzole místo do souboru debug.log</translation> </message> <message> <location line="+1"/> <source>Send trace/debug info to debugger</source> - <translation>Posílat stopovací/ladící informace do debuggeru</translation> + <translation>Posílat stopovací/ladicí informace do debuggeru</translation> </message> <message> <location line="+7"/> <source>Set maximum block size in bytes (default: 250000)</source> - <translation type="unfinished"/> + <translation>Nastavit maximální velikost bloku v bajtech (výchozí: 250000)</translation> </message> <message> <location line="+1"/> <source>Set minimum block size in bytes (default: 0)</source> - <translation type="unfinished"/> + <translation>Nastavit minimální velikost bloku v bajtech (výchozí: 0)</translation> </message> <message> <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> + <translation>Při spuštění klienta zmenšit soubor debug.log (výchozí: 1, pokud není zadáno -debug)</translation> + </message> + <message> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> - <translation type="unfinished"/> + <translation>Použít UPnP k namapování naslouchacího portu (výchozí: 0)</translation> </message> <message> <location line="+1"/> <source>Use UPnP to map the listening port (default: 1 when listening)</source> - <translation type="unfinished"/> + <translation>Použít UPnP k namapování naslouchacího portu (výchozí: 1, pokud naslouchá)</translation> </message> <message> <location line="+1"/> <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation type="unfinished"/> + <translation>Použít proxy k připojení ke skryté služby (výchozí: stejné jako -proxy)</translation> </message> <message> <location line="+2"/> @@ -2342,12 +2351,12 @@ Adresa: %4 <message> <location line="+2"/> <source>Warning: Disk space is low!</source> - <translation type="unfinished"/> + <translation>Upozornění: Na disku je málo místa!</translation> </message> <message> <location line="+1"/> <source>Warning: This version is obsolete, upgrade required!</source> - <translation type="unfinished"/> + <translation>Upozornění: tahle verze je zastaralá, měl bys ji aktualizovat!</translation> </message> <message> <location line="-41"/> @@ -2360,22 +2369,22 @@ Adresa: %4 <translation>Čekat na JSON-RPC spojení na <portu> (výchozí: 8332)</translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Povolit JSON-RPC spojení ze specifikované IP adresy</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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 line="-89"/> + <location 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 line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>Převést peněženku na nejnovější formát</translation> </message> @@ -2390,7 +2399,7 @@ Adresa: %4 <translation>Přeskenovat řetězec bloků na chybějící transakce tvé pěněženky</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <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> @@ -2400,7 +2409,7 @@ Adresa: %4 <translation>Jak moc důkladná má verifikace bloků být (0-6, výchozí: 1)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation>Importuje bloky z externího souboru blk000?.dat</translation> </message> @@ -2420,17 +2429,17 @@ Adresa: %4 <translation>Soubor se serverovým soukromým klíčem (výchozí: server.pem)</translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Tato nápověda</translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <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> @@ -2440,12 +2449,12 @@ Adresa: %4 <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Nedaří se mi připojit na %s na tomhle počítači (operace bind vrátila chybu %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation>Připojovat se přes socks proxy</translation> </message> @@ -2455,12 +2464,12 @@ Adresa: %4 <translation>Povolit DNS dotazy pro -addnode (přidání uzlu), -seednode a -connect (připojení)</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Načítám adresy...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>Chyba při načítání blkindex.dat</translation> </message> @@ -2475,17 +2484,17 @@ Adresa: %4 <translation>Chyba při načítání wallet.dat: peněženka vyžaduje novější verzi Bitcoinu</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <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 line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>Chyba při načítání wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation>Neplatná -proxy adresa: '%s'</translation> </message> @@ -2500,7 +2509,7 @@ Adresa: %4 <translation>V -socks byla požadována neznámá verze proxy: %i</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Nemohu přeložit -bind adresu: '%s'</translation> </message> @@ -2510,12 +2519,12 @@ Adresa: %4 <translation>Nemohu přeložit -externalip adresu: '%s'</translation> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Neplatná částka pro -paytxfee=<částka>: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation>Chyba: nemohu nastartovat uzel</translation> </message> @@ -2535,17 +2544,17 @@ Adresa: %4 <translation>Chyba: Vytvoření transakce selhalo </translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Posílám...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation>Neplatná částka</translation> </message> @@ -2560,14 +2569,14 @@ Adresa: %4 <translation>Načítám index bloků...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <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 line="-18"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"/> + <translation>Nedaří se mi připojit na %s na tomhle počítači. Bitcoin už pravděpodobně jednou běží.</translation> </message> <message> <location line="+48"/> @@ -2580,12 +2589,12 @@ Adresa: %4 <translation>Poplatek za KB, který se přidá ke každé odeslané transakci</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Načítám peněženku...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation>Nemohu převést peněženku do staršího formátu</translation> </message> @@ -2600,22 +2609,22 @@ Adresa: %4 <translation>Nemohu napsat výchozí adresu</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Přeskenovávám...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Načítání dokončeno</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation>K použití volby %s</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts index 2cba5d680e..3f5368f7be 100644 --- a/src/qt/locale/bitcoin_da.ts +++ b/src/qt/locale/bitcoin_da.ts @@ -13,15 +13,24 @@ <translation><b>Bitcoin</b> version</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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 type="unfinished"/> + <translation> +Dette program er ekperimentielt. + +Det er gjort tilgængeligt under MIT/X11 softwarelicensen. Se den tilhørende fil "COPYING" eller http://www.opensource.org/licenses/mit-license.php. + +Produktet indeholder software som er udviklet af OpenSSL Project til brug i OpenSSL Toolkit (http://www.openssl.org/), kryptografisk software skrevet af Eric Young (eay@cryptsoft.com) og UPnP-software skrevet by Thomas Bernard.</translation> </message> </context> <context> @@ -49,17 +58,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-11"/> <source>&New Address</source> - <translation type="unfinished"/> + <translation>&Ny adresse</translation> </message> <message> <location line="-46"/> <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> - <translation type="unfinished"/> + <translation>Dette er dine Bitcoinadresser til at modtage betalinger med. Du kan give en forskellig adresse til hver afsender, så du kan holde styr på hvem der betaler dig.</translation> </message> <message> <location line="+60"/> <source>&Copy Address</source> - <translation type="unfinished"/> + <translation>&Kopier adresse</translation> </message> <message> <location line="+11"/> @@ -99,12 +108,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../addressbookpage.cpp" line="+65"/> <source>Copy &Label</source> - <translation type="unfinished"/> + <translation>Kopier &etiket</translation> </message> <message> <location line="+2"/> <source>&Edit</source> - <translation type="unfinished"/> + <translation>R&ediger</translation> </message> <message> <location line="+250"/> @@ -215,12 +224,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"/> + <translation>Advarsel: Hvis du krypterer din tegnebog og mister dit kodeord vil du <b>miste alle dine BITCOINS</b>!</translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> + <translation>Er du sikker på at du ønsker at kryptere din tegnebog?</translation> </message> <message> <location line="+106"/> @@ -237,7 +246,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-48"/> <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 type="unfinished"/> + <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 line="+5"/> @@ -278,28 +287,23 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"/> + <translation>Tegnebogskodeord blev ændret.</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation type="unfinished"/> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Synkroniserer med netværk ...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Oversigt</translation> </message> @@ -361,12 +365,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+2"/> <source>About &Qt</source> - <translation type="unfinished"/> + <translation>Om &Qt</translation> </message> <message> <location line="+1"/> <source>Show information about Qt</source> - <translation type="unfinished"/> + <translation>Vis oplysninger om Qt</translation> </message> <message> <location line="+2"/> @@ -374,19 +378,19 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Indstillinger ...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> - <translation type="unfinished"/> + <translation>&Kryptér tegnebog...</translation> </message> <message> <location line="+3"/> <source>&Backup Wallet...</source> - <translation type="unfinished"/> + <translation>&Backup tegnebog...</translation> </message> <message> <location line="+2"/> <source>&Change Passphrase...</source> - <translation type="unfinished"/> + <translation>&Skift adgangskode...</translation> </message> <message numerus="yes"> <location line="+241"/> @@ -396,7 +400,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+6"/> <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> - <translation type="unfinished"/> + <translation>Downloadet %1 af %2 blokke af transaktionshistorie (%3% done).</translation> </message> <message> <location line="-254"/> @@ -404,9 +408,9 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Eksporter...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Send coins til en bitcoinadresse</translation> </message> <message> <location line="+6"/> @@ -426,17 +430,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+37"/> <source>Modify configuration options for Bitcoin</source> - <translation type="unfinished"/> + <translation>Rediger konfigurationsindstillinger af bitcoin</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> + <translation>Eksportér den aktuelle visning til en fil</translation> </message> <message> <location line="+2"/> @@ -464,27 +463,32 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> <location line="+0"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>tegnebog</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> + <translation>&Om Bitcoin</translation> + </message> + <message> + <location line="+9"/> + <source>&Show / Hide</source> <translation type="unfinished"/> </message> <message> - <location line="+44"/> + <location line="+34"/> <source>&File</source> <translation>&Fil</translation> </message> @@ -623,7 +627,7 @@ Adresse: %4 <message> <location line="+23"/> <source>Backup Wallet</source> - <translation type="unfinished"/> + <translation>Backup tegnebog</translation> </message> <message> <location line="+0"/> @@ -641,7 +645,7 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -649,7 +653,7 @@ Adresse: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -709,7 +713,7 @@ Adresse: %4 <message> <location line="+5"/> <source>The entered address "%1" is not a valid Bitcoin address.</source> - <translation type="unfinished"/> + <translation>Den indtastede adresse "%1" er ikke en gyldig bitcoinadresse.</translation> </message> <message> <location line="+5"/> @@ -725,7 +729,7 @@ Adresse: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation type="unfinished"/> @@ -743,12 +747,12 @@ Adresse: %4 <message> <location line="+1"/> <source>command-line options</source> - <translation type="unfinished"/> + <translation>command-line indstillinger</translation> </message> <message> <location line="+4"/> <source>UI options</source> - <translation type="unfinished"/> + <translation>UI indstillinger</translation> </message> <message> <location line="+1"/> @@ -777,12 +781,12 @@ Adresse: %4 <message> <location line="+16"/> <source>&Main</source> - <translation type="unfinished"/> + <translation>&Generelt</translation> </message> <message> <location line="+6"/> <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>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 line="+15"/> @@ -792,12 +796,12 @@ Adresse: %4 <message> <location line="+31"/> <source>Automatically start Bitcoin after logging in to the system.</source> - <translation type="unfinished"/> + <translation>Start Bitcoin automatisk efter at computeren er tændt</translation> </message> <message> <location line="+3"/> <source>&Start Bitcoin on system login</source> - <translation type="unfinished"/> + <translation>&Start Bitcoin når systemet startes</translation> </message> <message> <location line="+7"/> @@ -827,17 +831,17 @@ Adresse: %4 <message> <location line="+7"/> <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source> - <translation type="unfinished"/> + <translation>Opret forbindelse til Bitconnetværket via en SOCKS proxy (f.eks. ved tilslutning gennem Tor)</translation> </message> <message> <location line="+3"/> <source>&Connect through SOCKS proxy:</source> - <translation type="unfinished"/> + <translation>&Forbind gennem SOCKS proxy:</translation> </message> <message> <location line="+9"/> <source>Proxy &IP:</source> - <translation type="unfinished"/> + <translation>Proxy-&IP:</translation> </message> <message> <location line="+19"/> @@ -852,7 +856,7 @@ Adresse: %4 <message> <location line="+19"/> <source>Port of the proxy (e.g. 9050)</source> - <translation type="unfinished"/> + <translation>Porten på proxyen (f.eks. 9050)</translation> </message> <message> <location line="+7"/> @@ -872,7 +876,7 @@ Adresse: %4 <message> <location line="+6"/> <source>Show only a tray icon after minimizing the window.</source> - <translation type="unfinished"/> + <translation>Vis kun et systembakkeikon efter minimering af vinduet.</translation> </message> <message> <location line="+3"/> @@ -887,12 +891,12 @@ Adresse: %4 <message> <location line="+3"/> <source>M&inimize on close</source> - <translation type="unfinished"/> + <translation>M&inimer ved lukning</translation> </message> <message> <location line="+21"/> <source>&Display</source> - <translation type="unfinished"/> + <translation>&Visning</translation> </message> <message> <location line="+8"/> @@ -907,12 +911,12 @@ Adresse: %4 <message> <location line="+11"/> <source>&Unit to show amounts in:</source> - <translation type="unfinished"/> + <translation>&Enhed at vise beløb i:</translation> </message> <message> <location line="+13"/> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation type="unfinished"/> + <translation>Vælg den standard underopdelingsenhed som skal vises i brugergrænsefladen, og når du sender coins.</translation> </message> <message> <location line="+9"/> @@ -922,7 +926,7 @@ Adresse: %4 <message> <location line="+3"/> <source>&Display addresses in transaction list</source> - <translation type="unfinished"/> + <translation>&Vis adresser i transaktionensliste</translation> </message> <message> <location line="+71"/> @@ -945,10 +949,10 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> - <translation type="unfinished"/> + <translation>Advarsel</translation> </message> <message> <location line="-9"/> @@ -959,7 +963,7 @@ Adresse: %4 <message> <location line="+29"/> <source>The supplied proxy address is invalid.</source> - <translation type="unfinished"/> + <translation>Ugyldig -proxy adresse</translation> </message> </context> <context> @@ -993,7 +997,7 @@ Adresse: %4 <message> <location line="-78"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>tegnebog</translation> </message> <message> <location line="+124"/> @@ -1047,12 +1051,12 @@ Adresse: %4 <message> <location line="+56"/> <source>Amount:</source> - <translation type="unfinished"/> + <translation>Beløb:</translation> </message> <message> <location line="-44"/> <source>Label:</source> - <translation type="unfinished"/> + <translation>Etiket:</translation> </message> <message> <location line="+19"/> @@ -1107,7 +1111,7 @@ Adresse: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1174,7 +1178,7 @@ Adresse: %4 <message> <location line="+16"/> <source>Command-line options</source> - <translation type="unfinished"/> + <translation>Command-line indstillinger</translation> </message> <message> <location line="+7"/> @@ -1219,7 +1223,7 @@ Adresse: %4 <message> <location line="+102"/> <source>Clear console</source> - <translation type="unfinished"/> + <translation>Ryd</translation> </message> <message> <location filename="../rpcconsole.cpp" line="-33"/> @@ -1241,7 +1245,7 @@ Adresse: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1259,7 +1263,7 @@ Adresse: %4 <message> <location line="+3"/> <source>&Add Recipient</source> - <translation type="unfinished"/> + <translation>&Tilføj modtager</translation> </message> <message> <location line="+20"/> @@ -1269,7 +1273,7 @@ Adresse: %4 <message> <location line="+3"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>Ryd &alle</translation> </message> <message> <location line="+22"/> @@ -1314,7 +1318,7 @@ Adresse: %4 <message> <location line="+23"/> <source>The recipient address is not valid, please recheck.</source> - <translation type="unfinished"/> + <translation>Modtagerens adresse er ikke gyldig. Tjek venligst adressen igen.</translation> </message> <message> <location line="+5"/> @@ -1324,27 +1328,27 @@ Adresse: %4 <message> <location line="+5"/> <source>The amount exceeds your balance.</source> - <translation type="unfinished"/> + <translation>Beløbet overstiger din saldo.</translation> </message> <message> <location line="+5"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation type="unfinished"/> + <translation>Totalen overstiger din saldo når %1 transaktionsgebyr er inkluderet.</translation> </message> <message> <location line="+6"/> <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation type="unfinished"/> + <translation>Duplikeret adresse fundet. Du kan kun sende til hver adresse en gang pr. afsendelse.</translation> </message> <message> <location line="+5"/> <source>Error: Transaction creation failed.</source> - <translation type="unfinished"/> + <translation>Fejl: Oprettelse af transaktionen mislykkedes.</translation> </message> <message> <location line="+5"/> <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>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> </context> <context> @@ -1432,19 +1436,19 @@ Adresse: %4 <message> <location line="+18"/> <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Indtast en Bitcoinadresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+10"/> <location line="+203"/> <source>Choose an address from the address book</source> - <translation type="unfinished"/> + <translation>Vælg adresse fra adressebog</translation> </message> <message> <location line="-193"/> <location line="+203"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location line="-193"/> @@ -1454,7 +1458,7 @@ Adresse: %4 <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location line="+12"/> @@ -1480,7 +1484,7 @@ Adresse: %4 <location line="+3"/> <location line="+146"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>Ryd &alle</translation> </message> <message> <location line="-87"/> @@ -1496,7 +1500,7 @@ Adresse: %4 <message> <location line="+21"/> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Indtast en Bitcoinadresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+40"/> @@ -1647,14 +1651,14 @@ Adresse: %4 <location line="+6"/> <location line="+17"/> <source>From</source> - <translation type="unfinished"/> + <translation>Fra</translation> </message> <message> <location line="+1"/> <location line="+22"/> <location line="+58"/> <source>To</source> - <translation type="unfinished"/> + <translation>Til</translation> </message> <message> <location line="-77"/> @@ -1665,7 +1669,7 @@ Adresse: %4 <message> <location line="-2"/> <source>label</source> - <translation type="unfinished"/> + <translation>etiket</translation> </message> <message> <location line="+37"/> @@ -1684,7 +1688,7 @@ Adresse: %4 <message> <location line="+2"/> <source>not accepted</source> - <translation type="unfinished"/> + <translation>ikke accepteret</translation> </message> <message> <location line="+44"/> @@ -1697,22 +1701,22 @@ Adresse: %4 <message> <location line="-39"/> <source>Transaction fee</source> - <translation type="unfinished"/> + <translation>Transaktionsgebyr</translation> </message> <message> <location line="+16"/> <source>Net amount</source> - <translation type="unfinished"/> + <translation>Nettobeløb</translation> </message> <message> <location line="+6"/> <source>Message</source> - <translation type="unfinished"/> + <translation>Besked</translation> </message> <message> <location line="+2"/> <source>Comment</source> - <translation type="unfinished"/> + <translation>Kommentar</translation> </message> <message> <location line="+2"/> @@ -1722,7 +1726,7 @@ Adresse: %4 <message> <location line="+3"/> <source>Generated coins must mature 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, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> + <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> <message> <location line="+7"/> @@ -1848,7 +1852,7 @@ Adresse: %4 <message> <location line="+2"/> <source>Received from</source> - <translation type="unfinished"/> + <translation>Modtaget fra</translation> </message> <message> <location line="+3"/> @@ -2076,7 +2080,7 @@ Adresse: %4 <translation>Bitcoinversion</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Anvendelse:</translation> </message> @@ -2093,13 +2097,13 @@ Adresse: %4 </translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Få hjælp til en kommando </translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Indstillinger: </translation> @@ -2117,7 +2121,7 @@ Adresse: %4 </translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Generér coins </translation> @@ -2129,7 +2133,7 @@ Adresse: %4 </translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Angiv databibliotek </translation> @@ -2145,15 +2149,9 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Angiv tilslutningstimeout (i millisekunder) -</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation type="unfinished"/> + <translation>Lyt til forbindelser på <port> (standard: 8333 or testnet: 18333)</translation> </message> <message> <location line="+4"/> @@ -2161,27 +2159,27 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -2197,7 +2195,7 @@ Adresse: %4 </translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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> @@ -2209,9 +2207,9 @@ Adresse: %4 </translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation type="unfinished"/> + <translation>Acceptér forbindelser udefra (default: 1 if no -proxy or -connect)</translation> </message> <message> <location line="-20"/> @@ -2221,7 +2219,7 @@ Adresse: %4 <message> <location line="+5"/> <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>Advarsel: -paytxfee er sat meget højt! Dette er det gebyr du vil betale, hvis du sender en transaktion.</translation> </message> <message> <location line="+3"/> @@ -2231,7 +2229,7 @@ Adresse: %4 <message> <location line="+3"/> <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>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 line="+13"/> @@ -2246,7 +2244,7 @@ Adresse: %4 <message> <location line="+6"/> <source>Connect only to the specified node(s)</source> - <translation type="unfinished"/> + <translation>Tilslut kun til den angivne node</translation> </message> <message> <location line="+3"/> @@ -2264,11 +2262,16 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>Invalid -tor address: '%s'</source> + <location line="+6"/> + <source>Importing blocks...</source> <translation type="unfinished"/> </message> <message> + <location line="+4"/> + <source>Invalid -tor address: '%s'</source> + <translation>Ugyldig -tor address: '%s'</translation> + </message> + <message> <location line="+10"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> <translation type="unfinished"/> @@ -2301,7 +2304,7 @@ Adresse: %4 <message> <location line="+4"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation type="unfinished"/> + <translation>SSL-indstillinger: (se Bitcoin Wiki for SSL opsætningsinstruktioner)</translation> </message> <message> <location line="+1"/> @@ -2334,14 +2337,19 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>Angiv tilslutningstimeout i millisekunder (standard: 5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> - <translation type="unfinished"/> + <translation>Forsøg at bruge UPnP til at kofnigurere den lyttende port (standard: 0)</translation> </message> <message> <location line="+1"/> <source>Use UPnP to map the listening port (default: 1 when listening)</source> - <translation type="unfinished"/> + <translation>Forsøg at bruge UPnP til at kofnigurere den lyttende port (standard: 1 when listening)</translation> </message> <message> <location line="+1"/> @@ -2357,7 +2365,7 @@ Adresse: %4 <message> <location line="+2"/> <source>Warning: Disk space is low!</source> - <translation type="unfinished"/> + <translation>Advarsel: Diskplads er lav!</translation> </message> <message> <location line="+1"/> @@ -2377,24 +2385,24 @@ Adresse: %4 </translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Tillad JSON-RPC-forbindelser fra bestemt IP-adresse </translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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 line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> @@ -2411,7 +2419,7 @@ Adresse: %4 </translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2421,7 +2429,7 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation type="unfinished"/> </message> @@ -2444,19 +2452,19 @@ Adresse: %4 </translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Denne hjælpebesked </translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <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> @@ -2466,54 +2474,54 @@ Adresse: %4 <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> - <translation type="unfinished"/> + <translation>Kunne ikke binde sig til %s på denne computer (bind returned error %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> - <translation type="unfinished"/> + <translation>Tilslut via SOCKS proxy</translation> </message> <message> <location line="-13"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation type="unfinished"/> + <translation>Tillad DNS-opslag for addnode og connect</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Indlæser adresser...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> - <translation type="unfinished"/> + <translation>Fejl ved indlæsning af blkindex.dat</translation> </message> <message> <location line="+2"/> <source>Error loading wallet.dat: Wallet corrupted</source> - <translation type="unfinished"/> + <translation>Fejl ved indlæsning af wallet.dat: Tegnebog ødelagt</translation> </message> <message> <location line="+1"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation type="unfinished"/> + <translation>Fejl ved indlæsning af wallet.dat: Tegnebog kræver en nyere version af Bitcoin</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> - <translation type="unfinished"/> + <translation>Fejl ved indlæsning af wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> - <translation type="unfinished"/> + <translation>Ugyldig -proxy adresse: '%s'</translation> </message> <message> <location line="+47"/> @@ -2526,7 +2534,7 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2536,12 +2544,12 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> - <translation type="unfinished"/> + <translation>Ugyldigt beløb for -paytxfee=<amount>: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"/> </message> @@ -2553,7 +2561,7 @@ Adresse: %4 <message> <location line="-55"/> <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>Denne transaktion er over størrelsesbegrænsningen. Du kan stadig sende den for et gebyr på %1 som går til de noder der behandler din transaktion, og som hjælper med at støtte netværket. Ønsker du at betale gebyret?</translation> </message> <message> <location line="+54"/> @@ -2561,19 +2569,19 @@ Adresse: %4 <translation>Fejl: Oprettelse af transaktionen mislykkedes </translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Sender...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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>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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> - <translation type="unfinished"/> + <translation>Ugyldigt beløb</translation> </message> <message> <location line="-4"/> @@ -2586,14 +2594,14 @@ Adresse: %4 <translation>Indlæser blok-indeks...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> - <translation type="unfinished"/> + <translation>Tilføj en node til at forbinde til and attempt to keep the connection open</translation> </message> <message> <location line="-18"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"/> + <translation>Kunne ikke binde sig til %s på denne computer. Bitcoin kører sikkert allerede.</translation> </message> <message> <location line="+48"/> @@ -2603,15 +2611,15 @@ Adresse: %4 <message> <location line="-2"/> <source>Fee per KB to add to transactions you send</source> - <translation type="unfinished"/> + <translation>Gebyr pr. kB, som skal tilføjes til transaktioner du sender</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Indlæser tegnebog...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -2626,22 +2634,22 @@ Adresse: %4 <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Genindlæser...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Indlæsning gennemført</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts index 467aa7039c..f029b1982b 100644 --- a/src/qt/locale/bitcoin_de.ts +++ b/src/qt/locale/bitcoin_de.ts @@ -13,16 +13,19 @@ <translation><b>Bitcoin</b> Version</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation>Copyright © 2009-2012 Die Bitcoinentwickler</translation> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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 Bitcoinentwickler - + <translation> Dies ist experimentelle Software. Veröffentlicht unter der MIT/X11 Software-Lizenz, siehe beiligende Datei COPYING oder http://www.opensource.org/licenses/mit-license.php. @@ -290,22 +293,17 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation>Nachricht s&ignieren...</translation> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>Zeige/Verstecke &Bitcoin</translation> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Synchronisiere mit Netzwerk...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Übersicht</translation> </message> @@ -380,7 +378,7 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open <translation>&Erweiterte Einstellungen...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation>Brieftasche &verschlüsseln...</translation> </message> @@ -410,7 +408,7 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open <translation>&Exportieren...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation>Bitcoins an eine Bitcoin-Adresse überweisen</translation> </message> @@ -435,12 +433,7 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open <translation>Erweiterte Bitcoin-Einstellungen ändern</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>Zeige oder verstecke das Bitcoin Fenster</translation> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation>Daten der aktuellen Ansicht in eine Datei exportieren</translation> </message> @@ -470,12 +463,12 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open <translation>Debugging- und Diagnosekonsole öffnen</translation> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation>Nachricht &verifizieren...</translation> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -485,12 +478,17 @@ Dieses Produkt enthält Software, die vom OpenSSL Projekt zur Verwendung im Open <translation>Brieftasche</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> <translation>&Über Bitcoin</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>&Anzeigen / Verstecken</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>&Datei</translation> </message> @@ -646,7 +644,7 @@ Adresse: %4</translation> <translation>Fehler beim Abspeichern der Sicherungskopie der Brieftasche.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <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> @@ -654,7 +652,7 @@ Adresse: %4</translation> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation>Netzwerkalarm</translation> </message> @@ -730,7 +728,7 @@ Adresse: %4</translation> <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation>Bitcoin-Qt</translation> @@ -949,7 +947,7 @@ Adresse: %4</translation> <translation>Standard</translation> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation>Warnung</translation> @@ -1111,7 +1109,7 @@ Adresse: %4</translation> <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation>n.v.</translation> </message> @@ -1245,7 +1243,7 @@ Adresse: %4</translation> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1678,7 +1676,7 @@ Adresse: %4</translation> <location line="+17"/> <location line="+30"/> <source>Credit</source> - <translation>Kreditoren</translation> + <translation>Gutschrift</translation> </message> <message numerus="yes"> <location line="-102"/> @@ -1696,7 +1694,7 @@ Adresse: %4</translation> <location line="+15"/> <location line="+30"/> <source>Debit</source> - <translation>Debitoren</translation> + <translation>Belastung</translation> </message> <message> <location line="-39"/> @@ -2080,7 +2078,7 @@ Adresse: %4</translation> <translation>Bitcoin Version</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Benutzung:</translation> </message> @@ -2095,12 +2093,12 @@ Adresse: %4</translation> <translation>Befehle auflisten</translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Hilfe zu einem Befehl erhalten</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Optionen:</translation> </message> @@ -2115,7 +2113,7 @@ Adresse: %4</translation> <translation>PID-Datei angeben (Standard: bitcoind.pid)</translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Bitcoins generieren</translation> </message> @@ -2125,7 +2123,7 @@ Adresse: %4</translation> <translation>Keine Bitcoins generieren</translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Datenverzeichnis angeben</translation> </message> @@ -2140,12 +2138,7 @@ Adresse: %4</translation> <translation>Größe des Datenbankprotokolls auf der Festplatte in MB festlegen (Standard: 100)</translation> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Verbindungstimeout angeben (in Millisekunden)</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <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> @@ -2155,27 +2148,27 @@ Adresse: %4</translation> <translation>Maximal <n> Verbindungen zu Gegenstellen aufrechterhalten (Standard: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Mit dem Knoten verbinden um Adressen von Gegenstellen abzufragen, danach trennen</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation>Die eigene öffentliche Adresse angeben</translation> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation>An die angegebene Adresse binden. Benutze [Host]:Port Schreibweise für IPv6</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <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 line="-104"/> + <location line="-105"/> <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> @@ -2190,7 +2183,7 @@ Adresse: %4</translation> <translation>Kommandozeilenbefehle und JSON-RPC Befehle annehmen</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation>Als Hintergrunddienst starten und Befehle annehmen</translation> </message> @@ -2200,7 +2193,7 @@ Adresse: %4</translation> <translation>Das Testnetz verwenden</translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Eingehende Verbindungen annehmen (Standard: 1, wenn nicht -proxy oder -connect)</translation> </message> @@ -2255,7 +2248,12 @@ Adresse: %4</translation> <translation>Gegenstellen via DNS-Namensauflösung finden (Standard: 1, außer bei -connect)</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation>Importiere Blöcke...</translation> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation>Ungültige Adresse in -tor: '%s'</translation> </message> @@ -2325,7 +2323,12 @@ Adresse: %4</translation> <translation>Verkleinere debug.log Datei beim Start des Clients (Standard: 1, wenn kein -debug)</translation> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>Verbindungstimeout in Millisekunden angeben (Standard: 5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>UPnP verwenden, um die Portweiterleitung einzurichten (Standard: 0)</translation> </message> @@ -2365,22 +2368,22 @@ Adresse: %4</translation> <translation><port> nach JSON-RPC Verbindungen abhören (Standard: 8332)</translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>JSON-RPC Verbindungen von der angegebenen IP-Adresse erlauben</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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 line="-89"/> + <location 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 line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>Brieftasche auf das neueste Format aktualisieren</translation> </message> @@ -2395,7 +2398,7 @@ Adresse: %4</translation> <translation>Blockkette erneut nach fehlenden Transaktionen der Brieftasche durchsuchen</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <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> @@ -2405,7 +2408,7 @@ Adresse: %4</translation> <translation>Wie gründlich soll die Blockprüfung sein (0-6, Standard: 1)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation>Blöcke aus einer externen blk000?.dat Datei importieren</translation> </message> @@ -2425,17 +2428,17 @@ Adresse: %4</translation> <translation>Privater Serverschlüssel (Standard: server.pem)</translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Dieser Hilfetext</translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <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> @@ -2445,12 +2448,12 @@ Adresse: %4</translation> <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Kann auf diesem Computer nicht an %s binden (von bind zurückgegebener Fehler %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation>Über einen SOCKS-Proxy verbinden</translation> </message> @@ -2460,12 +2463,12 @@ Adresse: %4</translation> <translation>Erlaube DNS-Namensauflösung für -addnode, -seednode und -connect</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Lade Adressen...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>Fehler beim Laden von blkindex.dat</translation> </message> @@ -2480,17 +2483,17 @@ Adresse: %4</translation> <translation>Fehler beim Laden von wallet.dat: Brieftasche benötigt neuere Version von Bitcoin</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <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 line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>Fehler beim Laden von wallet.dat (Brieftasche)</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation>Ungültige Adresse in -proxy: '%s'</translation> </message> @@ -2505,7 +2508,7 @@ Adresse: %4</translation> <translation>Unbekannte Proxyversion in -socks angefordert: %i</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Kann Adresse in -bind nicht auflösen: '%s'</translation> </message> @@ -2515,12 +2518,12 @@ Adresse: %4</translation> <translation>Kann Adresse in -externalip nicht auflösen: '%s'</translation> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Falscher Betrag für -paytxfee=<Betrag>: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation>Fehler: Knoten konnte nicht gestartet weden</translation> </message> @@ -2540,17 +2543,17 @@ Adresse: %4</translation> <translation>Fehler: Transaktionserstellung fehlgeschlagen</translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Senden...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation>Ungültige Angabe</translation> </message> @@ -2565,7 +2568,7 @@ Adresse: %4</translation> <translation>Lade Blockindex...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <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> @@ -2585,12 +2588,12 @@ Adresse: %4</translation> <translation>Gebühr pro KB, die gesendeten Transaktionen hinzugefügt wird</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Lade Brieftasche...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation>Brieftasche kann nicht auf eine ältere Version herabgestuft werden</translation> </message> @@ -2605,22 +2608,22 @@ Adresse: %4</translation> <translation>Standardadresse kann nicht geschrieben werden</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Durchsuche erneut...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Laden abgeschlossen</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation>Zur Nutzung der %s Option</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_el_GR.ts b/src/qt/locale/bitcoin_el_GR.ts index 8e16e1d87a..b3c8aa589a 100644 --- a/src/qt/locale/bitcoin_el_GR.ts +++ b/src/qt/locale/bitcoin_el_GR.ts @@ -13,9 +13,13 @@ <translation><b>Bitcoin</b>έκδοση</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -54,12 +58,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-46"/> <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> - <translation type="unfinished"/> + <translation>Αυτές είναι οι Bitcoin διευθύνσεις σας για να λαμβάνετε πληρωμές. Δίνοντας μία ξεχωριστή διεύθυνση σε κάθε αποστολέα, θα μπορείτε να ελέγχετε ποιος σας πληρώνει.</translation> </message> <message> <location line="+60"/> <source>&Copy Address</source> - <translation type="unfinished"/> + <translation>&Αντιγραφή διεύθυνσης</translation> </message> <message> <location line="+11"/> @@ -69,7 +73,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+11"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Υπογράψτε ένα μήνυμα για ν' αποδείξετε πως σας ανήκει μια συγκεκριμένη διεύθυνση Bitcoin</translation> </message> <message> <location line="+3"/> @@ -99,12 +103,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../addressbookpage.cpp" line="+65"/> <source>Copy &Label</source> - <translation type="unfinished"/> + <translation>Αντιγραφή &επιγραφής</translation> </message> <message> <location line="+2"/> <source>&Edit</source> - <translation type="unfinished"/> + <translation>&Επεξεργασία</translation> </message> <message> <location line="+250"/> @@ -284,22 +288,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> - <translation type="unfinished"/> + <translation>Υπογραφή &Μηνύματος...</translation> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>Εμφάνισε/Κρύψε &Bitcoin</translation> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Συγχρονισμός με το δίκτυο...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Επισκόπηση</translation> </message> @@ -374,19 +373,19 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Επιλογές...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> - <translation type="unfinished"/> + <translation>&Κρυπτογράφησε το πορτοφόλι</translation> </message> <message> <location line="+3"/> <source>&Backup Wallet...</source> - <translation type="unfinished"/> + <translation>&Αντίγραφο ασφαλείας του πορτοφολιού</translation> </message> <message> <location line="+2"/> <source>&Change Passphrase...</source> - <translation type="unfinished"/> + <translation>&Άλλαξε κωδικο πρόσβασης</translation> </message> <message numerus="yes"> <location line="+241"/> @@ -404,14 +403,14 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Εξαγωγή</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> <message> <location line="+6"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Υπογράψτε ένα μήνυμα για ν' αποδείξετε πως σας ανήκει μια συγκεκριμένη διεύθυνση Bitcoin</translation> </message> <message> <location line="+4"/> @@ -429,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>Εμφάνισε ή κρύψε το παράθυρο Bitcoin</translation> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation>Εξαγωγή δεδομένων καρτέλας σε αρχείο</translation> </message> @@ -464,27 +458,32 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> <location line="+0"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>Πορτοφόλι</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> - <translation type="unfinished"/> + <translation>&Σχετικα:Bitcoin</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>&Εμφάνισε/Κρύψε</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>&Αρχείο</translation> </message> @@ -575,7 +574,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+5"/> <source>Confirm transaction fee</source> - <translation type="unfinished"/> + <translation>Επιβεβαίωση αμοιβής συναλλαγής</translation> </message> <message> <location line="+27"/> @@ -643,7 +642,7 @@ Address: %4 <translation>Παρουσιάστηκε σφάλμα κατά την αποθήκευση των δεδομένων πορτοφολιού στη νέα τοποθεσία.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -651,7 +650,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -727,7 +726,7 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation type="unfinished"/> @@ -735,7 +734,7 @@ Address: %4 <message> <location line="-12"/> <source>version</source> - <translation type="unfinished"/> + <translation>έκδοση</translation> </message> <message> <location line="+2"/> @@ -745,12 +744,12 @@ Address: %4 <message> <location line="+1"/> <source>command-line options</source> - <translation type="unfinished"/> + <translation>επιλογής γραμμής εντολών</translation> </message> <message> <location line="+4"/> <source>UI options</source> - <translation type="unfinished"/> + <translation>επιλογές UI</translation> </message> <message> <location line="+1"/> @@ -793,7 +792,7 @@ Address: %4 <message> <location line="+31"/> <source>Automatically start Bitcoin after logging in to the system.</source> - <translation type="unfinished"/> + <translation>Αυτόματη εκκίνηση του Bitcoin μετά την εισαγωγή στο σύστημα</translation> </message> <message> <location line="+3"/> @@ -813,7 +812,7 @@ Address: %4 <message> <location line="+21"/> <source>&Network</source> - <translation type="unfinished"/> + <translation>&Δίκτυο</translation> </message> <message> <location line="+6"/> @@ -833,7 +832,7 @@ Address: %4 <message> <location line="+3"/> <source>&Connect through SOCKS proxy:</source> - <translation type="unfinished"/> + <translation>&Σύνδεση μέσω διαμεσολαβητή SOCKS</translation> </message> <message> <location line="+9"/> @@ -853,12 +852,12 @@ Address: %4 <message> <location line="+19"/> <source>Port of the proxy (e.g. 9050)</source> - <translation type="unfinished"/> + <translation>Θύρα διαμεσολαβητή</translation> </message> <message> <location line="+7"/> <source>SOCKS &Version:</source> - <translation type="unfinished"/> + <translation>SOCKS &Έκδοση:</translation> </message> <message> <location line="+13"/> @@ -903,7 +902,7 @@ Address: %4 <message> <location line="+13"/> <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation type="unfinished"/> + <translation>Εδώ μπορεί να ρυθμιστεί η γλώσσα διεπαφής χρήστη. Αυτή η ρύθμιση θα ισχύσει μετά την επανεκκίνηση του Bitcoin.</translation> </message> <message> <location line="+11"/> @@ -913,12 +912,12 @@ Address: %4 <message> <location line="+13"/> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation type="unfinished"/> + <translation>Διαλέξτε την προεπιλεγμένη υποδιαίρεση που θα εμφανίζεται όταν στέλνετε νομίσματα.</translation> </message> <message> <location line="+9"/> <source>Whether to show Bitcoin addresses in the transaction list or not.</source> - <translation type="unfinished"/> + <translation>Επιλέξτε αν θέλετε να εμφανίζονται οι διευθύνσεις Bitcoin στη λίστα συναλλαγών.</translation> </message> <message> <location line="+3"/> @@ -946,21 +945,21 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> - <translation type="unfinished"/> + <translation>Προειδοποίηση</translation> </message> <message> <location line="-9"/> <location line="+9"/> <source>This setting will take effect after restarting Bitcoin.</source> - <translation type="unfinished"/> + <translation>Αυτή η ρύθμιση θα ισχύσει μετά την επανεκκίνηση του Bitcoin.</translation> </message> <message> <location line="+29"/> <source>The supplied proxy address is invalid.</source> - <translation type="unfinished"/> + <translation>Δεν είναι έγκυρη η διεύθυνση διαμεσολαβητή</translation> </message> </context> <context> @@ -994,7 +993,7 @@ Address: %4 <message> <location line="-78"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>Πορτοφόλι</translation> </message> <message> <location line="+124"/> @@ -1068,7 +1067,7 @@ Address: %4 <message> <location filename="../qrcodedialog.cpp" line="+62"/> <source>Error encoding URI into QR Code.</source> - <translation type="unfinished"/> + <translation>Σφάλμα κατά την κωδικοποίηση του URI σε κώδικα QR</translation> </message> <message> <location line="+40"/> @@ -1083,7 +1082,7 @@ Address: %4 <message> <location line="+25"/> <source>Save QR Code</source> - <translation type="unfinished"/> + <translation>Αποθήκευση κώδικα QR</translation> </message> <message> <location line="+0"/> @@ -1108,7 +1107,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1135,12 +1134,12 @@ Address: %4 <message> <location line="+29"/> <source>Network</source> - <translation type="unfinished"/> + <translation>Δίκτυο</translation> </message> <message> <location line="+7"/> <source>Number of connections</source> - <translation type="unfinished"/> + <translation>Αριθμός συνδέσεων</translation> </message> <message> <location line="+23"/> @@ -1155,17 +1154,17 @@ Address: %4 <message> <location line="+7"/> <source>Current number of blocks</source> - <translation type="unfinished"/> + <translation>Τρέχον αριθμός μπλοκ</translation> </message> <message> <location line="+23"/> <source>Estimated total blocks</source> - <translation type="unfinished"/> + <translation>Κατ' εκτίμηση συνολικά μπλοκς</translation> </message> <message> <location line="+23"/> <source>Last block time</source> - <translation type="unfinished"/> + <translation>Χρόνος τελευταίου μπλοκ</translation> </message> <message> <location line="+52"/> @@ -1175,7 +1174,7 @@ Address: %4 <message> <location line="+16"/> <source>Command-line options</source> - <translation type="unfinished"/> + <translation>επιλογής γραμμής εντολών</translation> </message> <message> <location line="+7"/> @@ -1220,7 +1219,7 @@ Address: %4 <message> <location line="+102"/> <source>Clear console</source> - <translation type="unfinished"/> + <translation>Καθαρισμός κονσόλας</translation> </message> <message> <location filename="../rpcconsole.cpp" line="-33"/> @@ -1242,7 +1241,7 @@ Address: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1325,7 +1324,7 @@ Address: %4 <message> <location line="+5"/> <source>The amount exceeds your balance.</source> - <translation type="unfinished"/> + <translation>Το ποσό ξεπερνάει το διαθέσιμο υπόλοιπο</translation> </message> <message> <location line="+5"/> @@ -1340,12 +1339,12 @@ Address: %4 <message> <location line="+5"/> <source>Error: Transaction creation failed.</source> - <translation type="unfinished"/> + <translation>Σφάλμα: Η δημιουργία της συναλλαγής απέτυχε</translation> </message> <message> <location line="+5"/> <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>Σφάλμα: Η συναλλαγή απερρίφθη. Αυτό ενδέχεται να συμβαίνει αν κάποια από τα νομίσματα έχουν ήδη ξοδευθεί, όπως αν χρησιμοποιήσατε αντίγραφο του wallet.dat και τα νομίσματα ξοδεύθηκαν εκεί.</translation> </message> </context> <context> @@ -1434,19 +1433,19 @@ Address: %4 <message> <location line="+18"/> <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Εισάγετε μια διεύθυνση Bitcoin (π.χ. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+10"/> <location line="+203"/> <source>Choose an address from the address book</source> - <translation type="unfinished"/> + <translation>Επιλογή διεύθυνσης από το βιβλίο διευθύνσεων</translation> </message> <message> <location line="-193"/> <location line="+203"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location line="-193"/> @@ -1456,7 +1455,7 @@ Address: %4 <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location line="+12"/> @@ -1471,7 +1470,7 @@ Address: %4 <message> <location line="+21"/> <source>Sign the message to prove you own this Bitcoin address</source> - <translation type="unfinished"/> + <translation>Υπογράψτε ένα μήνυμα για ν' αποδείξετε πως σας ανήκει μια συγκεκριμένη διεύθυνση Bitcoin</translation> </message> <message> <location line="+17"/> @@ -1498,7 +1497,7 @@ Address: %4 <message> <location line="+21"/> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Εισάγετε μια διεύθυνση Bitcoin (π.χ. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+40"/> @@ -1667,7 +1666,7 @@ Address: %4 <message> <location line="-2"/> <source>label</source> - <translation type="unfinished"/> + <translation>eπιγραφή</translation> </message> <message> <location line="+37"/> @@ -1994,7 +1993,7 @@ Address: %4 <message> <location line="+1"/> <source>Show transaction details</source> - <translation type="unfinished"/> + <translation>Εμφάνιση λεπτομερειών συναλλαγής</translation> </message> <message> <location line="+142"/> @@ -2078,7 +2077,7 @@ Address: %4 <translation>Έκδοση Bitcoin</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Χρήση:</translation> </message> @@ -2093,12 +2092,12 @@ Address: %4 <translation>Λίστα εντολών</translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Επεξήγηση εντολής</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Επιλογές:</translation> </message> @@ -2113,7 +2112,7 @@ Address: %4 <translation>Ορίστε αρχείο pid (προεπιλογή: bitcoind.pid)</translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Δημιουργία νομισμάτων</translation> </message> @@ -2123,7 +2122,7 @@ Address: %4 <translation>Άρνηση δημιουργίας νομισμάτων</translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Ορισμός φακέλου δεδομένων</translation> </message> @@ -2138,12 +2137,7 @@ Address: %4 <translation>Όρισε το μέγεθος της βάσης ιστορικού σε megabytes (προεπιλογή:100)</translation> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Ορισμός λήξης χρονικού ορίου (σε χιλιοστά του δευτερολέπτου)</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Εισερχόμενες συνδέσεις στη θύρα <port> (προεπιλογή: 8333 ή στο testnet: 18333)</translation> </message> @@ -2153,34 +2147,34 @@ Address: %4 <translation>Μέγιστες αριθμός συνδέσεων με τους peers <n> (προεπιλογή: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Όριο αποσύνδεσης προβληματικών peers (προεπιλογή: 100)</translation> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Δευτερόλεπτα πριν επιτραπεί ξανά η σύνδεση των προβληματικών peers (προεπιλογή: 86400)</translation> </message> <message> <location line="-12"/> <source>Detach block and address databases. Increases shutdown time (default: 0)</source> - <translation type="unfinished"/> + <translation>Αποσύνδεση των βάσεων δεδομένων μπλοκ και διευθύνσεων. Αυξάνει το χρόνο κλεισίματος (προεπιλογή: 0)</translation> </message> <message> <location line="+34"/> @@ -2188,7 +2182,7 @@ Address: %4 <translation>Αποδοχή εντολών κονσόλας και JSON-RPC</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation>Εκτέλεση στο παρασκήνιο κι αποδοχή εντολών</translation> </message> @@ -2198,7 +2192,7 @@ Address: %4 <translation>Χρήση του δοκιμαστικού δικτύου</translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -2235,7 +2229,7 @@ Address: %4 <message> <location line="+6"/> <source>Connect only to the specified node(s)</source> - <translation type="unfinished"/> + <translation>Σύνδεση μόνο με ορισμένους κόμβους</translation> </message> <message> <location line="+3"/> @@ -2253,7 +2247,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation type="unfinished"/> </message> @@ -2323,7 +2322,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>Ορισμός λήξης χρονικού ορίου σε χιλιοστά του δευτερολέπτου(προεπιλογή:5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2363,22 +2367,22 @@ Address: %4 <translation>Εισερχόμενες συνδέσεις JSON-RPC στη θύρα <port> (προεπιλογή: 8332)</translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Αποδοχή συνδέσεων JSON-RPC από συγκεκριμένη διεύθυνση IP</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Αποστολή εντολών στον κόμβο <ip> (προεπιλογή: 127.0.0.1)</translation> </message> <message> - <location line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Εκτέλεσε την εντολή όταν το καλύτερο μπλοκ αλλάξει(%s στην εντολή αντικαθίσταται από το hash του μπλοκ)</translation> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>Αναβάθμισε το πορτοφόλι στην τελευταία έκδοση</translation> </message> @@ -2393,7 +2397,7 @@ Address: %4 <translation>Επανέλεγχος της αλυσίδας μπλοκ για απούσες συναλλαγές</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation>Πόσα μπλοκ να ελέγχω κατά την εκκίνηση (προεπιλογή:2500,0=όλα)</translation> </message> @@ -2403,9 +2407,9 @@ Address: %4 <translation>Πόσο εξονυχιστική να είναι η επιβεβαίωση του μπλοκ(0-6, προεπιλογή:1)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> - <translation type="unfinished"/> + <translation>Εισαγωγή μπλοκ από εξωτερικό αρχείο blk000?.dat</translation> </message> <message> <location line="+52"/> @@ -2423,17 +2427,17 @@ Address: %4 <translation>Προσωπικό κλειδί του διακομιστή (προεπιλογή: server.pem)</translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Αυτό το κείμενο βοήθειας</translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation>Αδυναμία κλειδώματος του φακέλου δεδομένων %s. Πιθανώς το Bitcoin να είναι ήδη ενεργό.</translation> </message> @@ -2443,14 +2447,14 @@ Address: %4 <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> - <translation type="unfinished"/> + <translation>Σύνδεση μέσω διαμεσολαβητή socks</translation> </message> <message> <location line="-13"/> @@ -2458,12 +2462,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Φόρτωση διευθύνσεων...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>Σφάλμα φόρτωσης blkindex.dat</translation> </message> @@ -2478,19 +2482,19 @@ Address: %4 <translation>Σφάλμα φόρτωσης wallet.dat: Το Πορτοφόλι απαιτεί μια νεότερη έκδοση του Bitcoin</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Απαιτείται η επανεγγραφή του Πορτοφολιού, η οποία θα ολοκληρωθεί στην επανεκκίνηση του Bitcoin</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>Σφάλμα φόρτωσης αρχείου wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> - <translation type="unfinished"/> + <translation>Δεν είναι έγκυρη η διεύθυνση διαμεσολαβητή: '%s'</translation> </message> <message> <location line="+47"/> @@ -2503,7 +2507,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2513,12 +2517,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"/> </message> @@ -2538,18 +2542,18 @@ Address: %4 <translation>Σφάλμα: Η δημιουργία της συναλλαγής απέτυχε</translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Αποστολή...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation>Λάθος ποσότητα</translation> </message> @@ -2564,7 +2568,7 @@ Address: %4 <translation>Φόρτωση ευρετηρίου μπλοκ...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Προσέθεσε ένα κόμβο για σύνδεση και προσπάθησε να κρατήσεις την σύνδεση ανοιχτή</translation> </message> @@ -2584,12 +2588,12 @@ Address: %4 <translation>Αμοιβή ανά KB που θα προστίθεται στις συναλλαγές που στέλνεις</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Φόρτωση πορτοφολιού...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation>Δεν μπορώ να υποβαθμίσω το πορτοφόλι</translation> </message> @@ -2604,22 +2608,22 @@ Address: %4 <translation>Δεν μπορώ να γράψω την προεπιλεγμένη διεύθυνση</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Ανίχνευση...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Η φόρτωση ολοκληρώθηκε</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation>Χρήση της %s επιλογής</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 849ff47a52..f887632517 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -1,29 +1,36 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="en"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="en" version="2.0"> <defaultcodec>UTF-8</defaultcodec> <context> <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> <source>About Bitcoin</source> - <translation type="unfinished"></translation> + <translation>About Bitcoin</translation> </message> <message> <location line="+39"/> <source><b>Bitcoin</b> version</source> - <translation type="unfinished"></translation> + <translation><b>Bitcoin</b> version</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation>Copyright © 2009-2012 The Bitcoin developers</translation> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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 type="unfinished"></translation> + <translation> +This is experimental software. + +Distributed under the MIT/X11 software license, see the accompanying file COPYING 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.</translation> </message> </context> <context> @@ -31,102 +38,102 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../forms/addressbookpage.ui" line="+14"/> <source>Address Book</source> - <translation type="unfinished"></translation> + <translation>Address Book</translation> </message> <message> <location line="+22"/> <source>Double-click to edit address or label</source> - <translation type="unfinished"></translation> + <translation>Double-click to edit address or label</translation> </message> <message> <location line="+27"/> <source>Create a new address</source> - <translation type="unfinished"></translation> + <translation>Create a new address</translation> </message> <message> <location line="+14"/> <source>Copy the currently selected address to the system clipboard</source> - <translation type="unfinished"></translation> + <translation>Copy the currently selected address to the system clipboard</translation> </message> <message> <location line="-11"/> <source>&New Address</source> - <translation type="unfinished"></translation> + <translation>&New Address</translation> </message> <message> <location line="-46"/> <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> - <translation type="unfinished"></translation> + <translation>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</translation> </message> <message> <location line="+60"/> <source>&Copy Address</source> - <translation type="unfinished"></translation> + <translation>&Copy Address</translation> </message> <message> <location line="+11"/> <source>Show &QR Code</source> - <translation type="unfinished"></translation> + <translation>Show &QR Code</translation> </message> <message> <location line="+11"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"></translation> + <translation>Sign a message to prove you own a Bitcoin address</translation> </message> <message> <location line="+3"/> <source>&Sign Message</source> - <translation type="unfinished"></translation> + <translation>&Sign Message</translation> </message> <message> <location line="+11"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> - <translation type="unfinished"></translation> + <translation>Verify a message to ensure it was signed with a specified Bitcoin address</translation> </message> <message> <location line="+3"/> <source>&Verify Message</source> - <translation type="unfinished"></translation> + <translation>&Verify Message</translation> </message> <message> <location line="+11"/> <source>Delete the currently selected address from the list. Only sending addresses can be deleted.</source> - <translation type="unfinished"></translation> + <translation>Delete the currently selected address from the list. Only sending addresses can be deleted.</translation> </message> <message> <location line="+3"/> <source>&Delete</source> - <translation type="unfinished"></translation> + <translation>&Delete</translation> </message> <message> <location filename="../addressbookpage.cpp" line="+65"/> <source>Copy &Label</source> - <translation type="unfinished"></translation> + <translation>Copy &Label</translation> </message> <message> <location line="+2"/> <source>&Edit</source> - <translation type="unfinished"></translation> + <translation>&Edit</translation> </message> <message> <location line="+250"/> <source>Export Address Book Data</source> - <translation type="unfinished"></translation> + <translation>Export Address Book Data</translation> </message> <message> <location line="+1"/> <source>Comma separated file (*.csv)</source> - <translation type="unfinished"></translation> + <translation>Comma separated file (*.csv)</translation> </message> <message> <location line="+13"/> <source>Error exporting</source> - <translation type="unfinished"></translation> + <translation>Error exporting</translation> </message> <message> <location line="+0"/> <source>Could not write to file %1.</source> - <translation type="unfinished"></translation> + <translation>Could not write to file %1.</translation> </message> </context> <context> @@ -134,17 +141,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../addresstablemodel.cpp" line="+142"/> <source>Label</source> - <translation type="unfinished"></translation> + <translation>Label</translation> </message> <message> <location line="+0"/> <source>Address</source> - <translation type="unfinished"></translation> + <translation>Address</translation> </message> <message> <location line="+36"/> <source>(no label)</source> - <translation type="unfinished"></translation> + <translation>(no label)</translation> </message> </context> <context> @@ -152,94 +159,94 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../forms/askpassphrasedialog.ui" line="+26"/> <source>Passphrase Dialog</source> - <translation type="unfinished"></translation> + <translation>Passphrase Dialog</translation> </message> <message> <location line="+21"/> <source>Enter passphrase</source> - <translation type="unfinished"></translation> + <translation>Enter passphrase</translation> </message> <message> <location line="+14"/> <source>New passphrase</source> - <translation type="unfinished"></translation> + <translation>New passphrase</translation> </message> <message> <location line="+14"/> <source>Repeat new passphrase</source> - <translation type="unfinished"></translation> + <translation>Repeat new passphrase</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="+33"/> <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 type="unfinished"></translation> + <translation>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>.</translation> </message> <message> <location line="+1"/> <source>Encrypt wallet</source> - <translation type="unfinished"></translation> + <translation>Encrypt wallet</translation> </message> <message> <location line="+3"/> <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation type="unfinished"></translation> + <translation>This operation needs your wallet passphrase to unlock the wallet.</translation> </message> <message> <location line="+5"/> <source>Unlock wallet</source> - <translation type="unfinished"></translation> + <translation>Unlock wallet</translation> </message> <message> <location line="+3"/> <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation type="unfinished"></translation> + <translation>This operation needs your wallet passphrase to decrypt the wallet.</translation> </message> <message> <location line="+5"/> <source>Decrypt wallet</source> - <translation type="unfinished"></translation> + <translation>Decrypt wallet</translation> </message> <message> <location line="+3"/> <source>Change passphrase</source> - <translation type="unfinished"></translation> + <translation>Change passphrase</translation> </message> <message> <location line="+1"/> <source>Enter the old and new passphrase to the wallet.</source> - <translation type="unfinished"></translation> + <translation>Enter the old and new passphrase to the wallet.</translation> </message> <message> <location line="+46"/> <source>Confirm wallet encryption</source> - <translation type="unfinished"></translation> + <translation>Confirm wallet encryption</translation> </message> <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"></translation> + <translation>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"></translation> + <translation>Are you sure you wish to encrypt your wallet?</translation> </message> <message> <location line="+106"/> <location line="+24"/> <source>Warning: The Caps Lock key is on!</source> - <translation type="unfinished"></translation> + <translation>Warning: The Caps Lock key is on!</translation> </message> <message> <location line="-121"/> <location line="+49"/> <source>Wallet encrypted</source> - <translation type="unfinished"></translation> + <translation>Wallet encrypted</translation> </message> <message> <location line="-48"/> <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 type="unfinished"></translation> + <translation>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.</translation> </message> <message> <location line="+5"/> @@ -247,363 +254,340 @@ This product includes software developed by the OpenSSL Project for use in the O <location line="+42"/> <location line="+6"/> <source>Wallet encryption failed</source> - <translation type="unfinished"></translation> + <translation>Wallet encryption failed</translation> </message> <message> <location line="-54"/> <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation type="unfinished"></translation> + <translation>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</translation> </message> <message> <location line="+7"/> <location line="+48"/> <source>The supplied passphrases do not match.</source> - <translation type="unfinished"></translation> + <translation>The supplied passphrases do not match.</translation> </message> <message> <location line="-37"/> <source>Wallet unlock failed</source> - <translation type="unfinished"></translation> + <translation>Wallet unlock failed</translation> </message> <message> <location line="+1"/> <location line="+11"/> <location line="+19"/> <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation type="unfinished"></translation> + <translation>The passphrase entered for the wallet decryption was incorrect.</translation> </message> <message> <location line="-20"/> <source>Wallet decryption failed</source> - <translation type="unfinished"></translation> + <translation>Wallet decryption failed</translation> </message> <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"></translation> + <translation>Wallet passphrase was successfully changed.</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation type="unfinished"></translation> + <translation>Sign &message...</translation> </message> <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> - <translation type="unfinished"></translation> + <translation>Synchronizing with network...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> - <translation type="unfinished"></translation> + <translation>&Overview</translation> </message> <message> <location line="+1"/> <source>Show general overview of wallet</source> - <translation type="unfinished"></translation> + <translation>Show general overview of wallet</translation> </message> <message> <location line="+5"/> <source>&Transactions</source> - <translation type="unfinished"></translation> + <translation>&Transactions</translation> </message> <message> <location line="+1"/> <source>Browse transaction history</source> - <translation type="unfinished"></translation> + <translation>Browse transaction history</translation> </message> <message> <location line="+5"/> <source>&Address Book</source> - <translation type="unfinished"></translation> + <translation>&Address Book</translation> </message> <message> <location line="+1"/> <source>Edit the list of stored addresses and labels</source> - <translation type="unfinished"></translation> + <translation>Edit the list of stored addresses and labels</translation> </message> <message> <location line="+5"/> <source>&Receive coins</source> - <translation type="unfinished"></translation> + <translation>&Receive coins</translation> </message> <message> <location line="+1"/> <source>Show the list of addresses for receiving payments</source> - <translation type="unfinished"></translation> + <translation>Show the list of addresses for receiving payments</translation> </message> <message> <location line="+5"/> <source>&Send coins</source> - <translation type="unfinished"></translation> + <translation>&Send coins</translation> </message> <message> <location line="+41"/> <source>E&xit</source> - <translation type="unfinished"></translation> + <translation>E&xit</translation> </message> <message> <location line="+1"/> <source>Quit application</source> - <translation type="unfinished"></translation> + <translation>Quit application</translation> </message> <message> <location line="+4"/> <source>Show information about Bitcoin</source> - <translation type="unfinished"></translation> + <translation>Show information about Bitcoin</translation> </message> <message> <location line="+2"/> <source>About &Qt</source> - <translation type="unfinished"></translation> + <translation>About &Qt</translation> </message> <message> <location line="+1"/> <source>Show information about Qt</source> - <translation type="unfinished"></translation> + <translation>Show information about Qt</translation> </message> <message> <location line="+2"/> <source>&Options...</source> - <translation type="unfinished"></translation> + <translation>&Options...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> - <translation type="unfinished"></translation> + <translation>&Encrypt Wallet...</translation> </message> <message> <location line="+3"/> <source>&Backup Wallet...</source> - <translation type="unfinished"></translation> + <translation>&Backup Wallet...</translation> </message> <message> <location line="+2"/> <source>&Change Passphrase...</source> - <translation type="unfinished"></translation> + <translation>&Change Passphrase...</translation> </message> <message numerus="yes"> <location line="+241"/> <source>~%n block(s) remaining</source> - <translation> - <numerusform>~%n block remaining</numerusform> - <numerusform>~%n blocks remaining</numerusform> - </translation> + <translation><numerusform>~%n block remaining</numerusform><numerusform>~%n blocks remaining</numerusform></translation> </message> <message> <location line="+6"/> <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> - <translation type="unfinished"></translation> + <translation>Downloaded %1 of %2 blocks of transaction history (%3% done).</translation> </message> <message> <location line="-254"/> <source>&Export...</source> - <translation type="unfinished"></translation> + <translation>&Export...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> - <translation type="unfinished"></translation> + <translation>Send coins to a Bitcoin address</translation> </message> <message> <location line="+6"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"></translation> + <translation>Sign a message to prove you own a Bitcoin address</translation> </message> <message> <location line="+4"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> - <translation type="unfinished"></translation> + <translation>Verify a message to ensure it was signed with a specified Bitcoin address</translation> </message> <message> <location line="+4"/> <source>S&ignatures</source> - <translation type="unfinished"></translation> + <translation>S&ignatures</translation> </message> <message> <location line="+37"/> <source>Modify configuration options for Bitcoin</source> - <translation type="unfinished"></translation> + <translation>Modify configuration options for Bitcoin</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> - <translation type="unfinished"></translation> + <translation>Export the data in the current tab to a file</translation> </message> <message> <location line="+2"/> <source>Encrypt or decrypt wallet</source> - <translation type="unfinished"></translation> + <translation>Encrypt or decrypt wallet</translation> </message> <message> <location line="+3"/> <source>Backup wallet to another location</source> - <translation type="unfinished"></translation> + <translation>Backup wallet to another location</translation> </message> <message> <location line="+2"/> <source>Change the passphrase used for wallet encryption</source> - <translation type="unfinished"></translation> + <translation>Change the passphrase used for wallet encryption</translation> </message> <message> <location line="+1"/> <source>&Debug window</source> - <translation type="unfinished"></translation> + <translation>&Debug window</translation> </message> <message> <location line="+1"/> <source>Open debugging and diagnostic console</source> - <translation type="unfinished"></translation> + <translation>Open debugging and diagnostic console</translation> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> - <translation type="unfinished"></translation> + <translation>&Verify message...</translation> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> - <translation type="unfinished"></translation> + <translation>Bitcoin</translation> </message> <message> <location line="+0"/> <source>Wallet</source> - <translation type="unfinished"></translation> + <translation>Wallet</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> - <translation type="unfinished"></translation> + <translation>&About Bitcoin</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>&Show / Hide</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> - <translation type="unfinished"></translation> + <translation>&File</translation> </message> <message> <location line="+10"/> <source>&Settings</source> - <translation type="unfinished"></translation> + <translation>&Settings</translation> </message> <message> <location line="+6"/> <source>&Help</source> - <translation type="unfinished"></translation> + <translation>&Help</translation> </message> <message> <location line="+9"/> <source>Tabs toolbar</source> - <translation type="unfinished"></translation> + <translation>Tabs toolbar</translation> </message> <message> <location line="+11"/> <source>Actions toolbar</source> - <translation type="unfinished"></translation> + <translation>Actions toolbar</translation> </message> <message> <location line="+13"/> <location line="+9"/> <source>[testnet]</source> - <translation type="unfinished"></translation> + <translation>[testnet]</translation> </message> <message> <location line="+0"/> <location line="+60"/> <source>Bitcoin client</source> - <translation type="unfinished"></translation> + <translation>Bitcoin client</translation> </message> <message numerus="yes"> <location line="+71"/> <source>%n active connection(s) to Bitcoin network</source> - <translation> - <numerusform>%n active connection to Bitcoin network</numerusform> - <numerusform>%n active connections to Bitcoin network</numerusform> - </translation> + <translation><numerusform>%n active connection to Bitcoin network</numerusform><numerusform>%n active connections to Bitcoin network</numerusform></translation> </message> <message> <location line="+40"/> <source>Downloaded %1 blocks of transaction history.</source> - <translation type="unfinished"></translation> + <translation>Downloaded %1 blocks of transaction history.</translation> </message> <message numerus="yes"> <location line="+22"/> <source>%n second(s) ago</source> - <translation> - <numerusform>%n second ago</numerusform> - <numerusform>%n seconds ago</numerusform> - </translation> + <translation><numerusform>%n second ago</numerusform><numerusform>%n seconds ago</numerusform></translation> </message> <message numerus="yes"> <location line="+4"/> <source>%n minute(s) ago</source> - <translation> - <numerusform>%n minute ago</numerusform> - <numerusform>%n minutes ago</numerusform> - </translation> + <translation><numerusform>%n minute ago</numerusform><numerusform>%n minutes ago</numerusform></translation> </message> <message numerus="yes"> <location line="+4"/> <source>%n hour(s) ago</source> - <translation> - <numerusform>%n hour ago</numerusform> - <numerusform>%n hours ago</numerusform> - </translation> + <translation><numerusform>%n hour ago</numerusform><numerusform>%n hours ago</numerusform></translation> </message> <message numerus="yes"> <location line="+4"/> <source>%n day(s) ago</source> - <translation> - <numerusform>%n day ago</numerusform> - <numerusform>%n days ago</numerusform> - </translation> + <translation><numerusform>%n day ago</numerusform><numerusform>%n days ago</numerusform></translation> </message> <message> <location line="+6"/> <source>Up to date</source> - <translation type="unfinished"></translation> + <translation>Up to date</translation> </message> <message> <location line="+7"/> <source>Catching up...</source> - <translation type="unfinished"></translation> + <translation>Catching up...</translation> </message> <message> <location line="+10"/> <source>Last received block was generated %1.</source> - <translation type="unfinished"></translation> + <translation>Last received block was generated %1.</translation> </message> <message> <location line="+59"/> <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> + <translation>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?</translation> </message> <message> <location line="+5"/> <source>Confirm transaction fee</source> - <translation type="unfinished"></translation> + <translation>Confirm transaction fee</translation> </message> <message> <location line="+27"/> <source>Sent transaction</source> - <translation type="unfinished"></translation> + <translation>Sent transaction</translation> </message> <message> <location line="+1"/> <source>Incoming transaction</source> - <translation type="unfinished"></translation> + <translation>Incoming transaction</translation> </message> <message> <location line="+1"/> @@ -612,62 +596,66 @@ Amount: %2 Type: %3 Address: %4 </source> - <translation type="unfinished"></translation> + <translation>Date: %1 +Amount: %2 +Type: %3 +Address: %4 +</translation> </message> <message> <location line="+120"/> <location line="+15"/> <source>URI handling</source> - <translation type="unfinished"></translation> + <translation>URI handling</translation> </message> <message> <location line="-15"/> <location line="+15"/> <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation type="unfinished"></translation> + <translation>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</translation> </message> <message> <location line="+16"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation type="unfinished"></translation> + <translation>Wallet is <b>encrypted</b> and currently <b>unlocked</b></translation> </message> <message> <location line="+8"/> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation type="unfinished"></translation> + <translation>Wallet is <b>encrypted</b> and currently <b>locked</b></translation> </message> <message> <location line="+23"/> <source>Backup Wallet</source> - <translation type="unfinished"></translation> + <translation>Backup Wallet</translation> </message> <message> <location line="+0"/> <source>Wallet Data (*.dat)</source> - <translation type="unfinished"></translation> + <translation>Wallet Data (*.dat)</translation> </message> <message> <location line="+3"/> <source>Backup Failed</source> - <translation type="unfinished"></translation> + <translation>Backup Failed</translation> </message> <message> <location line="+0"/> <source>There was an error trying to save the wallet data to the new location.</source> - <translation type="unfinished"></translation> + <translation>There was an error trying to save the wallet data to the new location.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> - <translation type="unfinished"></translation> + <translation>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</translation> </message> </context> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> - <translation type="unfinished"></translation> + <translation>Network Alert</translation> </message> </context> <context> @@ -675,111 +663,111 @@ Address: %4 <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> <source>Edit Address</source> - <translation type="unfinished"></translation> + <translation>Edit Address</translation> </message> <message> <location line="+11"/> <source>&Label</source> - <translation type="unfinished"></translation> + <translation>&Label</translation> </message> <message> <location line="+10"/> <source>The label associated with this address book entry</source> - <translation type="unfinished"></translation> + <translation>The label associated with this address book entry</translation> </message> <message> <location line="+7"/> <source>&Address</source> - <translation type="unfinished"></translation> + <translation>&Address</translation> </message> <message> <location line="+10"/> <source>The address associated with this address book entry. This can only be modified for sending addresses.</source> - <translation type="unfinished"></translation> + <translation>The address associated with this address book entry. This can only be modified for sending addresses.</translation> </message> <message> <location filename="../editaddressdialog.cpp" line="+20"/> <source>New receiving address</source> - <translation type="unfinished"></translation> + <translation>New receiving address</translation> </message> <message> <location line="+4"/> <source>New sending address</source> - <translation type="unfinished"></translation> + <translation>New sending address</translation> </message> <message> <location line="+3"/> <source>Edit receiving address</source> - <translation type="unfinished"></translation> + <translation>Edit receiving address</translation> </message> <message> <location line="+4"/> <source>Edit sending address</source> - <translation type="unfinished"></translation> + <translation>Edit sending address</translation> </message> <message> <location line="+60"/> <source>The entered address "%1" is already in the address book.</source> - <translation type="unfinished"></translation> + <translation>The entered address "%1" is already in the address book.</translation> </message> <message> <location line="+5"/> <source>The entered address "%1" is not a valid Bitcoin address.</source> - <translation type="unfinished"></translation> + <translation>The entered address "%1" is not a valid Bitcoin address.</translation> </message> <message> <location line="+5"/> <source>Could not unlock wallet.</source> - <translation type="unfinished"></translation> + <translation>Could not unlock wallet.</translation> </message> <message> <location line="+5"/> <source>New key generation failed.</source> - <translation type="unfinished"></translation> + <translation>New key generation failed.</translation> </message> </context> <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> - <translation type="unfinished"></translation> + <translation>Bitcoin-Qt</translation> </message> <message> <location line="-12"/> <source>version</source> - <translation type="unfinished"></translation> + <translation>version</translation> </message> <message> <location line="+2"/> <source>Usage:</source> - <translation type="unfinished"></translation> + <translation>Usage:</translation> </message> <message> <location line="+1"/> <source>command-line options</source> - <translation type="unfinished"></translation> + <translation>command-line options</translation> </message> <message> <location line="+4"/> <source>UI options</source> - <translation type="unfinished"></translation> + <translation>UI options</translation> </message> <message> <location line="+1"/> <source>Set language, for example "de_DE" (default: system locale)</source> - <translation type="unfinished"></translation> + <translation>Set language, for example "de_DE" (default: system locale)</translation> </message> <message> <location line="+1"/> <source>Start minimized</source> - <translation type="unfinished"></translation> + <translation>Start minimized</translation> </message> <message> <location line="+1"/> <source>Show splash screen on startup (default: 1)</source> - <translation type="unfinished"></translation> + <translation>Show splash screen on startup (default: 1)</translation> </message> </context> <context> @@ -787,194 +775,194 @@ Address: %4 <message> <location filename="../forms/optionsdialog.ui" line="+14"/> <source>Options</source> - <translation type="unfinished"></translation> + <translation>Options</translation> </message> <message> <location line="+16"/> <source>&Main</source> - <translation type="unfinished"></translation> + <translation>&Main</translation> </message> <message> <location line="+6"/> <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> + <translation>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</translation> </message> <message> <location line="+15"/> <source>Pay transaction &fee</source> - <translation type="unfinished"></translation> + <translation>Pay transaction &fee</translation> </message> <message> <location line="+31"/> <source>Automatically start Bitcoin after logging in to the system.</source> - <translation type="unfinished"></translation> + <translation>Automatically start Bitcoin after logging in to the system.</translation> </message> <message> <location line="+3"/> <source>&Start Bitcoin on system login</source> - <translation type="unfinished"></translation> + <translation>&Start Bitcoin on system login</translation> </message> <message> <location line="+7"/> <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> + <translation>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.</translation> </message> <message> <location line="+3"/> <source>&Detach databases at shutdown</source> - <translation type="unfinished"></translation> + <translation>&Detach databases at shutdown</translation> </message> <message> <location line="+21"/> <source>&Network</source> - <translation type="unfinished"></translation> + <translation>&Network</translation> </message> <message> <location line="+6"/> <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> + <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 line="+3"/> <source>Map port using &UPnP</source> - <translation type="unfinished"></translation> + <translation>Map port using &UPnP</translation> </message> <message> <location line="+7"/> <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source> - <translation type="unfinished"></translation> + <translation>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</translation> </message> <message> <location line="+3"/> <source>&Connect through SOCKS proxy:</source> - <translation type="unfinished"></translation> + <translation>&Connect through SOCKS proxy:</translation> </message> <message> <location line="+9"/> <source>Proxy &IP:</source> - <translation type="unfinished"></translation> + <translation>Proxy &IP:</translation> </message> <message> <location line="+19"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> - <translation type="unfinished"></translation> + <translation>IP address of the proxy (e.g. 127.0.0.1)</translation> </message> <message> <location line="+7"/> <source>&Port:</source> - <translation type="unfinished"></translation> + <translation>&Port:</translation> </message> <message> <location line="+19"/> <source>Port of the proxy (e.g. 9050)</source> - <translation type="unfinished"></translation> + <translation>Port of the proxy (e.g. 9050)</translation> </message> <message> <location line="+7"/> <source>SOCKS &Version:</source> - <translation type="unfinished"></translation> + <translation>SOCKS &Version:</translation> </message> <message> <location line="+13"/> <source>SOCKS version of the proxy (e.g. 5)</source> - <translation type="unfinished"></translation> + <translation>SOCKS version of the proxy (e.g. 5)</translation> </message> <message> <location line="+36"/> <source>&Window</source> - <translation type="unfinished"></translation> + <translation>&Window</translation> </message> <message> <location line="+6"/> <source>Show only a tray icon after minimizing the window.</source> - <translation type="unfinished"></translation> + <translation>Show only a tray icon after minimizing the window.</translation> </message> <message> <location line="+3"/> <source>&Minimize to the tray instead of the taskbar</source> - <translation type="unfinished"></translation> + <translation>&Minimize to the tray instead of the taskbar</translation> </message> <message> <location line="+7"/> <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> + <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 line="+3"/> <source>M&inimize on close</source> - <translation type="unfinished"></translation> + <translation>M&inimize on close</translation> </message> <message> <location line="+21"/> <source>&Display</source> - <translation type="unfinished"></translation> + <translation>&Display</translation> </message> <message> <location line="+8"/> <source>User Interface &language:</source> - <translation type="unfinished"></translation> + <translation>User Interface &language:</translation> </message> <message> <location line="+13"/> <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation type="unfinished"></translation> + <translation>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</translation> </message> <message> <location line="+11"/> <source>&Unit to show amounts in:</source> - <translation type="unfinished"></translation> + <translation>&Unit to show amounts in:</translation> </message> <message> <location line="+13"/> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation type="unfinished"></translation> + <translation>Choose the default subdivision unit to show in the interface and when sending coins.</translation> </message> <message> <location line="+9"/> <source>Whether to show Bitcoin addresses in the transaction list or not.</source> - <translation type="unfinished"></translation> + <translation>Whether to show Bitcoin addresses in the transaction list or not.</translation> </message> <message> <location line="+3"/> <source>&Display addresses in transaction list</source> - <translation type="unfinished"></translation> + <translation>&Display addresses in transaction list</translation> </message> <message> <location line="+71"/> <source>&OK</source> - <translation type="unfinished"></translation> + <translation>&OK</translation> </message> <message> <location line="+7"/> <source>&Cancel</source> - <translation type="unfinished"></translation> + <translation>&Cancel</translation> </message> <message> <location line="+10"/> <source>&Apply</source> - <translation type="unfinished"></translation> + <translation>&Apply</translation> </message> <message> <location filename="../optionsdialog.cpp" line="+55"/> <source>default</source> - <translation type="unfinished"></translation> + <translation>default</translation> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> - <translation type="unfinished"></translation> + <translation>Warning</translation> </message> <message> <location line="-9"/> <location line="+9"/> <source>This setting will take effect after restarting Bitcoin.</source> - <translation type="unfinished"></translation> + <translation>This setting will take effect after restarting Bitcoin.</translation> </message> <message> <location line="+29"/> <source>The supplied proxy address is invalid.</source> - <translation type="unfinished"></translation> + <translation>The supplied proxy address is invalid.</translation> </message> </context> <context> @@ -982,69 +970,69 @@ Address: %4 <message> <location filename="../forms/overviewpage.ui" line="+14"/> <source>Form</source> - <translation type="unfinished"></translation> + <translation>Form</translation> </message> <message> <location line="+33"/> <location line="+183"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> - <translation type="unfinished"></translation> + <translation>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</translation> </message> <message> <location line="-141"/> <source>Balance:</source> - <translation type="unfinished"></translation> + <translation>Balance:</translation> </message> <message> <location line="+58"/> <source>Number of transactions:</source> - <translation type="unfinished"></translation> + <translation>Number of transactions:</translation> </message> <message> <location line="-29"/> <source>Unconfirmed:</source> - <translation type="unfinished"></translation> + <translation>Unconfirmed:</translation> </message> <message> <location line="-78"/> <source>Wallet</source> - <translation type="unfinished"></translation> + <translation>Wallet</translation> </message> <message> <location line="+124"/> <source>Immature:</source> - <translation type="unfinished"></translation> + <translation>Immature:</translation> </message> <message> <location line="+13"/> <source>Mined balance that has not yet matured</source> - <translation type="unfinished"></translation> + <translation>Mined balance that has not yet matured</translation> </message> <message> <location line="+46"/> <source><b>Recent transactions</b></source> - <translation type="unfinished"></translation> + <translation><b>Recent transactions</b></translation> </message> <message> <location line="-118"/> <source>Your current balance</source> - <translation type="unfinished"></translation> + <translation>Your current balance</translation> </message> <message> <location line="+29"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> - <translation type="unfinished"></translation> + <translation>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</translation> </message> <message> <location line="+20"/> <source>Total number of transactions in wallet</source> - <translation type="unfinished"></translation> + <translation>Total number of transactions in wallet</translation> </message> <message> <location filename="../overviewpage.cpp" line="+112"/> <location line="+1"/> <source>out of sync</source> - <translation type="unfinished"></translation> + <translation>out of sync</translation> </message> </context> <context> @@ -1052,57 +1040,57 @@ Address: %4 <message> <location filename="../forms/qrcodedialog.ui" line="+14"/> <source>QR Code Dialog</source> - <translation type="unfinished"></translation> + <translation>QR Code Dialog</translation> </message> <message> <location line="+59"/> <source>Request Payment</source> - <translation type="unfinished"></translation> + <translation>Request Payment</translation> </message> <message> <location line="+56"/> <source>Amount:</source> - <translation type="unfinished"></translation> + <translation>Amount:</translation> </message> <message> <location line="-44"/> <source>Label:</source> - <translation type="unfinished"></translation> + <translation>Label:</translation> </message> <message> <location line="+19"/> <source>Message:</source> - <translation type="unfinished"></translation> + <translation>Message:</translation> </message> <message> <location line="+71"/> <source>&Save As...</source> - <translation type="unfinished"></translation> + <translation>&Save As...</translation> </message> <message> <location filename="../qrcodedialog.cpp" line="+62"/> <source>Error encoding URI into QR Code.</source> - <translation type="unfinished"></translation> + <translation>Error encoding URI into QR Code.</translation> </message> <message> <location line="+40"/> <source>The entered amount is invalid, please check.</source> - <translation type="unfinished"></translation> + <translation>The entered amount is invalid, please check.</translation> </message> <message> <location line="+23"/> <source>Resulting URI too long, try to reduce the text for label / message.</source> - <translation type="unfinished"></translation> + <translation>Resulting URI too long, try to reduce the text for label / message.</translation> </message> <message> <location line="+25"/> <source>Save QR Code</source> - <translation type="unfinished"></translation> + <translation>Save QR Code</translation> </message> <message> <location line="+0"/> <source>PNG Images (*.png)</source> - <translation type="unfinished"></translation> + <translation>PNG Images (*.png)</translation> </message> </context> <context> @@ -1110,7 +1098,7 @@ Address: %4 <message> <location filename="../forms/rpcconsole.ui" line="+46"/> <source>Client name</source> - <translation type="unfinished"></translation> + <translation>Client name</translation> </message> <message> <location line="+10"/> @@ -1122,141 +1110,141 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> - <translation type="unfinished"></translation> + <translation>N/A</translation> </message> <message> <location line="-217"/> <source>Client version</source> - <translation type="unfinished"></translation> + <translation>Client version</translation> </message> <message> <location line="-45"/> <source>&Information</source> - <translation type="unfinished"></translation> + <translation>&Information</translation> </message> <message> <location line="+68"/> <source>Using OpenSSL version</source> - <translation type="unfinished"></translation> + <translation>Using OpenSSL version</translation> </message> <message> <location line="+49"/> <source>Startup time</source> - <translation type="unfinished"></translation> + <translation>Startup time</translation> </message> <message> <location line="+29"/> <source>Network</source> - <translation type="unfinished"></translation> + <translation>Network</translation> </message> <message> <location line="+7"/> <source>Number of connections</source> - <translation type="unfinished"></translation> + <translation>Number of connections</translation> </message> <message> <location line="+23"/> <source>On testnet</source> - <translation type="unfinished"></translation> + <translation>On testnet</translation> </message> <message> <location line="+23"/> <source>Block chain</source> - <translation type="unfinished"></translation> + <translation>Block chain</translation> </message> <message> <location line="+7"/> <source>Current number of blocks</source> - <translation type="unfinished"></translation> + <translation>Current number of blocks</translation> </message> <message> <location line="+23"/> <source>Estimated total blocks</source> - <translation type="unfinished"></translation> + <translation>Estimated total blocks</translation> </message> <message> <location line="+23"/> <source>Last block time</source> - <translation type="unfinished"></translation> + <translation>Last block time</translation> </message> <message> <location line="+52"/> <source>&Open</source> - <translation type="unfinished"></translation> + <translation>&Open</translation> </message> <message> <location line="+16"/> <source>Command-line options</source> - <translation type="unfinished"></translation> + <translation>Command-line options</translation> </message> <message> <location line="+7"/> <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation type="unfinished"></translation> + <translation>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</translation> </message> <message> <location line="+3"/> <source>&Show</source> - <translation type="unfinished"></translation> + <translation>&Show</translation> </message> <message> <location line="+24"/> <source>&Console</source> - <translation type="unfinished"></translation> + <translation>&Console</translation> </message> <message> <location line="-260"/> <source>Build date</source> - <translation type="unfinished"></translation> + <translation>Build date</translation> </message> <message> <location line="-104"/> <source>Bitcoin - Debug window</source> - <translation type="unfinished"></translation> + <translation>Bitcoin - Debug window</translation> </message> <message> <location line="+25"/> <source>Bitcoin Core</source> - <translation type="unfinished"></translation> + <translation>Bitcoin Core</translation> </message> <message> <location line="+279"/> <source>Debug log file</source> - <translation type="unfinished"></translation> + <translation>Debug log file</translation> </message> <message> <location line="+7"/> <source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source> - <translation type="unfinished"></translation> + <translation>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</translation> </message> <message> <location line="+102"/> <source>Clear console</source> - <translation type="unfinished"></translation> + <translation>Clear console</translation> </message> <message> <location filename="../rpcconsole.cpp" line="-33"/> <source>Welcome to the Bitcoin RPC console.</source> - <translation type="unfinished"></translation> + <translation>Welcome to the Bitcoin RPC console.</translation> </message> <message> <location line="+1"/> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> - <translation type="unfinished"></translation> + <translation>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</translation> </message> <message> <location line="+1"/> <source>Type <b>help</b> for an overview of available commands.</source> - <translation type="unfinished"></translation> + <translation>Type <b>help</b> for an overview of available commands.</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="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1264,102 +1252,102 @@ Address: %4 <location line="+5"/> <location line="+5"/> <source>Send Coins</source> - <translation type="unfinished"></translation> + <translation>Send Coins</translation> </message> <message> <location line="+50"/> <source>Send to multiple recipients at once</source> - <translation type="unfinished"></translation> + <translation>Send to multiple recipients at once</translation> </message> <message> <location line="+3"/> <source>&Add Recipient</source> - <translation type="unfinished"></translation> + <translation>&Add Recipient</translation> </message> <message> <location line="+20"/> <source>Remove all transaction fields</source> - <translation type="unfinished"></translation> + <translation>Remove all transaction fields</translation> </message> <message> <location line="+3"/> <source>Clear &All</source> - <translation type="unfinished"></translation> + <translation>Clear &All</translation> </message> <message> <location line="+22"/> <source>Balance:</source> - <translation type="unfinished"></translation> + <translation>Balance:</translation> </message> <message> <location line="+10"/> <source>123.456 BTC</source> - <translation type="unfinished"></translation> + <translation>123.456 BTC</translation> </message> <message> <location line="+31"/> <source>Confirm the send action</source> - <translation type="unfinished"></translation> + <translation>Confirm the send action</translation> </message> <message> <location line="+3"/> <source>&Send</source> - <translation type="unfinished"></translation> + <translation>&Send</translation> </message> <message> <location filename="../sendcoinsdialog.cpp" line="-59"/> <source><b>%1</b> to %2 (%3)</source> - <translation type="unfinished"></translation> + <translation><b>%1</b> to %2 (%3)</translation> </message> <message> <location line="+5"/> <source>Confirm send coins</source> - <translation type="unfinished"></translation> + <translation>Confirm send coins</translation> </message> <message> <location line="+1"/> <source>Are you sure you want to send %1?</source> - <translation type="unfinished"></translation> + <translation>Are you sure you want to send %1?</translation> </message> <message> <location line="+0"/> <source> and </source> - <translation type="unfinished"></translation> + <translation> and </translation> </message> <message> <location line="+23"/> <source>The recipient address is not valid, please recheck.</source> - <translation type="unfinished"></translation> + <translation>The recipient address is not valid, please recheck.</translation> </message> <message> <location line="+5"/> <source>The amount to pay must be larger than 0.</source> - <translation type="unfinished"></translation> + <translation>The amount to pay must be larger than 0.</translation> </message> <message> <location line="+5"/> <source>The amount exceeds your balance.</source> - <translation type="unfinished"></translation> + <translation>The amount exceeds your balance.</translation> </message> <message> <location line="+5"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation type="unfinished"></translation> + <translation>The total exceeds your balance when the %1 transaction fee is included.</translation> </message> <message> <location line="+6"/> <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation type="unfinished"></translation> + <translation>Duplicate address found, can only send to each address once per send operation.</translation> </message> <message> <location line="+5"/> <source>Error: Transaction creation failed.</source> - <translation type="unfinished"></translation> + <translation>Error: Transaction creation failed.</translation> </message> <message> <location line="+5"/> <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> + <translation>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.</translation> </message> </context> <context> @@ -1367,63 +1355,63 @@ Address: %4 <message> <location filename="../forms/sendcoinsentry.ui" line="+14"/> <source>Form</source> - <translation type="unfinished"></translation> + <translation>Form</translation> </message> <message> <location line="+15"/> <source>A&mount:</source> - <translation type="unfinished"></translation> + <translation>A&mount:</translation> </message> <message> <location line="+13"/> <source>Pay &To:</source> - <translation type="unfinished"></translation> + <translation>Pay &To:</translation> </message> <message> <location line="+24"/> <location filename="../sendcoinsentry.cpp" line="+25"/> <source>Enter a label for this address to add it to your address book</source> - <translation type="unfinished"></translation> + <translation>Enter a label for this address to add it to your address book</translation> </message> <message> <location line="+9"/> <source>&Label:</source> - <translation type="unfinished"></translation> + <translation>&Label:</translation> </message> <message> <location line="+18"/> <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"></translation> + <translation>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+10"/> <source>Choose address from address book</source> - <translation type="unfinished"></translation> + <translation>Choose address from address book</translation> </message> <message> <location line="+10"/> <source>Alt+A</source> - <translation type="unfinished"></translation> + <translation>Alt+A</translation> </message> <message> <location line="+7"/> <source>Paste address from clipboard</source> - <translation type="unfinished"></translation> + <translation>Paste address from clipboard</translation> </message> <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"></translation> + <translation>Alt+P</translation> </message> <message> <location line="+7"/> <source>Remove this recipient</source> - <translation type="unfinished"></translation> + <translation>Remove this recipient</translation> </message> <message> <location filename="../sendcoinsentry.cpp" line="+1"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"></translation> + <translation>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> </context> <context> @@ -1431,119 +1419,119 @@ Address: %4 <message> <location filename="../forms/signverifymessagedialog.ui" line="+14"/> <source>Signatures - Sign / Verify a Message</source> - <translation type="unfinished"></translation> + <translation>Signatures - Sign / Verify a Message</translation> </message> <message> <location line="+13"/> <location line="+124"/> <source>&Sign Message</source> - <translation type="unfinished"></translation> + <translation>&Sign Message</translation> </message> <message> <location line="-118"/> <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 type="unfinished"></translation> + <translation>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.</translation> </message> <message> <location line="+18"/> <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"></translation> + <translation>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+10"/> <location line="+203"/> <source>Choose an address from the address book</source> - <translation type="unfinished"></translation> + <translation>Choose an address from the address book</translation> </message> <message> <location line="-193"/> <location line="+203"/> <source>Alt+A</source> - <translation type="unfinished"></translation> + <translation>Alt+A</translation> </message> <message> <location line="-193"/> <source>Paste address from clipboard</source> - <translation type="unfinished"></translation> + <translation>Paste address from clipboard</translation> </message> <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"></translation> + <translation>Alt+P</translation> </message> <message> <location line="+12"/> <source>Enter the message you want to sign here</source> - <translation type="unfinished"></translation> + <translation>Enter the message you want to sign here</translation> </message> <message> <location line="+24"/> <source>Copy the current signature to the system clipboard</source> - <translation type="unfinished"></translation> + <translation>Copy the current signature to the system clipboard</translation> </message> <message> <location line="+21"/> <source>Sign the message to prove you own this Bitcoin address</source> - <translation type="unfinished"></translation> + <translation>Sign the message to prove you own this Bitcoin address</translation> </message> <message> <location line="+17"/> <source>Reset all sign message fields</source> - <translation type="unfinished"></translation> + <translation>Reset all sign message fields</translation> </message> <message> <location line="+3"/> <location line="+146"/> <source>Clear &All</source> - <translation type="unfinished"></translation> + <translation>Clear &All</translation> </message> <message> <location line="-87"/> <location line="+70"/> <source>&Verify Message</source> - <translation type="unfinished"></translation> + <translation>&Verify Message</translation> </message> <message> <location line="-64"/> <source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source> - <translation type="unfinished"></translation> + <translation>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</translation> </message> <message> <location line="+21"/> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"></translation> + <translation>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+40"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> - <translation type="unfinished"></translation> + <translation>Verify the message to ensure it was signed with the specified Bitcoin address</translation> </message> <message> <location line="+17"/> <source>Reset all verify message fields</source> - <translation type="unfinished"></translation> + <translation>Reset all verify message fields</translation> </message> <message> <location filename="../signverifymessagedialog.cpp" line="+27"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"></translation> + <translation>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="-2"/> <source>Click "Sign Message" to generate signature</source> - <translation type="unfinished"></translation> + <translation>Click "Sign Message" to generate signature</translation> </message> <message> <location line="+3"/> <source>Enter Bitcoin signature</source> - <translation type="unfinished"></translation> + <translation>Enter Bitcoin signature</translation> </message> <message> <location line="+82"/> <location line="+81"/> <source>The entered address is invalid.</source> - <translation type="unfinished"></translation> + <translation>The entered address is invalid.</translation> </message> <message> <location line="-81"/> @@ -1551,59 +1539,59 @@ Address: %4 <location line="+73"/> <location line="+8"/> <source>Please check the address and try again.</source> - <translation type="unfinished"></translation> + <translation>Please check the address and try again.</translation> </message> <message> <location line="-81"/> <location line="+81"/> <source>The entered address does not refer to a key.</source> - <translation type="unfinished"></translation> + <translation>The entered address does not refer to a key.</translation> </message> <message> <location line="-73"/> <source>Wallet unlock was cancelled.</source> - <translation type="unfinished"></translation> + <translation>Wallet unlock was cancelled.</translation> </message> <message> <location line="+8"/> <source>Private key for the entered address is not available.</source> - <translation type="unfinished"></translation> + <translation>Private key for the entered address is not available.</translation> </message> <message> <location line="+12"/> <source>Message signing failed.</source> - <translation type="unfinished"></translation> + <translation>Message signing failed.</translation> </message> <message> <location line="+5"/> <source>Message signed.</source> - <translation type="unfinished"></translation> + <translation>Message signed.</translation> </message> <message> <location line="+59"/> <source>The signature could not be decoded.</source> - <translation type="unfinished"></translation> + <translation>The signature could not be decoded.</translation> </message> <message> <location line="+0"/> <location line="+13"/> <source>Please check the signature and try again.</source> - <translation type="unfinished"></translation> + <translation>Please check the signature and try again.</translation> </message> <message> <location line="+0"/> <source>The signature did not match the message digest.</source> - <translation type="unfinished"></translation> + <translation>The signature did not match the message digest.</translation> </message> <message> <location line="+7"/> <source>Message verification failed.</source> - <translation type="unfinished"></translation> + <translation>Message verification failed.</translation> </message> <message> <location line="+5"/> <source>Message verified.</source> - <translation type="unfinished"></translation> + <translation>Message verified.</translation> </message> </context> <context> @@ -1611,82 +1599,76 @@ Address: %4 <message> <location filename="../transactiondesc.cpp" line="+19"/> <source>Open until %1</source> - <translation type="unfinished"></translation> + <translation>Open until %1</translation> </message> <message numerus="yes"> <location line="-2"/> <source>Open for %n block(s)</source> - <translation type="unfinished"> - <numerusform>Open for %n block</numerusform> - <numerusform>Open for %n blocks</numerusform> - </translation> + <translation><numerusform>Open for %n block</numerusform><numerusform>Open for %n blocks</numerusform></translation> </message> <message> <location line="+8"/> <source>%1/offline</source> - <translation type="unfinished"></translation> + <translation>%1/offline</translation> </message> <message> <location line="+2"/> <source>%1/unconfirmed</source> - <translation type="unfinished"></translation> + <translation>%1/unconfirmed</translation> </message> <message> <location line="+2"/> <source>%1 confirmations</source> - <translation type="unfinished"></translation> + <translation>%1 confirmations</translation> </message> <message> <location line="+18"/> <source>Status</source> - <translation type="unfinished"></translation> + <translation>Status</translation> </message> <message numerus="yes"> <location line="+7"/> <source>, broadcast through %n node(s)</source> - <translation> - <numerusform>, broadcast through %n node</numerusform> - <numerusform>, broadcast through %n nodes</numerusform> - </translation> + <translation><numerusform>, broadcast through %n node</numerusform><numerusform>, broadcast through %n nodes</numerusform></translation> </message> <message> <location line="+4"/> <source>Date</source> - <translation type="unfinished"></translation> + <translation>Date</translation> </message> <message> <location line="+7"/> <source>Source</source> - <translation type="unfinished"></translation> + <translation>Source</translation> </message> <message> <location line="+0"/> <source>Generated</source> - <translation type="unfinished"></translation> + <translation>Generated</translation> </message> <message> <location line="+6"/> <location line="+17"/> <source>From</source> - <translation type="unfinished"></translation> + <translation>From</translation> </message> <message> <location line="+1"/> <location line="+22"/> <location line="+58"/> <source>To</source> - <translation type="unfinished"></translation> + <translation>To</translation> </message> <message> <location line="-77"/> <location line="+2"/> <source>own address</source> - <translation type="unfinished"></translation> + <translation>own address</translation> </message> <message> <location line="-2"/> <source>label</source> - <translation type="unfinished"></translation> + <translation>label</translation> </message> <message> <location line="+37"/> @@ -1695,20 +1677,17 @@ Address: %4 <location line="+17"/> <location line="+30"/> <source>Credit</source> - <translation type="unfinished"></translation> + <translation>Credit</translation> </message> <message numerus="yes"> <location line="-102"/> <source>matures in %n more block(s)</source> - <translation> - <numerusform>matures in %n more block</numerusform> - <numerusform>matures in %n more blocks</numerusform> - </translation> + <translation><numerusform>matures in %n more block</numerusform><numerusform>matures in %n more blocks</numerusform></translation> </message> <message> <location line="+2"/> <source>not accepted</source> - <translation type="unfinished"></translation> + <translation>not accepted</translation> </message> <message> <location line="+44"/> @@ -1716,77 +1695,77 @@ Address: %4 <location line="+15"/> <location line="+30"/> <source>Debit</source> - <translation type="unfinished"></translation> + <translation>Debit</translation> </message> <message> <location line="-39"/> <source>Transaction fee</source> - <translation type="unfinished"></translation> + <translation>Transaction fee</translation> </message> <message> <location line="+16"/> <source>Net amount</source> - <translation type="unfinished"></translation> + <translation>Net amount</translation> </message> <message> <location line="+6"/> <source>Message</source> - <translation type="unfinished"></translation> + <translation>Message</translation> </message> <message> <location line="+2"/> <source>Comment</source> - <translation type="unfinished"></translation> + <translation>Comment</translation> </message> <message> <location line="+2"/> <source>Transaction ID</source> - <translation type="unfinished"></translation> + <translation>Transaction ID</translation> </message> <message> <location line="+3"/> <source>Generated coins must mature 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, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"></translation> + <translation>Generated coins must mature 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, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</translation> </message> <message> <location line="+7"/> <source>Debug information</source> - <translation type="unfinished"></translation> + <translation>Debug information</translation> </message> <message> <location line="+8"/> <source>Transaction</source> - <translation type="unfinished"></translation> + <translation>Transaction</translation> </message> <message> <location line="+5"/> <source>Inputs</source> - <translation type="unfinished"></translation> + <translation>Inputs</translation> </message> <message> <location line="+23"/> <source>Amount</source> - <translation type="unfinished"></translation> + <translation>Amount</translation> </message> <message> <location line="+1"/> <source>true</source> - <translation type="unfinished"></translation> + <translation>true</translation> </message> <message> <location line="+0"/> <source>false</source> - <translation type="unfinished"></translation> + <translation>false</translation> </message> <message> <location line="-212"/> <source>, has not been successfully broadcast yet</source> - <translation type="unfinished"></translation> + <translation>, has not been successfully broadcast yet</translation> </message> <message> <location line="+36"/> <source>unknown</source> - <translation type="unfinished"></translation> + <translation>unknown</translation> </message> </context> <context> @@ -1794,12 +1773,12 @@ Address: %4 <message> <location filename="../forms/transactiondescdialog.ui" line="+14"/> <source>Transaction details</source> - <translation type="unfinished"></translation> + <translation>Transaction details</translation> </message> <message> <location line="+6"/> <source>This pane shows a detailed description of the transaction</source> - <translation type="unfinished"></translation> + <translation>This pane shows a detailed description of the transaction</translation> </message> </context> <context> @@ -1807,123 +1786,117 @@ Address: %4 <message> <location filename="../transactiontablemodel.cpp" line="+226"/> <source>Date</source> - <translation type="unfinished"></translation> + <translation>Date</translation> </message> <message> <location line="+0"/> <source>Type</source> - <translation type="unfinished"></translation> + <translation>Type</translation> </message> <message> <location line="+0"/> <source>Address</source> - <translation type="unfinished"></translation> + <translation>Address</translation> </message> <message> <location line="+0"/> <source>Amount</source> - <translation type="unfinished"></translation> + <translation>Amount</translation> </message> <message numerus="yes"> <location line="+57"/> <source>Open for %n block(s)</source> - <translation> - <numerusform>Open for %n block</numerusform> - <numerusform>Open for %n blocks</numerusform> - </translation> + <translation><numerusform>Open for %n block</numerusform><numerusform>Open for %n blocks</numerusform></translation> </message> <message> <location line="+3"/> <source>Open until %1</source> - <translation type="unfinished"></translation> + <translation>Open until %1</translation> </message> <message> <location line="+3"/> <source>Offline (%1 confirmations)</source> - <translation type="unfinished"></translation> + <translation>Offline (%1 confirmations)</translation> </message> <message> <location line="+3"/> <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation type="unfinished"></translation> + <translation>Unconfirmed (%1 of %2 confirmations)</translation> </message> <message> <location line="+3"/> <source>Confirmed (%1 confirmations)</source> - <translation type="unfinished"></translation> + <translation>Confirmed (%1 confirmations)</translation> </message> <message numerus="yes"> <location line="+8"/> <source>Mined balance will be available when it matures in %n more block(s)</source> - <translation> - <numerusform>Mined balance will be available when it matures in %n more block</numerusform> - <numerusform>Mined balance will be available when it matures in %n more blocks</numerusform> - </translation> + <translation><numerusform>Mined balance will be available when it matures in %n more block</numerusform><numerusform>Mined balance will be available when it matures in %n more blocks</numerusform></translation> </message> <message> <location line="+5"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation type="unfinished"></translation> + <translation>This block was not received by any other nodes and will probably not be accepted!</translation> </message> <message> <location line="+3"/> <source>Generated but not accepted</source> - <translation type="unfinished"></translation> + <translation>Generated but not accepted</translation> </message> <message> <location line="+43"/> <source>Received with</source> - <translation type="unfinished"></translation> + <translation>Received with</translation> </message> <message> <location line="+2"/> <source>Received from</source> - <translation type="unfinished"></translation> + <translation>Received from</translation> </message> <message> <location line="+3"/> <source>Sent to</source> - <translation type="unfinished"></translation> + <translation>Sent to</translation> </message> <message> <location line="+2"/> <source>Payment to yourself</source> - <translation type="unfinished"></translation> + <translation>Payment to yourself</translation> </message> <message> <location line="+2"/> <source>Mined</source> - <translation type="unfinished"></translation> + <translation>Mined</translation> </message> <message> <location line="+38"/> <source>(n/a)</source> - <translation type="unfinished"></translation> + <translation>(n/a)</translation> </message> <message> <location line="+199"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> - <translation type="unfinished"></translation> + <translation>Transaction status. Hover over this field to show number of confirmations.</translation> </message> <message> <location line="+2"/> <source>Date and time that the transaction was received.</source> - <translation type="unfinished"></translation> + <translation>Date and time that the transaction was received.</translation> </message> <message> <location line="+2"/> <source>Type of transaction.</source> - <translation type="unfinished"></translation> + <translation>Type of transaction.</translation> </message> <message> <location line="+2"/> <source>Destination address of transaction.</source> - <translation type="unfinished"></translation> + <translation>Destination address of transaction.</translation> </message> <message> <location line="+2"/> <source>Amount removed from or added to balance.</source> - <translation type="unfinished"></translation> + <translation>Amount removed from or added to balance.</translation> </message> </context> <context> @@ -1932,162 +1905,162 @@ Address: %4 <location filename="../transactionview.cpp" line="+55"/> <location line="+16"/> <source>All</source> - <translation type="unfinished"></translation> + <translation>All</translation> </message> <message> <location line="-15"/> <source>Today</source> - <translation type="unfinished"></translation> + <translation>Today</translation> </message> <message> <location line="+1"/> <source>This week</source> - <translation type="unfinished"></translation> + <translation>This week</translation> </message> <message> <location line="+1"/> <source>This month</source> - <translation type="unfinished"></translation> + <translation>This month</translation> </message> <message> <location line="+1"/> <source>Last month</source> - <translation type="unfinished"></translation> + <translation>Last month</translation> </message> <message> <location line="+1"/> <source>This year</source> - <translation type="unfinished"></translation> + <translation>This year</translation> </message> <message> <location line="+1"/> <source>Range...</source> - <translation type="unfinished"></translation> + <translation>Range...</translation> </message> <message> <location line="+11"/> <source>Received with</source> - <translation type="unfinished"></translation> + <translation>Received with</translation> </message> <message> <location line="+2"/> <source>Sent to</source> - <translation type="unfinished"></translation> + <translation>Sent to</translation> </message> <message> <location line="+2"/> <source>To yourself</source> - <translation type="unfinished"></translation> + <translation>To yourself</translation> </message> <message> <location line="+1"/> <source>Mined</source> - <translation type="unfinished"></translation> + <translation>Mined</translation> </message> <message> <location line="+1"/> <source>Other</source> - <translation type="unfinished"></translation> + <translation>Other</translation> </message> <message> <location line="+7"/> <source>Enter address or label to search</source> - <translation type="unfinished"></translation> + <translation>Enter address or label to search</translation> </message> <message> <location line="+7"/> <source>Min amount</source> - <translation type="unfinished"></translation> + <translation>Min amount</translation> </message> <message> <location line="+34"/> <source>Copy address</source> - <translation type="unfinished"></translation> + <translation>Copy address</translation> </message> <message> <location line="+1"/> <source>Copy label</source> - <translation type="unfinished"></translation> + <translation>Copy label</translation> </message> <message> <location line="+1"/> <source>Copy amount</source> - <translation type="unfinished"></translation> + <translation>Copy amount</translation> </message> <message> <location line="+1"/> <source>Edit label</source> - <translation type="unfinished"></translation> + <translation>Edit label</translation> </message> <message> <location line="+1"/> <source>Show transaction details</source> - <translation type="unfinished"></translation> + <translation>Show transaction details</translation> </message> <message> <location line="+142"/> <source>Export Transaction Data</source> - <translation type="unfinished"></translation> + <translation>Export Transaction Data</translation> </message> <message> <location line="+1"/> <source>Comma separated file (*.csv)</source> - <translation type="unfinished"></translation> + <translation>Comma separated file (*.csv)</translation> </message> <message> <location line="+8"/> <source>Confirmed</source> - <translation type="unfinished"></translation> + <translation>Confirmed</translation> </message> <message> <location line="+1"/> <source>Date</source> - <translation type="unfinished"></translation> + <translation>Date</translation> </message> <message> <location line="+1"/> <source>Type</source> - <translation type="unfinished"></translation> + <translation>Type</translation> </message> <message> <location line="+1"/> <source>Label</source> - <translation type="unfinished"></translation> + <translation>Label</translation> </message> <message> <location line="+1"/> <source>Address</source> - <translation type="unfinished"></translation> + <translation>Address</translation> </message> <message> <location line="+1"/> <source>Amount</source> - <translation type="unfinished"></translation> + <translation>Amount</translation> </message> <message> <location line="+1"/> <source>ID</source> - <translation type="unfinished"></translation> + <translation>ID</translation> </message> <message> <location line="+4"/> <source>Error exporting</source> - <translation type="unfinished"></translation> + <translation>Error exporting</translation> </message> <message> <location line="+0"/> <source>Could not write to file %1.</source> - <translation type="unfinished"></translation> + <translation>Could not write to file %1.</translation> </message> <message> <location line="+95"/> <source>Range:</source> - <translation type="unfinished"></translation> + <translation>Range:</translation> </message> <message> <location line="+8"/> <source>to</source> - <translation type="unfinished"></translation> + <translation>to</translation> </message> </context> <context> @@ -2095,7 +2068,7 @@ Address: %4 <message> <location filename="../walletmodel.cpp" line="+192"/> <source>Sending...</source> - <translation type="unfinished"></translation> + <translation>Sending...</translation> </message> </context> <context> @@ -2103,550 +2076,555 @@ Address: %4 <message> <location filename="../bitcoinstrings.cpp" line="+65"/> <source>Bitcoin version</source> - <translation type="unfinished"></translation> + <translation>Bitcoin version</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> - <translation type="unfinished"></translation> + <translation>Usage:</translation> </message> <message> <location line="-25"/> <source>Send command to -server or bitcoind</source> - <translation type="unfinished"></translation> + <translation>Send command to -server or bitcoind</translation> </message> <message> <location line="-20"/> <source>List commands</source> - <translation type="unfinished"></translation> + <translation>List commands</translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> - <translation type="unfinished"></translation> + <translation>Get help for a command</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> - <translation type="unfinished"></translation> + <translation>Options:</translation> </message> <message> <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> - <translation type="unfinished"></translation> + <translation>Specify configuration file (default: bitcoin.conf)</translation> </message> <message> <location line="+3"/> <source>Specify pid file (default: bitcoind.pid)</source> - <translation type="unfinished"></translation> + <translation>Specify pid file (default: bitcoind.pid)</translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> - <translation type="unfinished"></translation> + <translation>Generate coins</translation> </message> <message> <location line="-14"/> <source>Don't generate coins</source> - <translation type="unfinished"></translation> + <translation>Don't generate coins</translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> - <translation type="unfinished"></translation> + <translation>Specify data directory</translation> </message> <message> <location line="-8"/> <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished"></translation> + <translation>Set database cache size in megabytes (default: 25)</translation> </message> <message> <location line="+1"/> <source>Set database disk log size in megabytes (default: 100)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation type="unfinished"></translation> + <translation>Set database disk log size in megabytes (default: 100)</translation> </message> <message> - <location line="-32"/> + <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation type="unfinished"></translation> + <translation>Listen for connections on <port> (default: 8333 or testnet: 18333)</translation> </message> <message> <location line="+4"/> <source>Maintain at most <n> connections to peers (default: 125)</source> - <translation type="unfinished"></translation> + <translation>Maintain at most <n> connections to peers (default: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation type="unfinished"></translation> + <translation>Connect to a node to retrieve peer addresses, and disconnect</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> - <translation type="unfinished"></translation> + <translation>Specify your own public address</translation> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> - <translation type="unfinished"></translation> + <translation>Bind to given address. Use [host]:port notation for IPv6</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> - <translation type="unfinished"></translation> + <translation>Threshold for disconnecting misbehaving peers (default: 100)</translation> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation type="unfinished"></translation> + <translation>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</translation> </message> <message> <location line="-12"/> <source>Detach block and address databases. Increases shutdown time (default: 0)</source> - <translation type="unfinished"></translation> + <translation>Detach block and address databases. Increases shutdown time (default: 0)</translation> </message> <message> <location line="+34"/> <source>Accept command line and JSON-RPC commands</source> - <translation type="unfinished"></translation> + <translation>Accept command line and JSON-RPC commands</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> - <translation type="unfinished"></translation> + <translation>Run in the background as a daemon and accept commands</translation> </message> <message> <location line="+33"/> <source>Use the test network</source> - <translation type="unfinished"></translation> + <translation>Use the test network</translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation type="unfinished"></translation> + <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation> </message> <message> <location line="-20"/> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> - <translation type="unfinished"></translation> + <translation>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</translation> </message> <message> <location line="+5"/> <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> + <translation>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</translation> </message> <message> <location line="+3"/> <source>Warning: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation type="unfinished"></translation> + <translation>Warning: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade.</translation> </message> <message> <location line="+3"/> <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> + <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 line="+13"/> <source>An error occurred while setting up the RPC port %i for listening: %s</source> - <translation type="unfinished"></translation> + <translation>An error occurred while setting up the RPC port %i for listening: %s</translation> </message> <message> <location line="+4"/> <source>Block creation options:</source> - <translation type="unfinished"></translation> + <translation>Block creation options:</translation> </message> <message> <location line="+6"/> <source>Connect only to the specified node(s)</source> - <translation type="unfinished"></translation> + <translation>Connect only to the specified node(s)</translation> </message> <message> <location line="+3"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation type="unfinished"></translation> + <translation>Discover own IP address (default: 1 when listening and no -externalip)</translation> </message> <message> <location line="+11"/> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> - <translation type="unfinished"></translation> + <translation>Failed to listen on any port. Use -listen=0 if you want this.</translation> </message> <message> <location line="+2"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> - <translation type="unfinished"></translation> + <translation>Find peers using DNS lookup (default: 1 unless -connect)</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation>Importing blocks...</translation> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> - <translation type="unfinished"></translation> + <translation>Invalid -tor address: '%s'</translation> </message> <message> <location line="+10"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> - <translation type="unfinished"></translation> + <translation>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</translation> </message> <message> <location line="+1"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</source> - <translation type="unfinished"></translation> + <translation>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</translation> </message> <message> <location line="+1"/> <source>Only connect to nodes in network <net> (IPv4, IPv6 or Tor)</source> - <translation type="unfinished"></translation> + <translation>Only connect to nodes in network <net> (IPv4, IPv6 or Tor)</translation> </message> <message> <location line="+2"/> <source>Output extra debugging information. Implies all other -debug* options</source> - <translation type="unfinished"></translation> + <translation>Output extra debugging information. Implies all other -debug* options</translation> </message> <message> <location line="+1"/> <source>Output extra network debugging information</source> - <translation type="unfinished"></translation> + <translation>Output extra network debugging information</translation> </message> <message> <location line="+2"/> <source>Prepend debug output with timestamp</source> - <translation type="unfinished"></translation> + <translation>Prepend debug output with timestamp</translation> </message> <message> <location line="+4"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation type="unfinished"></translation> + <translation>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</translation> </message> <message> <location line="+1"/> <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation type="unfinished"></translation> + <translation>Select the version of socks proxy to use (4-5, default: 5)</translation> </message> <message> <location line="+3"/> <source>Send trace/debug info to console instead of debug.log file</source> - <translation type="unfinished"></translation> + <translation>Send trace/debug info to console instead of debug.log file</translation> </message> <message> <location line="+1"/> <source>Send trace/debug info to debugger</source> - <translation type="unfinished"></translation> + <translation>Send trace/debug info to debugger</translation> </message> <message> <location line="+7"/> <source>Set maximum block size in bytes (default: 250000)</source> - <translation type="unfinished"></translation> + <translation>Set maximum block size in bytes (default: 250000)</translation> </message> <message> <location line="+1"/> <source>Set minimum block size in bytes (default: 0)</source> - <translation type="unfinished"></translation> + <translation>Set minimum block size in bytes (default: 0)</translation> </message> <message> <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation type="unfinished"></translation> + <translation>Shrink debug.log file on client startup (default: 1 when no -debug)</translation> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>Specify connection timeout in milliseconds (default: 5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> - <translation type="unfinished"></translation> + <translation>Use UPnP to map the listening port (default: 0)</translation> </message> <message> <location line="+1"/> <source>Use UPnP to map the listening port (default: 1 when listening)</source> - <translation type="unfinished"></translation> + <translation>Use UPnP to map the listening port (default: 1 when listening)</translation> </message> <message> <location line="+1"/> <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation type="unfinished"></translation> + <translation>Use proxy to reach tor hidden services (default: same as -proxy)</translation> </message> <message> <location line="+2"/> <source>Username for JSON-RPC connections</source> - <translation type="unfinished"></translation> + <translation>Username for JSON-RPC connections</translation> </message> <message> <location line="+2"/> <source>Warning: Disk space is low!</source> - <translation type="unfinished"></translation> + <translation>Warning: Disk space is low!</translation> </message> <message> <location line="+1"/> <source>Warning: This version is obsolete, upgrade required!</source> - <translation type="unfinished"></translation> + <translation>Warning: This version is obsolete, upgrade required!</translation> </message> <message> <location line="-41"/> <source>Password for JSON-RPC connections</source> - <translation type="unfinished"></translation> + <translation>Password for JSON-RPC connections</translation> </message> <message> <location line="-12"/> <source>Listen for JSON-RPC connections on <port> (default: 8332)</source> - <translation type="unfinished"></translation> + <translation>Listen for JSON-RPC connections on <port> (default: 8332)</translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> - <translation type="unfinished"></translation> + <translation>Allow JSON-RPC connections from specified IP address</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation type="unfinished"></translation> + <translation>Send commands to node running on <ip> (default: 127.0.0.1)</translation> </message> <message> - <location line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation type="unfinished"></translation> + <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> - <translation type="unfinished"></translation> + <translation>Upgrade wallet to latest format</translation> </message> <message> <location line="-15"/> <source>Set key pool size to <n> (default: 100)</source> - <translation type="unfinished"></translation> + <translation>Set key pool size to <n> (default: 100)</translation> </message> <message> <location line="-14"/> <source>Rescan the block chain for missing wallet transactions</source> - <translation type="unfinished"></translation> + <translation>Rescan the block chain for missing wallet transactions</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation type="unfinished"></translation> + <translation>How many blocks to check at startup (default: 2500, 0 = all)</translation> </message> <message> <location line="+1"/> <source>How thorough the block verification is (0-6, default: 1)</source> - <translation type="unfinished"></translation> + <translation>How thorough the block verification is (0-6, default: 1)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> - <translation type="unfinished"></translation> + <translation>Imports blocks from external blk000?.dat file</translation> </message> <message> <location line="+52"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation type="unfinished"></translation> + <translation>Use OpenSSL (https) for JSON-RPC connections</translation> </message> <message> <location line="-21"/> <source>Server certificate file (default: server.cert)</source> - <translation type="unfinished"></translation> + <translation>Server certificate file (default: server.cert)</translation> </message> <message> <location line="+1"/> <source>Server private key (default: server.pem)</source> - <translation type="unfinished"></translation> + <translation>Server private key (default: server.pem)</translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> - <translation type="unfinished"></translation> + <translation>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+121"/> + <location line="+122"/> <source>This help message</source> - <translation type="unfinished"></translation> + <translation>This help message</translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> + <translation>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</translation> </message> <message> <location line="+45"/> <source>Bitcoin</source> - <translation type="unfinished"></translation> + <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> - <translation type="unfinished"></translation> + <translation>Unable to bind to %s on this computer (bind returned error %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> - <translation type="unfinished"></translation> + <translation>Connect through socks proxy</translation> </message> <message> <location line="-13"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation type="unfinished"></translation> + <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> - <translation type="unfinished"></translation> + <translation>Loading addresses...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> - <translation type="unfinished"></translation> + <translation>Error loading blkindex.dat</translation> </message> <message> <location line="+2"/> <source>Error loading wallet.dat: Wallet corrupted</source> - <translation type="unfinished"></translation> + <translation>Error loading wallet.dat: Wallet corrupted</translation> </message> <message> <location line="+1"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation type="unfinished"></translation> + <translation>Error loading wallet.dat: Wallet requires newer version of Bitcoin</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation type="unfinished"></translation> + <translation>Wallet needed to be rewritten: restart Bitcoin to complete</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> - <translation type="unfinished"></translation> + <translation>Error loading wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> - <translation type="unfinished"></translation> + <translation>Invalid -proxy address: '%s'</translation> </message> <message> <location line="+47"/> <source>Unknown network specified in -onlynet: '%s'</source> - <translation type="unfinished"></translation> + <translation>Unknown network specified in -onlynet: '%s'</translation> </message> <message> <location line="-1"/> <source>Unknown -socks proxy version requested: %i</source> - <translation type="unfinished"></translation> + <translation>Unknown -socks proxy version requested: %i</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> - <translation type="unfinished"></translation> + <translation>Cannot resolve -bind address: '%s'</translation> </message> <message> <location line="+1"/> <source>Cannot resolve -externalip address: '%s'</source> - <translation type="unfinished"></translation> + <translation>Cannot resolve -externalip address: '%s'</translation> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> - <translation type="unfinished"></translation> + <translation>Invalid amount for -paytxfee=<amount>: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> - <translation type="unfinished"></translation> + <translation>Error: could not start node</translation> </message> <message> <location line="-1"/> <source>Error: Wallet locked, unable to create transaction </source> - <translation type="unfinished"></translation> + <translation>Error: Wallet locked, unable to create transaction </translation> </message> <message> <location line="-55"/> <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> + <translation>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds </translation> </message> <message> <location line="+54"/> <source>Error: Transaction creation failed </source> - <translation type="unfinished"></translation> + <translation>Error: Transaction creation failed </translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> - <translation type="unfinished"></translation> + <translation>Sending...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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> + <translation>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.</translation> </message> <message> - <location line="+74"/> + <location line="+75"/> <source>Invalid amount</source> - <translation type="unfinished"></translation> + <translation>Invalid amount</translation> </message> <message> <location line="-4"/> <source>Insufficient funds</source> - <translation type="unfinished"></translation> + <translation>Insufficient funds</translation> </message> <message> <location line="+9"/> <source>Loading block index...</source> - <translation type="unfinished"></translation> + <translation>Loading block index...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> - <translation type="unfinished"></translation> + <translation>Add a node to connect to and attempt to keep the connection open</translation> </message> <message> <location line="-18"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"></translation> + <translation>Unable to bind to %s on this computer. Bitcoin is probably already running.</translation> </message> <message> <location line="+48"/> <source>Find peers using internet relay chat (default: 0)</source> - <translation type="unfinished"></translation> + <translation>Find peers using internet relay chat (default: 0)</translation> </message> <message> <location line="-2"/> <source>Fee per KB to add to transactions you send</source> - <translation type="unfinished"></translation> + <translation>Fee per KB to add to transactions you send</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> - <translation type="unfinished"></translation> + <translation>Loading wallet...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> - <translation type="unfinished"></translation> + <translation>Cannot downgrade wallet</translation> </message> <message> <location line="+1"/> <source>Cannot initialize keypool</source> - <translation type="unfinished"></translation> + <translation>Cannot initialize keypool</translation> </message> <message> <location line="+3"/> <source>Cannot write default address</source> - <translation type="unfinished"></translation> + <translation>Cannot write default address</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> - <translation type="unfinished"></translation> + <translation>Rescanning...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> - <translation type="unfinished"></translation> + <translation>Done loading</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> - <translation type="unfinished"></translation> + <translation>To use the %s option</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2655,19 +2633,28 @@ 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> + <translation>%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. +</translation> </message> <message> <location line="+74"/> <source>Error</source> - <translation type="unfinished"></translation> + <translation>Error</translation> </message> <message> <location line="-30"/> <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> + <translation>You must set rpcpassword=<password> in the configuration file: +%s +If the file does not exist, create it with owner-readable-only file permissions.</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts index f35e71de48..52a71c7b5f 100644 --- a/src/qt/locale/bitcoin_es.ts +++ b/src/qt/locale/bitcoin_es.ts @@ -13,15 +13,27 @@ <translation><b>Bitcoin</b> versión</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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 type="unfinished"/> + <translation> +Este es un software experimental. + +Distribuido bajo la licencia MIT/X11, vea el archivo adjunto +COPYING o http://www.opensource.org/licenses/mit-license.php. + +Este producto incluye software desarrollado por OpenSSL Project para su uso en +el OpenSSL Toolkit (http://www.openssl.org) y software criptográfico escrito por +Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</translation> </message> </context> <context> @@ -54,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-46"/> <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> - <translation type="unfinished"/> + <translation>Estas son tus direcciones Bitcoin para recibir pagos. Puedes utilizar una diferente por cada persona emisora para saber quien te está pagando.</translation> </message> <message> <location line="+60"/> @@ -215,12 +227,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"/> + <translation>Atencion: ¡Si encriptas tu cartera y pierdes la contraseña perderas <b>TODOS TUS BITCOINS</b>!"</translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> + <translation>¿Seguro que quieres seguir encriptando la cartera?</translation> </message> <message> <location line="+106"/> @@ -278,28 +290,23 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"/> + <translation>La contraseña de cartera ha sido cambiada con exit.</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation>Firmar &mensaje...</translation> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>Mostrar/ocultar &Bitcoin</translation> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Sincronizando con la red…</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Vista general</translation> </message> @@ -374,7 +381,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Opciones...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation>&Cifrar monedero…</translation> </message> @@ -404,7 +411,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Exportar…</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation>Enviar monedas a una dirección Bitcoin</translation> </message> @@ -429,12 +436,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Modificar las opciones de configuración de Bitcoin</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>Mostrar u ocultar la ventana Bitcoin</translation> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <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> @@ -464,12 +466,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Abrir la consola de depuración y diagnóstico</translation> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation>&Verificar mensaje</translation> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -479,12 +481,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Monedero</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> - <translation type="unfinished"/> + <translation>&Acerca de Bitcoin</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>Mo&strar/ocultar</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>&Archivo</translation> </message> @@ -640,7 +647,7 @@ Dirección: %4</translation> <translation>Ha habido un error al intentar guardar los datos del monedero a la nueva ubicación.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -648,7 +655,7 @@ Dirección: %4</translation> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation>Alerta de red</translation> </message> @@ -724,7 +731,7 @@ Dirección: %4</translation> <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation>Bitcoin-Qt</translation> @@ -795,7 +802,7 @@ Dirección: %4</translation> <message> <location line="+3"/> <source>&Start Bitcoin on system login</source> - <translation>&amp;Arrancar Bitcoin al iniciar el sistema</translation> + <translation>&Arrancar Bitcoin al iniciar el sistema</translation> </message> <message> <location line="+7"/> @@ -825,7 +832,7 @@ Dirección: %4</translation> <message> <location line="+7"/> <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source> - <translation type="unfinished"/> + <translation>Conecta a la red Bitcoin atraves de un proxy SOCKS (ej. para conectar con la red Tor)</translation> </message> <message> <location line="+3"/> @@ -943,7 +950,7 @@ Dirección: %4</translation> <translation>predeterminado</translation> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation>Alerta</translation> @@ -1105,7 +1112,7 @@ Dirección: %4</translation> <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation>N/D</translation> </message> @@ -1197,7 +1204,7 @@ Dirección: %4</translation> <message> <location line="-104"/> <source>Bitcoin - Debug window</source> - <translation type="unfinished"/> + <translation>Bitcoin - Ventana de depuración</translation> </message> <message> <location line="+25"/> @@ -1239,7 +1246,7 @@ Dirección: %4</translation> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1312,7 +1319,7 @@ Dirección: %4</translation> <message> <location line="+23"/> <source>The recipient address is not valid, please recheck.</source> - <translation type="unfinished"/> + <translation>La dirección de destinatarion no es valida, comprueba otra vez.</translation> </message> <message> <location line="+5"/> @@ -1332,7 +1339,7 @@ Dirección: %4</translation> <message> <location line="+6"/> <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation type="unfinished"/> + <translation>Tienes una dirección duplicada, solo puedes enviar a direcciónes individuales de una sola vez.</translation> </message> <message> <location line="+5"/> @@ -1430,19 +1437,19 @@ Dirección: %4</translation> <message> <location line="+18"/> <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Introduce una dirección Bitcoin (ej. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+10"/> <location line="+203"/> <source>Choose an address from the address book</source> - <translation type="unfinished"/> + <translation>Elija una dirección de la libreta de direcciones</translation> </message> <message> <location line="-193"/> <location line="+203"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location line="-193"/> @@ -1452,7 +1459,7 @@ Dirección: %4</translation> <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location line="+12"/> @@ -1494,7 +1501,7 @@ Dirección: %4</translation> <message> <location line="+21"/> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Introduce una dirección Bitcoin (ej. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+40"/> @@ -1604,7 +1611,7 @@ Dirección: %4</translation> <message> <location line="+8"/> <source>%1/offline</source> - <translation type="unfinished"/> + <translation>%1/fuera de linea</translation> </message> <message> <location line="+2"/> @@ -1645,14 +1652,14 @@ Dirección: %4</translation> <location line="+6"/> <location line="+17"/> <source>From</source> - <translation type="unfinished"/> + <translation>De</translation> </message> <message> <location line="+1"/> <location line="+22"/> <location line="+58"/> <source>To</source> - <translation type="unfinished"/> + <translation>Para</translation> </message> <message> <location line="-77"/> @@ -1663,7 +1670,7 @@ Dirección: %4</translation> <message> <location line="-2"/> <source>label</source> - <translation type="unfinished"/> + <translation>etiqueta</translation> </message> <message> <location line="+37"/> @@ -1682,7 +1689,7 @@ Dirección: %4</translation> <message> <location line="+2"/> <source>not accepted</source> - <translation type="unfinished"/> + <translation>no aceptada</translation> </message> <message> <location line="+44"/> @@ -1695,12 +1702,12 @@ Dirección: %4</translation> <message> <location line="-39"/> <source>Transaction fee</source> - <translation type="unfinished"/> + <translation>Comisión transacción</translation> </message> <message> <location line="+16"/> <source>Net amount</source> - <translation type="unfinished"/> + <translation>Cantidad total</translation> </message> <message> <location line="+6"/> @@ -1710,7 +1717,7 @@ Dirección: %4</translation> <message> <location line="+2"/> <source>Comment</source> - <translation type="unfinished"/> + <translation>Comentario</translation> </message> <message> <location line="+2"/> @@ -1720,7 +1727,7 @@ Dirección: %4</translation> <message> <location line="+3"/> <source>Generated coins must mature 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, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> + <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 line="+7"/> @@ -2074,7 +2081,7 @@ Dirección: %4</translation> <translation>Versión de Bitcoin</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Uso:</translation> </message> @@ -2090,13 +2097,13 @@ Dirección: %4</translation> </translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Recibir ayuda para un comando </translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Opciones: </translation> @@ -2114,7 +2121,7 @@ Dirección: %4</translation> </translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Generar monedas</translation> </message> @@ -2124,7 +2131,7 @@ Dirección: %4</translation> <translation>No generar monedas</translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Especificar directorio para los datos</translation> </message> @@ -2139,13 +2146,7 @@ Dirección: %4</translation> <translation>Base de datos de conjunto de discos de registro de tamaño en megabytes (por defecto: 100)</translation> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Especifica tiempo de espera para conexion (en milisegundos) -</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <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> @@ -2155,27 +2156,27 @@ Dirección: %4</translation> <translation>Mantener en la mayoría de las conexiones <n> a sus compañeros (por defecto: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <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 line="-104"/> + <location line="-105"/> <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> @@ -2191,7 +2192,7 @@ Dirección: %4</translation> </translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation>Correr como demonio y acepta comandos </translation> @@ -2203,7 +2204,7 @@ Dirección: %4</translation> </translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect)</translation> </message> @@ -2215,7 +2216,7 @@ Dirección: %4</translation> <message> <location line="+5"/> <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>Precaución: -paytxfee es muy alta! Esta es la comisión que pagarás si envias una transacción.</translation> </message> <message> <location line="+3"/> @@ -2225,7 +2226,7 @@ Dirección: %4</translation> <message> <location line="+3"/> <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>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 line="+13"/> @@ -2259,11 +2260,16 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>Invalid -tor address: '%s'</source> + <location line="+6"/> + <source>Importing blocks...</source> <translation type="unfinished"/> </message> <message> + <location line="+4"/> + <source>Invalid -tor address: '%s'</source> + <translation>Dirección -tor invalida: '%s'</translation> + </message> + <message> <location line="+10"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> <translation type="unfinished"/> @@ -2296,7 +2302,7 @@ Dirección: %4</translation> <message> <location line="+4"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation type="unfinished"/> + <translation>Opciones SSL: (ver la Bitcoin Wiki para instrucciones de configuración SSL)</translation> </message> <message> <location line="+1"/> @@ -2329,7 +2335,12 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>Especifica tiempo de espera para conexion en milisegundos (por defecto: 5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Usar UPnP para asignar el puerto de escucha (predeterminado: 0)</translation> </message> @@ -2352,7 +2363,7 @@ Dirección: %4</translation> <message> <location line="+2"/> <source>Warning: Disk space is low!</source> - <translation type="unfinished"/> + <translation>Atención: Poco espacio en el disco duro!</translation> </message> <message> <location line="+1"/> @@ -2372,24 +2383,24 @@ Dirección: %4</translation> </translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <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 line="+60"/> + <location line="+61"/> <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 line="-89"/> + <location 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 line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>Actualizar el monedero al último formato</translation> </message> @@ -2405,7 +2416,7 @@ Dirección: %4</translation> <translation>Volver a examinar la cadena de bloques en busca de transacciones del monedero perdidas</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <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> @@ -2415,7 +2426,7 @@ Dirección: %4</translation> <translation>Cómo completa la verificación del bloque es (0-6, por defecto: 1)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation type="unfinished"/> </message> @@ -2438,19 +2449,19 @@ Dirección: %4</translation> </translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Este mensaje de ayuda </translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <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> @@ -2461,12 +2472,12 @@ Dirección: %4</translation> <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> - <translation type="unfinished"/> + <translation>No es posible conectar con %s en este sistema (bind returned error %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation>Conectar mediante proxy socks</translation> </message> @@ -2476,12 +2487,12 @@ Dirección: %4</translation> <translation>Permitir búsquedas DNS para -addnode, -seednode y -connect</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Cargando direcciones...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>Error al cargar blkindex.dat</translation> </message> @@ -2496,19 +2507,19 @@ Dirección: %4</translation> <translation>Error al cargar wallet.dat: El monedero requiere una versión más reciente de Bitcoin</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <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 line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>Error al cargar wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> - <translation type="unfinished"/> + <translation>Dirección -proxy invalida: '%s'</translation> </message> <message> <location line="+47"/> @@ -2521,7 +2532,7 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2531,12 +2542,12 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> - <translation type="unfinished"/> + <translation>Cantidad inválida para -paytxfee=<amount>: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"/> </message> @@ -2556,17 +2567,17 @@ Dirección: %4</translation> <translation>Error: no se ha podido crear la transacción</translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Enviando...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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 pasar 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 aquí.</translation> </message> <message> - <location line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation>Cuantía no válida</translation> </message> @@ -2581,7 +2592,7 @@ Dirección: %4</translation> <translation>Cargando el índice de bloques...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <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> @@ -2601,12 +2612,12 @@ Dirección: %4</translation> <translation>Tarifa por KB que añadir a las transacciones que envíe</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Cargando monedero...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation>No se puede rebajar el monedero</translation> </message> @@ -2621,22 +2632,22 @@ Dirección: %4</translation> <translation>No se puede escribir la dirección por defecto</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Rescaneando...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Generado pero no aceptado</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation>Para utilizar la opción %s</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts index dd26f65155..3dd7c56f7e 100644 --- a/src/qt/locale/bitcoin_es_CL.ts +++ b/src/qt/locale/bitcoin_es_CL.ts @@ -13,15 +13,27 @@ <translation><b>Bitcoin</b> - versión </translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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 type="unfinished"/> + <translation> +Este es un software experimental. + +Distribuido bajo la licencia MIT/X11, vea el archivo adjunto +COPYING o http://www.opensource.org/licenses/mit-license.php. + +Este producto incluye software desarrollado por OpenSSL Project para su uso en +el OpenSSL Toolkit (http://www.openssl.org/), software criptográfico escrito por +Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</translation> </message> </context> <context> @@ -49,17 +61,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-11"/> <source>&New Address</source> - <translation type="unfinished"/> + <translation>&Nueva dirección</translation> </message> <message> <location line="-46"/> <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> - <translation type="unfinished"/> + <translation>Estas son tus direcciones Bitcoin para recibir pagos. Puedes utilizar una diferente por cada persona emisora para saber quien te está pagando.</translation> </message> <message> <location line="+60"/> <source>&Copy Address</source> - <translation type="unfinished"/> + <translation>&Copia dirección</translation> </message> <message> <location line="+11"/> @@ -69,7 +81,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+11"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Firmar un mensaje para provar que usted es dueño de esta dirección</translation> </message> <message> <location line="+3"/> @@ -99,12 +111,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../addressbookpage.cpp" line="+65"/> <source>Copy &Label</source> - <translation type="unfinished"/> + <translation>Copia &etiqueta</translation> </message> <message> <location line="+2"/> <source>&Edit</source> - <translation type="unfinished"/> + <translation>&Editar</translation> </message> <message> <location line="+250"/> @@ -215,18 +227,18 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"/> + <translation>Atención: ¡Si codificas tu billetera y pierdes la contraseña perderás <b>TODOS TUS BITCOINS</b>!</translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> + <translation>¿Seguro que quieres seguir codificando la billetera?</translation> </message> <message> <location line="+106"/> <location line="+24"/> <source>Warning: The Caps Lock key is on!</source> - <translation type="unfinished"/> + <translation>Precaucion: Mayúsculas Activadas</translation> </message> <message> <location line="-121"/> @@ -278,28 +290,23 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"/> + <translation>La contraseña de billetera ha sido cambiada con éxito.</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>Mostrar/Ocultar &Bitcoin</translation> + <translation>Firmar &Mensaje...</translation> </message> <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Sincronizando con la red...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Vista general</translation> </message> @@ -374,19 +381,19 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Opciones</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> - <translation type="unfinished"/> + <translation>&Codificar la billetera...</translation> </message> <message> <location line="+3"/> <source>&Backup Wallet...</source> - <translation type="unfinished"/> + <translation>&Respaldar billetera...</translation> </message> <message> <location line="+2"/> <source>&Change Passphrase...</source> - <translation type="unfinished"/> + <translation>&Cambiar la contraseña...</translation> </message> <message numerus="yes"> <location line="+241"/> @@ -404,14 +411,14 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Exportar...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Enviar monedas a una dirección bitcoin</translation> </message> <message> <location line="+6"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Firmar un mensaje para provar que usted es dueño de esta dirección</translation> </message> <message> <location line="+4"/> @@ -426,15 +433,10 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+37"/> <source>Modify configuration options for Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>Mostrar u ocultar la ventana de Bitcoin</translation> + <translation>Modifica las opciones de configuración de bitcoin</translation> </message> <message> - <location line="+2"/> + <location line="+4"/> <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> @@ -464,27 +466,32 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> <location line="+0"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>Cartera</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> - <translation type="unfinished"/> + <translation>&Sobre Bitcoin</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>&Mostrar/Ocultar</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>&Archivo</translation> </message> @@ -640,7 +647,7 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -648,7 +655,7 @@ Dirección: %4</translation> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -708,7 +715,7 @@ Dirección: %4</translation> <message> <location line="+5"/> <source>The entered address "%1" is not a valid Bitcoin address.</source> - <translation type="unfinished"/> + <translation>La dirección introducida "%1" no es una dirección Bitcoin valida.</translation> </message> <message> <location line="+5"/> @@ -724,7 +731,7 @@ Dirección: %4</translation> <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation type="unfinished"/> @@ -732,7 +739,7 @@ Dirección: %4</translation> <message> <location line="-12"/> <source>version</source> - <translation type="unfinished"/> + <translation>versión</translation> </message> <message> <location line="+2"/> @@ -747,7 +754,7 @@ Dirección: %4</translation> <message> <location line="+4"/> <source>UI options</source> - <translation type="unfinished"/> + <translation>UI opciones</translation> </message> <message> <location line="+1"/> @@ -776,7 +783,7 @@ Dirección: %4</translation> <message> <location line="+16"/> <source>&Main</source> - <translation type="unfinished"/> + <translation>&Principal</translation> </message> <message> <location line="+6"/> @@ -791,12 +798,12 @@ Dirección: %4</translation> <message> <location line="+31"/> <source>Automatically start Bitcoin after logging in to the system.</source> - <translation type="unfinished"/> + <translation>Inicia Bitcoin automáticamente despues de encender el computador</translation> </message> <message> <location line="+3"/> <source>&Start Bitcoin on system login</source> - <translation type="unfinished"/> + <translation>&Inicia Bitcoin al iniciar el sistema</translation> </message> <message> <location line="+7"/> @@ -826,17 +833,17 @@ Dirección: %4</translation> <message> <location line="+7"/> <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source> - <translation type="unfinished"/> + <translation>Conecta a la red Bitcoin a través de un proxy SOCKS (ej. cuando te conectas por la red Tor)</translation> </message> <message> <location line="+3"/> <source>&Connect through SOCKS proxy:</source> - <translation type="unfinished"/> + <translation>&Conecta a traves de un proxy SOCKS:</translation> </message> <message> <location line="+9"/> <source>Proxy &IP:</source> - <translation type="unfinished"/> + <translation>&IP Proxy:</translation> </message> <message> <location line="+19"/> @@ -846,12 +853,12 @@ Dirección: %4</translation> <message> <location line="+7"/> <source>&Port:</source> - <translation type="unfinished"/> + <translation>&Puerto:</translation> </message> <message> <location line="+19"/> <source>Port of the proxy (e.g. 9050)</source> - <translation type="unfinished"/> + <translation>Puerto del servidor proxy (ej. 9050)</translation> </message> <message> <location line="+7"/> @@ -871,7 +878,7 @@ Dirección: %4</translation> <message> <location line="+6"/> <source>Show only a tray icon after minimizing the window.</source> - <translation type="unfinished"/> + <translation>Muestra solo un ícono en la bandeja después de minimizar la ventana</translation> </message> <message> <location line="+3"/> @@ -886,12 +893,12 @@ Dirección: %4</translation> <message> <location line="+3"/> <source>M&inimize on close</source> - <translation type="unfinished"/> + <translation>M&inimiza a la bandeja al cerrar</translation> </message> <message> <location line="+21"/> <source>&Display</source> - <translation type="unfinished"/> + <translation>&Mostrado</translation> </message> <message> <location line="+8"/> @@ -906,12 +913,12 @@ Dirección: %4</translation> <message> <location line="+11"/> <source>&Unit to show amounts in:</source> - <translation type="unfinished"/> + <translation>&Unidad en la que mostrar cantitades:</translation> </message> <message> <location line="+13"/> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation type="unfinished"/> + <translation>Elige la subdivisión por defecto para mostrar cantidaded en la interfaz cuando se envien monedas</translation> </message> <message> <location line="+9"/> @@ -921,7 +928,7 @@ Dirección: %4</translation> <message> <location line="+3"/> <source>&Display addresses in transaction list</source> - <translation type="unfinished"/> + <translation>&Muestra direcciones en el listado de transaccioines</translation> </message> <message> <location line="+71"/> @@ -944,10 +951,10 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> - <translation type="unfinished"/> + <translation>Atención</translation> </message> <message> <location line="-9"/> @@ -992,7 +999,7 @@ Dirección: %4</translation> <message> <location line="-78"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>Cartera</translation> </message> <message> <location line="+124"/> @@ -1106,7 +1113,7 @@ Dirección: %4</translation> <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1240,7 +1247,7 @@ Dirección: %4</translation> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1258,7 +1265,7 @@ Dirección: %4</translation> <message> <location line="+3"/> <source>&Add Recipient</source> - <translation type="unfinished"/> + <translation>&Agrega destinatario</translation> </message> <message> <location line="+20"/> @@ -1268,7 +1275,7 @@ Dirección: %4</translation> <message> <location line="+3"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>&Borra todos</translation> </message> <message> <location line="+22"/> @@ -1313,7 +1320,7 @@ Dirección: %4</translation> <message> <location line="+23"/> <source>The recipient address is not valid, please recheck.</source> - <translation type="unfinished"/> + <translation>La dirección de destinatarion no es valida, comprueba otra vez.</translation> </message> <message> <location line="+5"/> @@ -1323,27 +1330,27 @@ Dirección: %4</translation> <message> <location line="+5"/> <source>The amount exceeds your balance.</source> - <translation type="unfinished"/> + <translation>La cantidad sobrepasa tu saldo.</translation> </message> <message> <location line="+5"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation type="unfinished"/> + <translation>El total sobrepasa tu saldo cuando se incluyen %1 como tasa de envio.</translation> </message> <message> <location line="+6"/> <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation type="unfinished"/> + <translation>Tienes una dirección duplicada, solo puedes enviar a direcciónes individuales de una sola vez.</translation> </message> <message> <location line="+5"/> <source>Error: Transaction creation failed.</source> - <translation type="unfinished"/> + <translation>Error: La transacción no se pudo crear.</translation> </message> <message> <location line="+5"/> <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>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> @@ -1421,7 +1428,7 @@ Dirección: %4</translation> <location line="+13"/> <location line="+124"/> <source>&Sign Message</source> - <translation>& Firmar Mensaje</translation> + <translation>&Firmar Mensaje</translation> </message> <message> <location line="-118"/> @@ -1431,19 +1438,19 @@ Dirección: %4</translation> <message> <location line="+18"/> <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Introduce una dirección Bitcoin (ej. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+10"/> <location line="+203"/> <source>Choose an address from the address book</source> - <translation type="unfinished"/> + <translation>Elije dirección de la guia</translation> </message> <message> <location line="-193"/> <location line="+203"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location line="-193"/> @@ -1453,7 +1460,7 @@ Dirección: %4</translation> <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location line="+12"/> @@ -1468,7 +1475,7 @@ Dirección: %4</translation> <message> <location line="+21"/> <source>Sign the message to prove you own this Bitcoin address</source> - <translation type="unfinished"/> + <translation>Firmar un mensjage para probar que usted es dueño de esta dirección</translation> </message> <message> <location line="+17"/> @@ -1479,7 +1486,7 @@ Dirección: %4</translation> <location line="+3"/> <location line="+146"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>&Borra todos</translation> </message> <message> <location line="-87"/> @@ -1495,7 +1502,7 @@ Dirección: %4</translation> <message> <location line="+21"/> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Introduce una dirección Bitcoin (ej. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+40"/> @@ -1516,7 +1523,7 @@ Dirección: %4</translation> <message> <location line="-2"/> <source>Click "Sign Message" to generate signature</source> - <translation type="unfinished"/> + <translation>Click en "Firmar Mensage" para conseguir firma</translation> </message> <message> <location line="+3"/> @@ -1605,7 +1612,7 @@ Dirección: %4</translation> <message> <location line="+8"/> <source>%1/offline</source> - <translation type="unfinished"/> + <translation>%1/fuera de linea</translation> </message> <message> <location line="+2"/> @@ -1646,7 +1653,7 @@ Dirección: %4</translation> <location line="+6"/> <location line="+17"/> <source>From</source> - <translation type="unfinished"/> + <translation>De</translation> </message> <message> <location line="+1"/> @@ -1664,7 +1671,7 @@ Dirección: %4</translation> <message> <location line="-2"/> <source>label</source> - <translation type="unfinished"/> + <translation>etiqueta</translation> </message> <message> <location line="+37"/> @@ -1683,7 +1690,7 @@ Dirección: %4</translation> <message> <location line="+2"/> <source>not accepted</source> - <translation type="unfinished"/> + <translation>no aceptada</translation> </message> <message> <location line="+44"/> @@ -1696,12 +1703,12 @@ Dirección: %4</translation> <message> <location line="-39"/> <source>Transaction fee</source> - <translation type="unfinished"/> + <translation>Comisión transacción</translation> </message> <message> <location line="+16"/> <source>Net amount</source> - <translation type="unfinished"/> + <translation>Cantidad total</translation> </message> <message> <location line="+6"/> @@ -1711,17 +1718,17 @@ Dirección: %4</translation> <message> <location line="+2"/> <source>Comment</source> - <translation type="unfinished"/> + <translation>Comentario</translation> </message> <message> <location line="+2"/> <source>Transaction ID</source> - <translation type="unfinished"/> + <translation>ID de Transacción</translation> </message> <message> <location line="+3"/> <source>Generated coins must mature 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, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> + <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 line="+7"/> @@ -1731,7 +1738,7 @@ Dirección: %4</translation> <message> <location line="+8"/> <source>Transaction</source> - <translation type="unfinished"/> + <translation>Transacción</translation> </message> <message> <location line="+5"/> @@ -2075,7 +2082,7 @@ Dirección: %4</translation> <translation>Versión Bitcoin</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Uso:</translation> </message> @@ -2092,13 +2099,13 @@ Dirección: %4</translation> </translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Recibir ayuda para un comando </translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Opciones: </translation> @@ -2116,7 +2123,7 @@ Dirección: %4</translation> </translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Genera monedas </translation> @@ -2128,7 +2135,7 @@ Dirección: %4</translation> </translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Especifica directorio para los datos </translation> @@ -2144,13 +2151,7 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Especifica tiempo de espera para conexion (en milisegundos) -</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <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> @@ -2160,27 +2161,27 @@ Dirección: %4</translation> <translation>Mantener al menos <n> conecciones por cliente (por defecto: 125) </translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <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 line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -2196,7 +2197,7 @@ Dirección: %4</translation> </translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation>Correr como demonio y acepta comandos </translation> @@ -2208,7 +2209,7 @@ Dirección: %4</translation> </translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -2220,7 +2221,7 @@ Dirección: %4</translation> <message> <location line="+5"/> <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>Precaución: -paytxfee es muy alta. Esta es la comisión que pagarás si envias una transacción.</translation> </message> <message> <location line="+3"/> @@ -2230,7 +2231,7 @@ Dirección: %4</translation> <message> <location line="+3"/> <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>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 line="+13"/> @@ -2245,7 +2246,8 @@ Dirección: %4</translation> <message> <location line="+6"/> <source>Connect only to the specified node(s)</source> - <translation type="unfinished"/> + <translation>Conecta solo al nodo especificado +</translation> </message> <message> <location line="+3"/> @@ -2263,11 +2265,16 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>Invalid -tor address: '%s'</source> + <location line="+6"/> + <source>Importing blocks...</source> <translation type="unfinished"/> </message> <message> + <location line="+4"/> + <source>Invalid -tor address: '%s'</source> + <translation>Dirección -tor invalida: '%s'</translation> + </message> + <message> <location line="+10"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> <translation type="unfinished"/> @@ -2285,7 +2292,7 @@ Dirección: %4</translation> <message> <location line="+2"/> <source>Output extra debugging information. Implies all other -debug* options</source> - <translation type="unfinished"/> + <translation>Adjuntar informacion extra de depuracion. Implies all other -debug* options</translation> </message> <message> <location line="+1"/> @@ -2300,7 +2307,7 @@ Dirección: %4</translation> <message> <location line="+4"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation type="unfinished"/> + <translation>Opciones SSL: (ver la Bitcoin Wiki para instrucciones de configuración SSL)</translation> </message> <message> <location line="+1"/> @@ -2333,14 +2340,19 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>Especifica tiempo de espera para conexion en milisegundos (predeterminado: 5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> - <translation type="unfinished"/> + <translation>Intenta usar UPnP para mapear el puerto de escucha (default: 0)</translation> </message> <message> <location line="+1"/> <source>Use UPnP to map the listening port (default: 1 when listening)</source> - <translation type="unfinished"/> + <translation>Intenta usar UPnP para mapear el puerto de escucha (default: 1 when listening)</translation> </message> <message> <location line="+1"/> @@ -2356,7 +2368,7 @@ Dirección: %4</translation> <message> <location line="+2"/> <source>Warning: Disk space is low!</source> - <translation type="unfinished"/> + <translation>Atención: Poco espacio en el disco duro</translation> </message> <message> <location line="+1"/> @@ -2376,24 +2388,24 @@ Dirección: %4</translation> </translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <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 line="+60"/> + <location line="+61"/> <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 line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>Actualizar billetera al formato actual</translation> </message> @@ -2410,7 +2422,7 @@ Dirección: %4</translation> </translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2420,7 +2432,7 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation type="unfinished"/> </message> @@ -2443,19 +2455,19 @@ Dirección: %4</translation> </translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Este mensaje de ayuda </translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <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> @@ -2466,27 +2478,28 @@ Dirección: %4</translation> <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> - <translation type="unfinished"/> + <translation>No es posible escuchar en el %s en este ordenador (bind returned error %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> - <translation type="unfinished"/> + <translation>Conecta mediante proxy socks</translation> </message> <message> <location line="-13"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation type="unfinished"/> + <translation>Permite búsqueda DNS para addnode y connect +</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Cargando direcciónes...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>Error cargando blkindex.dat</translation> </message> @@ -2501,19 +2514,19 @@ Dirección: %4</translation> <translation>Error cargando wallet.dat: Billetera necesita una vercion reciente de Bitcoin</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <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 line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>Error cargando wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> - <translation type="unfinished"/> + <translation>Dirección -proxy invalida: '%s'</translation> </message> <message> <location line="+47"/> @@ -2526,7 +2539,7 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2536,12 +2549,12 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> - <translation type="unfinished"/> + <translation>Cantidad inválida para -paytxfee=<amount>: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"/> </message> @@ -2561,17 +2574,17 @@ Dirección: %4</translation> <translation>Error: La transacción no se pudo crear </translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Enviando...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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> <message> - <location line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation>Cantidad inválida</translation> </message> @@ -2586,14 +2599,14 @@ Dirección: %4</translation> <translation>Cargando el index de bloques...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> - <translation type="unfinished"/> + <translation>Agrega un nodo para conectarse and attempt to keep the connection open</translation> </message> <message> <location line="-18"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"/> + <translation>No es posible escuchar en el %s en este ordenador. Probablemente Bitcoin ya se está ejecutando.</translation> </message> <message> <location line="+48"/> @@ -2603,15 +2616,15 @@ Dirección: %4</translation> <message> <location line="-2"/> <source>Fee per KB to add to transactions you send</source> - <translation type="unfinished"/> + <translation>Comisión por kB para adicionarla a las transacciones enviadas</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Cargando cartera...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -2626,22 +2639,22 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Rescaneando...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Carga completa</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts index 93b8e766aa..94113e3465 100644 --- a/src/qt/locale/bitcoin_et.ts +++ b/src/qt/locale/bitcoin_et.ts @@ -13,9 +13,13 @@ <translation type="unfinished"/> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -284,22 +288,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation type="unfinished"/> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation type="unfinished"/> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Ülevaade</translation> </message> @@ -374,7 +373,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Valikud...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation type="unfinished"/> </message> @@ -404,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Ekspordi...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -429,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation type="unfinished"/> </message> @@ -464,12 +458,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> @@ -479,12 +473,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>&Fail</translation> </message> @@ -637,7 +636,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -645,7 +644,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -721,7 +720,7 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation type="unfinished"/> @@ -940,7 +939,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation type="unfinished"/> @@ -1102,7 +1101,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1236,7 +1235,7 @@ Address: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -2071,7 +2070,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation type="unfinished"/> </message> @@ -2086,12 +2085,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation type="unfinished"/> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation type="unfinished"/> </message> @@ -2106,7 +2105,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation type="unfinished"/> </message> @@ -2116,7 +2115,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation type="unfinished"/> </message> @@ -2131,12 +2130,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2146,27 +2140,27 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -2181,7 +2175,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> @@ -2191,7 +2185,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -2246,7 +2240,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation type="unfinished"/> </message> @@ -2316,7 +2315,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2356,22 +2360,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> @@ -2386,7 +2390,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2396,7 +2400,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation type="unfinished"/> </message> @@ -2416,17 +2420,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-109"/> + <location line="-110"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"/> </message> <message> - <location line="+121"/> + <location line="+122"/> <source>This help message</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-119"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation type="unfinished"/> </message> @@ -2436,12 +2440,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> @@ -2451,12 +2455,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation type="unfinished"/> </message> @@ -2471,17 +2475,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> @@ -2496,7 +2500,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2506,12 +2510,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"/> </message> @@ -2531,17 +2535,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation type="unfinished"/> </message> <message> - <location line="-99"/> + <location line="-100"/> <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"/> </message> <message> - <location line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation type="unfinished"/> </message> @@ -2556,7 +2560,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2576,12 +2580,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -2596,22 +2600,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_eu_ES.ts b/src/qt/locale/bitcoin_eu_ES.ts index 12e26c0f59..4e267c58bb 100644 --- a/src/qt/locale/bitcoin_eu_ES.ts +++ b/src/qt/locale/bitcoin_eu_ES.ts @@ -13,9 +13,13 @@ <translation><b>Bitcoin</b> Bertsio</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -284,22 +288,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation type="unfinished"/> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation type="unfinished"/> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation type="unfinished"/> </message> @@ -374,7 +373,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation type="unfinished"/> </message> @@ -404,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -429,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation type="unfinished"/> </message> @@ -464,12 +458,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> @@ -479,12 +473,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation type="unfinished"/> </message> @@ -637,7 +636,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -645,7 +644,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -721,7 +720,7 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation type="unfinished"/> @@ -940,7 +939,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation type="unfinished"/> @@ -1102,7 +1101,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1236,7 +1235,7 @@ Address: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -2071,7 +2070,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation type="unfinished"/> </message> @@ -2086,12 +2085,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation type="unfinished"/> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation type="unfinished"/> </message> @@ -2106,7 +2105,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation type="unfinished"/> </message> @@ -2116,7 +2115,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation type="unfinished"/> </message> @@ -2131,12 +2130,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2146,27 +2140,27 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -2181,7 +2175,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> @@ -2191,7 +2185,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -2246,7 +2240,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation type="unfinished"/> </message> @@ -2316,7 +2315,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2356,22 +2360,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> @@ -2386,7 +2390,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2396,7 +2400,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation type="unfinished"/> </message> @@ -2416,17 +2420,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-109"/> + <location line="-110"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"/> </message> <message> - <location line="+121"/> + <location line="+122"/> <source>This help message</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-119"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation type="unfinished"/> </message> @@ -2436,12 +2440,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> @@ -2451,12 +2455,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation type="unfinished"/> </message> @@ -2471,17 +2475,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> @@ -2496,7 +2500,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2506,12 +2510,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"/> </message> @@ -2531,17 +2535,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation type="unfinished"/> </message> <message> - <location line="-99"/> + <location line="-100"/> <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"/> </message> <message> - <location line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation type="unfinished"/> </message> @@ -2556,7 +2560,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2576,12 +2580,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -2596,22 +2600,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts index 94ac1adebc..fd52d824a3 100644 --- a/src/qt/locale/bitcoin_fa.ts +++ b/src/qt/locale/bitcoin_fa.ts @@ -13,15 +13,19 @@ <translation>نسخه Bitcoin</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation>حق مولف © 2009-2012 توسعه دهندگان bitcoin</translation> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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>حق مولف © 2009-2012 توسعه دهندگان bitcoin⏎ ⏎ این نسخه نرم افزار آزمایشی است⏎ ⏎ نرم افزار تحت لیسانس MIT/X11 منتشر شده است. به فایل coping یا آدرس http://www.opensource.org/licenses/mit-license.php. مراجعه شود⏎ ⏎ این محصول شامل نرم افزاری است که با OpenSSL برای استفاده از OpenSSL Toolkit (http://www.openssl.org/) و نرم افزار نوشته شده توسط اریک یانگ (eay@cryptsoft.com ) و UPnP توسط توماس برنارد طراحی شده است.</translation> + <translation>⏎ ⏎ این نسخه نرم افزار آزمایشی است⏎ ⏎ نرم افزار تحت لیسانس MIT/X11 منتشر شده است. به فایل coping یا آدرس http://www.opensource.org/licenses/mit-license.php. مراجعه شود⏎ ⏎ این محصول شامل نرم افزاری است که با OpenSSL برای استفاده از OpenSSL Toolkit (http://www.openssl.org/) و نرم افزار نوشته شده توسط اریک یانگ (eay@cryptsoft.com ) و UPnP توسط توماس برنارد طراحی شده است.</translation> </message> </context> <context> @@ -285,22 +289,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation>امضا و پیام</translation> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>نمایش/ عدم نمایش BITCOIN</translation> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>همگام سازی با شبکه ...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>بررسی اجمالی</translation> </message> @@ -312,7 +311,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+5"/> <source>&Transactions</source> - <translation>&amp;معاملات</translation> + <translation>&معاملات</translation> </message> <message> <location line="+1"/> @@ -375,7 +374,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>تنظیمات...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation>رمزگذاری wallet</translation> </message> @@ -406,7 +405,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&;صادرات</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation>سکه ها را به آدرس bitocin ارسال کن</translation> </message> @@ -431,12 +430,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>انتخابهای پیکربندی را برای bitcoin اصلاح کن</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>صفحه Bitcoin را نمایش دهید/ندهید</translation> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation>داده ها نوارِ جاری را به فایل انتقال دهید</translation> </message> @@ -466,12 +460,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>کنسول اشکال زدایی و تشخیص را باز کنید</translation> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation>بازبینی پیام</translation> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>یت کویین </translation> </message> @@ -481,12 +475,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>wallet</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> <translation>در مورد bitcoin</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>&نمایش/ عدم نمایش</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>فایل</translation> </message> @@ -642,7 +641,7 @@ Address: %4 <translation>در زمان انتقال داده wallet به محل جدید خطا روی داد</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>خطا روی داده است. Bitcoin نمی تواند بدون مشکل ادامه دهد و باید بسته شود</translation> </message> @@ -650,7 +649,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation>پیام شبکه</translation> </message> @@ -726,7 +725,7 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation>Bitcoin-Qt</translation> @@ -787,7 +786,7 @@ Address: %4 <message> <location line="+15"/> <source>Pay transaction &fee</source> - <translation>دستمزد&amp;پر داخت معامله</translation> + <translation>دستمزد&پر داخت معامله</translation> </message> <message> <location line="+31"/> @@ -945,7 +944,7 @@ Address: %4 <translation>پیش فرض</translation> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation>هشدار</translation> @@ -1107,7 +1106,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation>-</translation> </message> @@ -1241,7 +1240,7 @@ Address: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1357,12 +1356,12 @@ Address: %4 <message> <location line="+15"/> <source>A&mount:</source> - <translation>A&amp;مبلغ :</translation> + <translation>A&مبلغ :</translation> </message> <message> <location line="+13"/> <source>Pay &To:</source> - <translation>به&amp;پر داخت :</translation> + <translation>به&پر داخت :</translation> </message> <message> <location line="+24"/> @@ -1373,7 +1372,7 @@ Address: %4 <message> <location line="+9"/> <source>&Label:</source> - <translation>& بر چسب </translation> + <translation>&بر چسب </translation> </message> <message> <location line="+18"/> @@ -2080,7 +2079,7 @@ Address: %4 <translation>سخه بیتکویین</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>ستفاده :</translation> </message> @@ -2095,12 +2094,12 @@ Address: %4 <translation>لیست فومان ها</translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>کمک برای فرمان </translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>تنظیمات</translation> </message> @@ -2115,7 +2114,7 @@ Address: %4 <translation>(bitcoind.pidپیش فرض : ) فایل پید خاص</translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>سکه های تولید شده</translation> </message> @@ -2125,7 +2124,7 @@ Address: %4 <translation>تولید سکه ها</translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>دایرکتور اطلاعاتی خاص</translation> </message> @@ -2140,12 +2139,7 @@ Address: %4 <translation>سایز دیسک لاگِ بانک داده را بر حسب مگابایت تنظیم کنید (پیش فرض:100)</translation> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>(میلی ثانیه )فاصله ارتباط خاص</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>برای اتصالات به <port> (پیشفرض: 8333 یا تستنت: 18333) گوش کنید</translation> </message> @@ -2155,27 +2149,27 @@ Address: %4 <translation>حداکثر <n> اتصال با همکاران برقرار داشته باشید (پیشفرض: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>اتصال به گره برای دریافت آدرسهای قرینه و قطع اتصال</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation>آدرس عمومی خود را ذکر کنید</translation> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation>تعهد به آدرس ذکر شده. از Use [host]:port notation برای IPv6 استفاده کنید</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>آستانه برای قطع ارتباط با همکاران بدرفتار (پیشفرض: 100)</translation> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>مدت زمان به ثانیه برای جلوگیری از همکاران بدرفتار برای اتصال دوباره (پیشفرض: 86400)</translation> </message> @@ -2190,7 +2184,7 @@ Address: %4 <translation>JSON-RPC قابل فرمانها و</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation>اجرای در پس زمینه به عنوان شبح و قبول فرمان ها</translation> </message> @@ -2200,7 +2194,7 @@ Address: %4 <translation>استفاده شبکه آزمایش</translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>پذیرش اتصالات از بیرون (پیش فرض:1 بدون پراکسی یا اتصال)</translation> </message> @@ -2255,7 +2249,12 @@ Address: %4 <translation>قرینه ها را برای جستجوی DNS بیاب (پیش فرض: 1 مگر در زمان اتصال)</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation>آدرس نرم افزار تور غلط است %s</translation> </message> @@ -2325,7 +2324,12 @@ Address: %4 <translation>فایل debug.log را در startup مشتری کوچک کن (پیش فرض:1 اگر اشکال زدایی روی نداد)</translation> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>(میلی ثانیه )فاصله ارتباط خاص</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>از UPnP برای شناسایی درگاه شنیداری استفاده کنید (پیش فرض:0)</translation> </message> @@ -2365,22 +2369,22 @@ Address: %4 <translation>( 8332پیش فرض :) &lt;poort&gt; JSON-RPC شنوایی برای ارتباطات</translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>از آدرس آی پی خاص JSON-RPC قبول ارتباطات</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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 line="-89"/> + <location 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 line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>wallet را به جدیدترین فرمت روزآمد کنید</translation> </message> @@ -2395,7 +2399,7 @@ Address: %4 <translation>اسکان مجدد زنجیر بلوکها برای گم والت معامله</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation>چند بلاک برای بررسی در زمان startup (پیش فرض:2500 , 0=همه)</translation> </message> @@ -2405,7 +2409,7 @@ Address: %4 <translation>چقد کامل بلوک تصدیق است (0-6, پیش فرض:1)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation>صدور بلاکها از فایل خارجی blk000?.dat </translation> </message> @@ -2425,17 +2429,17 @@ Address: %4 <translation>(server.pemپیش فرض: ) کلید خصوصی سرور</translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>پیام کمکی</translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation>رمز گشایی دایرکتور داده ها امکان پذیر نیست. شاید بیت کویین در حال فعال می باشد%s</translation> </message> @@ -2445,12 +2449,12 @@ Address: %4 <translation>یت کویین </translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>امکان اتصال به %s از این رایانه وجود ندارد ( bind returned error %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation>اتصال از طریق پراکسی ساکس</translation> </message> @@ -2460,12 +2464,12 @@ Address: %4 <translation>به DNS اجازه بده تا برای addnode ، seednode و اتصال جستجو کند</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>بار گیری آدرس ها</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>خطا در بارگیری blkindex.dat</translation> </message> @@ -2480,17 +2484,17 @@ Address: %4 <translation>خطا در بارگیری wallet.dat: کیف پول به ویرایش جدیدتری از Biticon نیاز دارد</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>سلام</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>خطا در بارگیری wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation>آدرس پراکسی اشتباه %s</translation> </message> @@ -2505,7 +2509,7 @@ Address: %4 <translation>نسخه پراکسی ساکس غیرقابل شناسایی درخواست شده است: %i</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation>آدرس قابل اتصال- شناسایی نیست %s</translation> </message> @@ -2515,12 +2519,12 @@ Address: %4 <translation>آدرس خارجی قابل اتصال- شناسایی نیست %s</translation> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>میزان وجه اشتباه برای paytxfee=<میزان وجه>: %s</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation>خطا: امکان شروع گره وجود ندارد</translation> </message> @@ -2540,17 +2544,17 @@ Address: %4 <translation>خطا ایجاد معامله اشتباه است</translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>ارسال...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation>میزان وجه اشتباه</translation> </message> @@ -2565,7 +2569,7 @@ Address: %4 <translation>بار گیری شاخص بلوک</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>به اتصال یک گره اضافه کنید و اتصال را باز نگاه دارید</translation> </message> @@ -2585,12 +2589,12 @@ Address: %4 <translation>پر داجت برای هر کیلو بیت برای اضافه به معامله ارسال</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>بار گیری والت</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation>امکان تنزل نسخه در wallet وجود ندارد</translation> </message> @@ -2605,22 +2609,22 @@ Address: %4 <translation>آدرس پیش فرض قابل ذخیره نیست</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>اسکان مجدد</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>بار گیری انجام شده است</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation>برای استفاده از %s از انتخابات</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/bitcoin_fa_IR.ts index 59ecde1ea5..f9d5ab8590 100644 --- a/src/qt/locale/bitcoin_fa_IR.ts +++ b/src/qt/locale/bitcoin_fa_IR.ts @@ -13,9 +13,13 @@ <translation><b>Bitcoin</b> version</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -284,22 +288,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation>امضا و پیام</translation> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>نمایش/ عدم نمایش و bitcoin</translation> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>به روز رسانی با شبکه...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>و بازبینی</translation> </message> @@ -374,7 +373,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>و انتخابها</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation>و رمزگذاری wallet</translation> </message> @@ -386,7 +385,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+2"/> <source>&Change Passphrase...</source> - <translation type="unfinished"/> + <translation>تغییر رمز/پَس فرِیز</translation> </message> <message numerus="yes"> <location line="+241"/> @@ -405,7 +404,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>و صدور</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -430,12 +429,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>اصلاح انتخابها برای پیکربندی Bitcoin</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>نمایش یا عدم نمایش در صفحه bitcoin</translation> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation>صدور داده نوار جاری به یک فایل</translation> </message> @@ -465,27 +459,32 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> - <translation type="unfinished"/> + <translation>bitcoin</translation> </message> <message> <location line="+0"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>کیف پول</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> - <translation type="unfinished"/> + <translation>&در مورد بیتکویین</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>&نمایش/ عدم نمایش و</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>و فایل</translation> </message> @@ -646,7 +645,7 @@ Address: %4 <translation>در هنگام ذخیره داده های wallet به نسخه جدید خطایی ایجاد شده است</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -654,7 +653,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation>هشدار شبکه</translation> </message> @@ -730,7 +729,7 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation type="unfinished"/> @@ -738,12 +737,12 @@ Address: %4 <message> <location line="-12"/> <source>version</source> - <translation type="unfinished"/> + <translation>نسخه</translation> </message> <message> <location line="+2"/> <source>Usage:</source> - <translation type="unfinished"/> + <translation>میزان استفاده:</translation> </message> <message> <location line="+1"/> @@ -949,7 +948,7 @@ Address: %4 <translation>پیش فرض</translation> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation type="unfinished"/> @@ -997,7 +996,7 @@ Address: %4 <message> <location line="-78"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>کیف پول</translation> </message> <message> <location line="+124"/> @@ -1112,7 +1111,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1246,7 +1245,7 @@ Address: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1344,12 +1343,12 @@ Address: %4 <message> <location line="+5"/> <source>Error: Transaction creation failed.</source> - <translation type="unfinished"/> + <translation>خطا: ایجاد تراکنش امکان پذیر نیست</translation> </message> <message> <location line="+5"/> <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>خطا: تراکنش تایید نشد. این خطا ممکن است به این دلیل اتفاق بیافتد که سکه های wallet شما خرج شده باشند مثلا اگر wallet.dat را مپی کرده باشید و سکه های شما در آن کپی استفاده شده باشند اما در اینجا نمایش داده نشده اند.</translation> </message> </context> <context> @@ -1427,7 +1426,7 @@ Address: %4 <location line="+13"/> <location line="+124"/> <source>&Sign Message</source> - <translation type="unfinished"/> + <translation>و امضای پیام </translation> </message> <message> <location line="-118"/> @@ -1437,29 +1436,29 @@ Address: %4 <message> <location line="+18"/> <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>یک آدرس bitcoin وارد کنید (مثال 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+10"/> <location line="+203"/> <source>Choose an address from the address book</source> - <translation type="unfinished"/> + <translation>آدرس از فهرست آدرس انتخاب کنید</translation> </message> <message> <location line="-193"/> <location line="+203"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt و A</translation> </message> <message> <location line="-193"/> <source>Paste address from clipboard</source> - <translation type="unfinished"/> + <translation>آدرس را بر کلیپ بورد کپی کنید</translation> </message> <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt و P</translation> </message> <message> <location line="+12"/> @@ -1501,7 +1500,7 @@ Address: %4 <message> <location line="+21"/> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>یک آدرس bitcoin وارد کنید (مثال 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+40"/> @@ -1517,7 +1516,7 @@ Address: %4 <location filename="../signverifymessagedialog.cpp" line="+27"/> <location line="+3"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>یک آدرس bitcoin وارد کنید (مثال 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="-2"/> @@ -1636,7 +1635,7 @@ Address: %4 <message> <location line="+4"/> <source>Date</source> - <translation type="unfinished"/> + <translation>تاریخ</translation> </message> <message> <location line="+7"/> @@ -1670,7 +1669,7 @@ Address: %4 <message> <location line="-2"/> <source>label</source> - <translation type="unfinished"/> + <translation>برچسب</translation> </message> <message> <location line="+37"/> @@ -1712,7 +1711,7 @@ Address: %4 <message> <location line="+6"/> <source>Message</source> - <translation type="unfinished"/> + <translation>پیام</translation> </message> <message> <location line="+2"/> @@ -1747,7 +1746,7 @@ Address: %4 <message> <location line="+23"/> <source>Amount</source> - <translation type="unfinished"/> + <translation>میزان</translation> </message> <message> <location line="+1"/> @@ -2083,7 +2082,7 @@ Address: %4 <translation>نسخه bitcoin</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>میزان استفاده:</translation> </message> @@ -2098,12 +2097,12 @@ Address: %4 <translation>فهرست دستورها</translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>درخواست کمک برای یک دستور</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>انتخابها:</translation> </message> @@ -2118,7 +2117,7 @@ Address: %4 <translation>فایل pid را مشخص کنید (پیش فرض: bitcoind.pid)</translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>سکه ها را تولید کن</translation> </message> @@ -2128,7 +2127,7 @@ Address: %4 <translation>سکه ها را تولید نکن</translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>دایرکتوری داده را مشخص کن</translation> </message> @@ -2143,12 +2142,7 @@ Address: %4 <translation>سایز disk log بانک داده را به مگابایت تنظیم کنید (پیش فرض: 100)</translation> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>تعیین مدت زمان وقفه (time out) به هزارم ثانیه</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>ارتباطات را در <PORT> بشنوید (پیش فرض: 8333 or testnet: 18333)</translation> </message> @@ -2158,27 +2152,27 @@ Address: %4 <translation>نگهداری <N> ارتباطات برای قرینه سازی (پیش فرض:125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>آستانه قطع برای قرینه سازی اشتباه (پیش فرض:100)</translation> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>تعداد ثانیه ها برای اتصال دوباره قرینه های اشتباه (پیش فرض:86400)</translation> </message> @@ -2193,7 +2187,7 @@ Address: %4 <translation>command line و JSON-RPC commands را قبول کنید</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation>به عنوان daemon بک گراند را اجرا کنید و دستورات را قبول نمایید</translation> </message> @@ -2203,7 +2197,7 @@ Address: %4 <translation>از تستِ شبکه استفاده نمایید</translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -2258,7 +2252,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation type="unfinished"/> </message> @@ -2328,7 +2327,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>تعیین مدت زمان وقفه (time out) به هزارم ثانیه</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2368,22 +2372,22 @@ Address: %4 <translation>ارتباطاتِ JSON-RPC را در <port> گوش کنید (پیش فرض:8332)</translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>ارتباطاتِ JSON-RPC را از آدرس آی.پی. مشخصی برقرار کنید.</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>دستورات را به گره اجرا شده در<ip> ارسال کنید (پیش فرض:127.0.0.1)</translation> </message> <message> - <location line="-89"/> + <location 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 line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>wallet را به جدیدترین نسخه روزآمد کنید</translation> </message> @@ -2398,7 +2402,7 @@ Address: %4 <translation>زنجیره بلاک را برای تراکنش جا افتاده در WALLET دوباره اسکن کنید</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation>چند بلاک در startup بررسی شوند (پیش فرض: 2500 و 0= همه)</translation> </message> @@ -2408,7 +2412,7 @@ Address: %4 <translation>چگونگی تایید تمامی بلاکها (پیش فرض: 1 و 0-6)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation type="unfinished"/> </message> @@ -2428,17 +2432,17 @@ Address: %4 <translation>رمز اختصاصی سرور (پیش فرض: server.pem)</translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>این پیام راهنما</translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation>قفل دایرکتوری داده ها %s قابل دریافت نیست. احتمال این وجود دارد که Bitcoin در حال اجرا باشد</translation> </message> @@ -2448,12 +2452,12 @@ Address: %4 <translation>bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> @@ -2463,12 +2467,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>لود شدن آدرسها..</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>خطا در هنگام لود شدن فایل blkindex.dat</translation> </message> @@ -2483,17 +2487,17 @@ Address: %4 <translation>خطا در هنگام لود شدن wallet.dat. به نسخه جدید Bitocin برای wallet نیاز است.</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>wallet نیاز به بازنویسی دارد. Bitcoin را برای تکمیل عملیات دوباره اجرا کنید.</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>خطا در هنگام لود شدن wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> @@ -2508,7 +2512,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2518,12 +2522,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> - <translation type="unfinished"/> + <translation>میزان اشتباه است for -paytxfee=<amount>: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"/> </message> @@ -2543,17 +2547,17 @@ Address: %4 <translation>خطا: ایجاد تراکنش امکان پذیر نیست</translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>در حال ارسال...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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 شما خرج شده باشند مثلا اگر wallet.dat را مپی کرده باشید و سکه های شما در آن کپی استفاده شده باشند اما در اینجا نمایش داده نشده اند.</translation> </message> <message> - <location line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation>میزان اشتباه است</translation> </message> @@ -2568,7 +2572,7 @@ Address: %4 <translation>لود شدن نمایه بلاکها..</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>یک گره برای اتصال اضافه کنید و تلاش کنید تا اتصال را باز نگاه دارید</translation> </message> @@ -2588,12 +2592,12 @@ Address: %4 <translation>هزینه بر اساس کیلو بایت برای اضافه شدن به تراکنشی که ارسال کرده اید</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>wallet در حال لود شدن است...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation>قابلیت برگشت به نسخه قبلی برای wallet امکان پذیر نیست</translation> </message> @@ -2608,22 +2612,22 @@ Address: %4 <translation>آدرس پیش فرض قابل ذخیره نیست</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>اسکنِ دوباره...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>اتمام لود شدن</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation>برای استفاده از %s از اختیارات</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts index 28da52d2e1..8b69f1b69c 100644 --- a/src/qt/locale/bitcoin_fi.ts +++ b/src/qt/locale/bitcoin_fi.ts @@ -13,15 +13,25 @@ <translation><b>Bitcoin</b> versio</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation>Copyright © 2009-2012 Bitcoin kehittäjät</translation> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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 type="unfinished"/> + <translation> +Tämä on kokeellinen ohjelmisto. + +Levitetään MIT/X11 ohjelmistolisenssin alaisuudessa. Tarkemmat tiedot löytyvät tiedostosta COPYING tai osoitteesta 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> </message> </context> <context> @@ -54,7 +64,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-46"/> <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> - <translation type="unfinished"/> + <translation>Nämä ovat Bitcoin-osoitteesi joihin voit vastaanottaa maksuja. Voit haluta antaa jokaiselle maksajalle omansa, että pystyt seuraamaan keneltä maksut tulevat.</translation> </message> <message> <location line="+60"/> @@ -69,7 +79,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+11"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Allekirjoita viesti todistaaksesi, että omistat Bitcoin-osoitteen</translation> </message> <message> <location line="+3"/> @@ -79,12 +89,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+11"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> - <translation type="unfinished"/> + <translation>Tarkista viestin allekirjoitus varmistaaksesi, että se allekirjoitettiin tietyllä Bitcoin-osoitteella</translation> </message> <message> <location line="+3"/> <source>&Verify Message</source> - <translation type="unfinished"/> + <translation>&Varmista viesti...</translation> </message> <message> <location line="+11"/> @@ -99,7 +109,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../addressbookpage.cpp" line="+65"/> <source>Copy &Label</source> - <translation type="unfinished"/> + <translation>Kopioi &Nimi</translation> </message> <message> <location line="+2"/> @@ -150,7 +160,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../forms/askpassphrasedialog.ui" line="+26"/> <source>Passphrase Dialog</source> - <translation type="unfinished"/> + <translation>Tunnuslause Dialogi</translation> </message> <message> <location line="+21"/> @@ -215,18 +225,18 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"/> + <translation>Varoitus: Jos salaat lompakkosi ja menetät tunnuslauseesi, tulet <b>MENETTÄMÄÄN KAIKKI BITCOINISI</b>!</translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> + <translation>Haluatko varmasti salata lompakkosi?</translation> </message> <message> <location line="+106"/> <location line="+24"/> <source>Warning: The Caps Lock key is on!</source> - <translation type="unfinished"/> + <translation>Varoitus: Caps Lock on aktiivinen!</translation> </message> <message> <location line="-121"/> @@ -278,28 +288,23 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"/> + <translation>Lompakon tunnuslause vaihdettiin onnistuneesti.</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>Näytä/Kätke &Bitcoin</translation> + <translation>&Allekirjoita viesti...</translation> </message> <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Synkronoidaan verkon kanssa...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Yleisnäkymä</translation> </message> @@ -374,9 +379,9 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Asetukset...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> - <translation type="unfinished"/> + <translation>&Salaa lompakko...</translation> </message> <message> <location line="+3"/> @@ -404,24 +409,24 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Vie...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation>Lähetä kolikoita Bitcoin-osoitteeseen</translation> </message> <message> <location line="+6"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Allekirjoita viesti todistaaksesi, että omistat Bitcoin-osoitteen</translation> </message> <message> <location line="+4"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> - <translation type="unfinished"/> + <translation>Tarkista viestin allekirjoitus varmistaaksesi, että se allekirjoitettiin tietyllä Bitcoin-osoitteella</translation> </message> <message> <location line="+4"/> <source>S&ignatures</source> - <translation type="unfinished"/> + <translation>Allek&irjoitukset</translation> </message> <message> <location line="+37"/> @@ -429,12 +434,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Muuta Bitcoinin konfiguraatioasetuksia</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>Näytä tai piillota Bitcoin-ikkuna</translation> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation>Vie auki olevan välilehden tiedot tiedostoon</translation> </message> @@ -456,7 +456,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>&Debug window</source> - <translation type="unfinished"/> + <translation>&Debug ikkuna</translation> </message> <message> <location line="+1"/> @@ -464,12 +464,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Avaa debuggaus- ja diagnostiikkakonsoli</translation> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> - <translation type="unfinished"/> + <translation>Varmista &viesti...</translation> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -479,12 +479,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Lompakko</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> - <translation type="unfinished"/> + <translation>Tieto&a Bitcoinista</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>&Näytä / Piilota</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>&Tiedosto</translation> </message> @@ -568,12 +573,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+59"/> <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>Tämä rahansiirto ylittää kokorajoituksen. Voit siitä huolimatta lähettää sen %1 siirtopalkkion mikä menee solmuille jotka käsittelevät rahansiirtosi tämä auttaa myös verkostoa. Haluatko maksaa siirtopalkkion? </translation> + <translation>Tämä rahansiirto ylittää kokorajoituksen. Voit siitä huolimatta lähettää sen maksamalla %1 siirtopalkkion, joka menee solmuille jotka käsittelevät rahansiirtosi ja auttaa näin verkon ylläpitoa. Haluatko maksaa siirtopalkkion?</translation> </message> <message> <location line="+5"/> <source>Confirm transaction fee</source> - <translation type="unfinished"/> + <translation>Vahvista maksukulu</translation> </message> <message> <location line="+27"/> @@ -601,13 +606,13 @@ Osoite: %4</translation> <location line="+120"/> <location line="+15"/> <source>URI handling</source> - <translation type="unfinished"/> + <translation>URI käsittely</translation> </message> <message> <location line="-15"/> <location line="+15"/> <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation type="unfinished"/> + <translation>URIa ei voitu jäsentää! Tämä voi johtua kelvottomasta Bitcoin-osoitteesta tai virheellisistä URI parametreista.</translation> </message> <message> <location line="+16"/> @@ -640,15 +645,15 @@ Osoite: %4</translation> <translation>Virhe tallennettaessa lompakkodataa uuteen sijaintiin.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> - <translation type="unfinished"/> + <translation>Peruuttamaton virhe on tapahtunut. Bitcoin ei voi enää jatkaa turvallisesti ja sammutetaan.</translation> </message> </context> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation>Verkkohälytys</translation> </message> @@ -724,10 +729,10 @@ Osoite: %4</translation> <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> - <translation type="unfinished"/> + <translation>Bitcoin-Qt</translation> </message> <message> <location line="-12"/> @@ -742,7 +747,7 @@ Osoite: %4</translation> <message> <location line="+1"/> <source>command-line options</source> - <translation type="unfinished"/> + <translation>komentorivi parametrit</translation> </message> <message> <location line="+4"/> @@ -775,7 +780,7 @@ Osoite: %4</translation> <message> <location line="+16"/> <source>&Main</source> - <translation type="unfinished"/> + <translation>&Yleiset</translation> </message> <message> <location line="+6"/> @@ -790,7 +795,7 @@ Osoite: %4</translation> <message> <location line="+31"/> <source>Automatically start Bitcoin after logging in to the system.</source> - <translation type="unfinished"/> + <translation>Käynnistä Bitcoin kirjautumisen yhteydessä.</translation> </message> <message> <location line="+3"/> @@ -800,12 +805,12 @@ Osoite: %4</translation> <message> <location line="+7"/> <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>Irroita lohko- ja osoite-tietokannat sammuttaessa. Tämä hidastaa sammutusta, mutta mahdollistaa tietokantojen kopioimisen toiselle koneelle. Lompakko irroitetaan aina.</translation> </message> <message> <location line="+3"/> <source>&Detach databases at shutdown</source> - <translation type="unfinished"/> + <translation>&Irroita tietokannat sammutuksen yhteydessä</translation> </message> <message> <location line="+21"/> @@ -825,7 +830,7 @@ Osoite: %4</translation> <message> <location line="+7"/> <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source> - <translation type="unfinished"/> + <translation>Ota yhteys Bitcoin-verkkoon SOCKS-proxyn läpi (esimerkiksi kun haluat käyttää Tor-verkkoa).</translation> </message> <message> <location line="+3"/> @@ -870,7 +875,7 @@ Osoite: %4</translation> <message> <location line="+6"/> <source>Show only a tray icon after minimizing the window.</source> - <translation type="unfinished"/> + <translation>Näytä ainoastaan ilmaisinalueella ikkunan pienentämisen jälkeen.</translation> </message> <message> <location line="+3"/> @@ -885,12 +890,12 @@ Osoite: %4</translation> <message> <location line="+3"/> <source>M&inimize on close</source> - <translation type="unfinished"/> + <translation>P&ienennä suljettaessa</translation> </message> <message> <location line="+21"/> <source>&Display</source> - <translation type="unfinished"/> + <translation>&Käyttöliittymä</translation> </message> <message> <location line="+8"/> @@ -905,27 +910,27 @@ Osoite: %4</translation> <message> <location line="+11"/> <source>&Unit to show amounts in:</source> - <translation type="unfinished"/> + <translation>Yksikkö jona bitcoin-määrät näytetään</translation> </message> <message> <location line="+13"/> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation type="unfinished"/> + <translation>Valitse mitä yksikköä käytetään ensisijaisesti bitcoin-määrien näyttämiseen.</translation> </message> <message> <location line="+9"/> <source>Whether to show Bitcoin addresses in the transaction list or not.</source> - <translation type="unfinished"/> + <translation>Näytetäänkö Bitcoin-osoitteet rahansiirrot listassa vai ei.</translation> </message> <message> <location line="+3"/> <source>&Display addresses in transaction list</source> - <translation type="unfinished"/> + <translation>&Näytä osoitteet rahansiirrot listassa</translation> </message> <message> <location line="+71"/> <source>&OK</source> - <translation type="unfinished"/> + <translation>&OK</translation> </message> <message> <location line="+7"/> @@ -943,7 +948,7 @@ Osoite: %4</translation> <translation>oletus</translation> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation>Varoitus</translation> @@ -971,7 +976,7 @@ Osoite: %4</translation> <location line="+33"/> <location line="+183"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> - <translation type="unfinished"/> + <translation>Näytetyt tiedot eivät välttämättä ole ajantasalla. Lompakkosi synkronoituu Bitcoin-verkon kanssa automaattisesti yhteyden muodostamisen jälkeen, mutta synkronointi on vielä meneillään.</translation> </message> <message> <location line="-141"/> @@ -996,12 +1001,12 @@ Osoite: %4</translation> <message> <location line="+124"/> <source>Immature:</source> - <translation type="unfinished"/> + <translation>Epäkypsää:</translation> </message> <message> <location line="+13"/> <source>Mined balance that has not yet matured</source> - <translation type="unfinished"/> + <translation>Louhittu saldo, joka ei ole vielä kypsynyt</translation> </message> <message> <location line="+46"/> @@ -1027,7 +1032,7 @@ Osoite: %4</translation> <location filename="../overviewpage.cpp" line="+112"/> <location line="+1"/> <source>out of sync</source> - <translation type="unfinished"/> + <translation>Ei ajan tasalla</translation> </message> </context> <context> @@ -1035,7 +1040,7 @@ Osoite: %4</translation> <message> <location filename="../forms/qrcodedialog.ui" line="+14"/> <source>QR Code Dialog</source> - <translation type="unfinished"/> + <translation>QR-koodi Dialogi</translation> </message> <message> <location line="+59"/> @@ -1070,7 +1075,7 @@ Osoite: %4</translation> <message> <location line="+40"/> <source>The entered amount is invalid, please check.</source> - <translation type="unfinished"/> + <translation>Syötetty määrä on virheellinen. Tarkista kirjoitusasu.</translation> </message> <message> <location line="+23"/> @@ -1105,7 +1110,7 @@ Osoite: %4</translation> <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation>Ei saatavilla</translation> </message> @@ -1117,17 +1122,17 @@ Osoite: %4</translation> <message> <location line="-45"/> <source>&Information</source> - <translation type="unfinished"/> + <translation>T&ietoa</translation> </message> <message> <location line="+68"/> <source>Using OpenSSL version</source> - <translation type="unfinished"/> + <translation>Käytössä oleva OpenSSL-versio</translation> </message> <message> <location line="+49"/> <source>Startup time</source> - <translation type="unfinished"/> + <translation>Käynnistysaika</translation> </message> <message> <location line="+29"/> @@ -1142,27 +1147,27 @@ Osoite: %4</translation> <message> <location line="+23"/> <source>On testnet</source> - <translation type="unfinished"/> + <translation>Käyttää testiverkkoa</translation> </message> <message> <location line="+23"/> <source>Block chain</source> - <translation type="unfinished"/> + <translation>Lohkoketju</translation> </message> <message> <location line="+7"/> <source>Current number of blocks</source> - <translation type="unfinished"/> + <translation>Nykyinen Lohkojen määrä</translation> </message> <message> <location line="+23"/> <source>Estimated total blocks</source> - <translation type="unfinished"/> + <translation>Arvioitu lohkojen kokonaismäärä</translation> </message> <message> <location line="+23"/> <source>Last block time</source> - <translation type="unfinished"/> + <translation>Viimeisimmän lohkon aika</translation> </message> <message> <location line="+52"/> @@ -1172,17 +1177,17 @@ Osoite: %4</translation> <message> <location line="+16"/> <source>Command-line options</source> - <translation type="unfinished"/> + <translation>Komentorivi parametrit</translation> </message> <message> <location line="+7"/> <source>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</source> - <translation type="unfinished"/> + <translation>Näytä Bitcoin-Qt komentoriviparametrien ohjesivu, jossa on listattuna mahdolliset komentoriviparametrit.</translation> </message> <message> <location line="+3"/> <source>&Show</source> - <translation type="unfinished"/> + <translation>&Näytä</translation> </message> <message> <location line="+24"/> @@ -1192,27 +1197,27 @@ Osoite: %4</translation> <message> <location line="-260"/> <source>Build date</source> - <translation type="unfinished"/> + <translation>Kääntöpäiväys</translation> </message> <message> <location line="-104"/> <source>Bitcoin - Debug window</source> - <translation type="unfinished"/> + <translation>Bitcoin - Debug ikkuna</translation> </message> <message> <location line="+25"/> <source>Bitcoin Core</source> - <translation type="unfinished"/> + <translation>Bitcoin-ydin</translation> </message> <message> <location line="+279"/> <source>Debug log file</source> - <translation type="unfinished"/> + <translation>Debug lokitiedosto</translation> </message> <message> <location line="+7"/> <source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source> - <translation type="unfinished"/> + <translation>Avaa lokitiedosto nykyisestä data-kansiosta. Tämä voi viedä useamman sekunnin, jos lokitiedosto on iso.</translation> </message> <message> <location line="+102"/> @@ -1222,12 +1227,12 @@ Osoite: %4</translation> <message> <location filename="../rpcconsole.cpp" line="-33"/> <source>Welcome to the Bitcoin RPC console.</source> - <translation type="unfinished"/> + <translation>Tervetuloa Bitcoin RPC konsoliin.</translation> </message> <message> <location line="+1"/> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> - <translation type="unfinished"/> + <translation>Ylös- ja alas-nuolet selaavat historiaa ja <b>Ctrl-L</b> tyhjentää ruudun.</translation> </message> <message> <location line="+1"/> @@ -1239,7 +1244,7 @@ Osoite: %4</translation> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1312,7 +1317,7 @@ Osoite: %4</translation> <message> <location line="+23"/> <source>The recipient address is not valid, please recheck.</source> - <translation type="unfinished"/> + <translation>Vastaanottajan osoite on virheellinen. Tarkista osoite.</translation> </message> <message> <location line="+5"/> @@ -1322,27 +1327,27 @@ Osoite: %4</translation> <message> <location line="+5"/> <source>The amount exceeds your balance.</source> - <translation type="unfinished"/> + <translation>Määrä ylittää käytettävissä olevan saldon.</translation> </message> <message> <location line="+5"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation type="unfinished"/> + <translation>Kokonaismäärä ylittää saldosi kun %1 maksukulu lisätään summaan.</translation> </message> <message> <location line="+6"/> <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation type="unfinished"/> + <translation>Sama osoite toistuu useamman kerran. Samaan osoitteeseen voi lähettää vain kerran per maksu.</translation> </message> <message> <location line="+5"/> <source>Error: Transaction creation failed.</source> - <translation type="unfinished"/> + <translation>Virhe: Rahansiirron luonti epäonnistui</translation> </message> <message> <location line="+5"/> <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>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> </context> <context> @@ -1414,7 +1419,7 @@ Osoite: %4</translation> <message> <location filename="../forms/signverifymessagedialog.ui" line="+14"/> <source>Signatures - Sign / Verify a Message</source> - <translation type="unfinished"/> + <translation>Allekirjoitukset - Allekirjoita / Varmista viesti</translation> </message> <message> <location line="+13"/> @@ -1430,19 +1435,19 @@ Osoite: %4</translation> <message> <location line="+18"/> <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Osoite, jolla viesti allekirjoitetaan (esimerkiksi 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+10"/> <location line="+203"/> <source>Choose an address from the address book</source> - <translation type="unfinished"/> + <translation>Valitse osoite osoitekirjasta</translation> </message> <message> <location line="-193"/> <location line="+203"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location line="-193"/> @@ -1452,7 +1457,7 @@ Osoite: %4</translation> <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location line="+12"/> @@ -1467,12 +1472,12 @@ Osoite: %4</translation> <message> <location line="+21"/> <source>Sign the message to prove you own this Bitcoin address</source> - <translation type="unfinished"/> + <translation>Allekirjoita viesti todistaaksesi, että omistat tämän Bitcoin-osoitteen</translation> </message> <message> <location line="+17"/> <source>Reset all sign message fields</source> - <translation type="unfinished"/> + <translation>Tyhjennä kaikki allekirjoita-viesti-kentät</translation> </message> <message> <location line="+3"/> @@ -1484,27 +1489,27 @@ Osoite: %4</translation> <location line="-87"/> <location line="+70"/> <source>&Verify Message</source> - <translation type="unfinished"/> + <translation>&Varmista viesti</translation> </message> <message> <location line="-64"/> <source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source> - <translation type="unfinished"/> + <translation>Syötä allekirjoittava osoite, viesti ja allekirjoitus alla oleviin kenttiin varmistaaksesi allekirjoituksen aitouden. Varmista että kopioit kaikki kentät täsmälleen oikein, myös rivinvaihdot, välilyönnit, tabulaattorit, jne.</translation> </message> <message> <location line="+21"/> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Osoite, jolla viesti allekirjoitettiin (esimerkiksi 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+40"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> - <translation type="unfinished"/> + <translation>Tarkista viestin allekirjoitus varmistaaksesi, että se allekirjoitettiin tietyllä Bitcoin-osoitteella</translation> </message> <message> <location line="+17"/> <source>Reset all verify message fields</source> - <translation type="unfinished"/> + <translation>Tyhjennä kaikki varmista-viesti-kentät</translation> </message> <message> <location filename="../signverifymessagedialog.cpp" line="+27"/> @@ -1515,18 +1520,18 @@ Osoite: %4</translation> <message> <location line="-2"/> <source>Click "Sign Message" to generate signature</source> - <translation type="unfinished"/> + <translation>Klikkaa "Allekirjoita Viesti luodaksesi allekirjoituksen </translation> </message> <message> <location line="+3"/> <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> + <translation>Syötä Bitcoin-allekirjoitus</translation> </message> <message> <location line="+82"/> <location line="+81"/> <source>The entered address is invalid.</source> - <translation type="unfinished"/> + <translation>Syötetty osoite on virheellinen.</translation> </message> <message> <location line="-81"/> @@ -1534,59 +1539,59 @@ Osoite: %4</translation> <location line="+73"/> <location line="+8"/> <source>Please check the address and try again.</source> - <translation type="unfinished"/> + <translation>Tarkista osoite ja yritä uudelleen.</translation> </message> <message> <location line="-81"/> <location line="+81"/> <source>The entered address does not refer to a key.</source> - <translation type="unfinished"/> + <translation>Syötetyn osoitteen avainta ei löydy.</translation> </message> <message> <location line="-73"/> <source>Wallet unlock was cancelled.</source> - <translation type="unfinished"/> + <translation>Lompakon avaaminen peruttiin.</translation> </message> <message> <location line="+8"/> <source>Private key for the entered address is not available.</source> - <translation type="unfinished"/> + <translation>Yksityistä avainta syötetylle osoitteelle ei ole saatavilla.</translation> </message> <message> <location line="+12"/> <source>Message signing failed.</source> - <translation type="unfinished"/> + <translation>Viestin allekirjoitus epäonnistui.</translation> </message> <message> <location line="+5"/> <source>Message signed.</source> - <translation type="unfinished"/> + <translation>Viesti allekirjoitettu.</translation> </message> <message> <location line="+59"/> <source>The signature could not be decoded.</source> - <translation type="unfinished"/> + <translation>Allekirjoitusta ei pystytty tulkitsemaan.</translation> </message> <message> <location line="+0"/> <location line="+13"/> <source>Please check the signature and try again.</source> - <translation type="unfinished"/> + <translation>Tarkista allekirjoitus ja yritä uudelleen.</translation> </message> <message> <location line="+0"/> <source>The signature did not match the message digest.</source> - <translation type="unfinished"/> + <translation>Allekirjoitus ei täsmää viestin tiivisteeseen.</translation> </message> <message> <location line="+7"/> <source>Message verification failed.</source> - <translation type="unfinished"/> + <translation>Viestin varmistus epäonnistui.</translation> </message> <message> <location line="+5"/> <source>Message verified.</source> - <translation type="unfinished"/> + <translation>Viesti varmistettu.</translation> </message> </context> <context> @@ -1599,12 +1604,12 @@ Osoite: %4</translation> <message numerus="yes"> <location line="-2"/> <source>Open for %n block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>Auki %n lohkon ajan</numerusform><numerusform>Auki %n lohkon ajan</numerusform></translation> </message> <message> <location line="+8"/> <source>%1/offline</source> - <translation type="unfinished"/> + <translation>%1/offline</translation> </message> <message> <location line="+2"/> @@ -1619,12 +1624,12 @@ Osoite: %4</translation> <message> <location line="+18"/> <source>Status</source> - <translation type="unfinished"/> + <translation>Tila</translation> </message> <message numerus="yes"> <location line="+7"/> <source>, broadcast through %n node(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>lähetetty %n noodin läpi</numerusform><numerusform>lähetetty %n noodin läpi</numerusform></translation> </message> <message> <location line="+4"/> @@ -1634,36 +1639,36 @@ Osoite: %4</translation> <message> <location line="+7"/> <source>Source</source> - <translation type="unfinished"/> + <translation>Lähde</translation> </message> <message> <location line="+0"/> <source>Generated</source> - <translation type="unfinished"/> + <translation>Generoitu</translation> </message> <message> <location line="+6"/> <location line="+17"/> <source>From</source> - <translation type="unfinished"/> + <translation>Lähettäjä</translation> </message> <message> <location line="+1"/> <location line="+22"/> <location line="+58"/> <source>To</source> - <translation type="unfinished"/> + <translation>Saaja</translation> </message> <message> <location line="-77"/> <location line="+2"/> <source>own address</source> - <translation type="unfinished"/> + <translation>oma osoite</translation> </message> <message> <location line="-2"/> <source>label</source> - <translation type="unfinished"/> + <translation>nimi</translation> </message> <message> <location line="+37"/> @@ -1672,17 +1677,17 @@ Osoite: %4</translation> <location line="+17"/> <location line="+30"/> <source>Credit</source> - <translation type="unfinished"/> + <translation>Credit</translation> </message> <message numerus="yes"> <location line="-102"/> <source>matures in %n more block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>kypsyy %n lohkon kuluttua</numerusform><numerusform>kypsyy %n lohkon kuluttua</numerusform></translation> </message> <message> <location line="+2"/> <source>not accepted</source> - <translation type="unfinished"/> + <translation>ei hyväksytty</translation> </message> <message> <location line="+44"/> @@ -1690,17 +1695,17 @@ Osoite: %4</translation> <location line="+15"/> <location line="+30"/> <source>Debit</source> - <translation type="unfinished"/> + <translation>Debit</translation> </message> <message> <location line="-39"/> <source>Transaction fee</source> - <translation type="unfinished"/> + <translation>Maksukulu</translation> </message> <message> <location line="+16"/> <source>Net amount</source> - <translation type="unfinished"/> + <translation>Netto määrä</translation> </message> <message> <location line="+6"/> @@ -1710,32 +1715,32 @@ Osoite: %4</translation> <message> <location line="+2"/> <source>Comment</source> - <translation type="unfinished"/> + <translation>Viesti</translation> </message> <message> <location line="+2"/> <source>Transaction ID</source> - <translation type="unfinished"/> + <translation>Siirtotunnus</translation> </message> <message> <location line="+3"/> <source>Generated coins must mature 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, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> + <translation>Generoitujen kolikoiden täytyy kypsyä 120 lohkon ajan ennen kuin ne voidaan lähettää. Kun loit tämän lohkon, se lähetettiin verkkoon lisättäväksi lohkoketjuun. Jos se ei päädy osaksi lohkoketjua, sen tila vaihtuu "ei hyväksytty" ja sitä ei voida lähettää. Näin voi joskus käydä, jos toinen noodi löytää lohkon muutamaa sekuntia ennen tai jälkeen sinun lohkosi löytymisen.</translation> </message> <message> <location line="+7"/> <source>Debug information</source> - <translation type="unfinished"/> + <translation>Debug tiedot</translation> </message> <message> <location line="+8"/> <source>Transaction</source> - <translation type="unfinished"/> + <translation>Rahansiirto</translation> </message> <message> <location line="+5"/> <source>Inputs</source> - <translation type="unfinished"/> + <translation>Sisääntulot</translation> </message> <message> <location line="+23"/> @@ -1745,12 +1750,12 @@ Osoite: %4</translation> <message> <location line="+1"/> <source>true</source> - <translation type="unfinished"/> + <translation>tosi</translation> </message> <message> <location line="+0"/> <source>false</source> - <translation type="unfinished"/> + <translation>epätosi</translation> </message> <message> <location line="-212"/> @@ -1826,7 +1831,7 @@ Osoite: %4</translation> <message numerus="yes"> <location line="+8"/> <source>Mined balance will be available when it matures in %n more block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>Louhittu saldo on käytettävissä kun se kypsyy %n lohkon päästä</numerusform><numerusform>Louhittu saldo on käytettävissä kun se kypsyy %n lohkon päästä</numerusform></translation> </message> <message> <location line="+5"/> @@ -1990,7 +1995,7 @@ Osoite: %4</translation> <message> <location line="+1"/> <source>Show transaction details</source> - <translation type="unfinished"/> + <translation>Näytä rahansiirron yksityiskohdat</translation> </message> <message> <location line="+142"/> @@ -2074,7 +2079,7 @@ Osoite: %4</translation> <translation>Bitcoinin versio</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Käyttö:</translation> </message> @@ -2089,12 +2094,12 @@ Osoite: %4</translation> <translation>Lista komennoista</translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Hanki apua käskyyn</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Asetukset:</translation> </message> @@ -2109,7 +2114,7 @@ Osoite: %4</translation> <translation>Määritä pid-tiedosto (oletus: bitcoin.pid)</translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Generoi kolikoita</translation> </message> @@ -2119,7 +2124,7 @@ Osoite: %4</translation> <translation>Älä generoi kolikoita</translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Määritä data-hakemisto</translation> </message> @@ -2134,12 +2139,7 @@ Osoite: %4</translation> <translation>Aseta tietokannan lokitiedoston koko megatavuina (oletus: 100)</translation> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Määritä yhteyden aikakatkaisu (millisekunneissa)</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Kuuntele yhteyksiä portista <port> (oletus: 8333 tai testnet: 18333)</translation> </message> @@ -2149,34 +2149,34 @@ Osoite: %4</translation> <translation>Pidä enintään <n> yhteyttä verkkoihin (oletus: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation type="unfinished"/> + <translation>Yhdistä noodiin hakeaksesi naapurien osoitteet ja katkaise yhteys</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> - <translation type="unfinished"/> + <translation>Määritä julkinen osoitteesi</translation> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> - <translation type="unfinished"/> + <translation>Kytkeydy annettuun osoitteeseen. Käytä [host]:port notaatiota IPv6:lle</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Kynnysarvo aikakatkaisulle heikosti toimiville verkoille (oletus: 100)</translation> </message> <message> - <location line="-104"/> + <location line="-105"/> <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 line="-12"/> <source>Detach block and address databases. Increases shutdown time (default: 0)</source> - <translation type="unfinished"/> + <translation>Irroita lohko ja osoite-tietokannat. Pidentää sammutus-aikaa (vakioasetus: 0)</translation> </message> <message> <location line="+34"/> @@ -2184,7 +2184,7 @@ Osoite: %4</translation> <translation>Hyväksy merkkipohjaiset- ja JSON-RPC-käskyt</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation>Aja taustalla daemonina ja hyväksy komennot</translation> </message> @@ -2194,89 +2194,94 @@ Osoite: %4</translation> <translation>Käytä test -verkkoa</translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation type="unfinished"/> + <translation>Hyväksy yhteyksiä ulkopuolelta (vakioasetus: 1 jos -proxy tai -connect ei määritelty)</translation> </message> <message> <location line="-20"/> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> - <translation type="unfinished"/> + <translation>Aseta suurin korkean prioriteetin / matalan palkkion siirron koko tavuissa (vakioasetus: 27000)</translation> </message> <message> <location line="+5"/> <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>Varoitus: -paytxfee on asetettu erittäin korkeaksi! Tämä on maksukulu jonka tulet maksamaan kun lähetät siirron.</translation> </message> <message> <location line="+3"/> <source>Warning: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation type="unfinished"/> + <translation>Varoitus: Näytetyt siirrot eivät välttämättä pidä paikkaansa! Sinun tai toisten noodien voi olla tarpeen asentaa päivitys.</translation> </message> <message> <location line="+3"/> <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>Varoitus: Tarkista että tietokoneesi kellonaika ja päivämäärä ovat paikkansapitäviä! Bitcoin ei toimi oikein väärällä päivämäärällä ja/tai kellonajalla.</translation> </message> <message> <location line="+13"/> <source>An error occurred while setting up the RPC port %i for listening: %s</source> - <translation type="unfinished"/> + <translation>Virhe valmisteltaessa RPC-portin %i avaamista kuunneltavaksi: %s</translation> </message> <message> <location line="+4"/> <source>Block creation options:</source> - <translation type="unfinished"/> + <translation>Lohkon luonnin asetukset:</translation> </message> <message> <location line="+6"/> <source>Connect only to the specified node(s)</source> - <translation type="unfinished"/> + <translation>Yhidstä ainoastaan määrättyihin noodeihin</translation> </message> <message> <location line="+3"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation type="unfinished"/> + <translation>Hae oma IP osoite (vakioasetus: 1 kun kuuntelemassa ja ei -externalip)</translation> </message> <message> <location line="+11"/> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> - <translation type="unfinished"/> + <translation>Ei onnistuttu kuuntelemaan missään portissa. Käytä -listen=0 jos haluat tätä.</translation> </message> <message> <location line="+2"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> - <translation type="unfinished"/> + <translation>Hae naapureita DNS hauilla (vakioasetus: 1 paitsi jos -connect)</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation>Tuodaan lohkoja...</translation> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> - <translation type="unfinished"/> + <translation>Virheellinen -tor osoite '%s'</translation> </message> <message> <location line="+10"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> - <translation type="unfinished"/> + <translation>Suurin vastaanottopuskuri yksittäiselle yhteydelle, <n>*1000 tavua (vakioasetus: 5000)</translation> </message> <message> <location line="+1"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</source> - <translation type="unfinished"/> + <translation>Suurin lähetyspuskuri yksittäiselle yhteydelle, <n>*1000 tavua (vakioasetus: 1000)</translation> </message> <message> <location line="+1"/> <source>Only connect to nodes in network <net> (IPv4, IPv6 or Tor)</source> - <translation type="unfinished"/> + <translation>Yhdistä vain noodeihin verkossa <net> (IPv4, IPv6 tai Tor)</translation> </message> <message> <location line="+2"/> <source>Output extra debugging information. Implies all other -debug* options</source> - <translation type="unfinished"/> + <translation>Tulosta enemmän debug tietoa. Aktivoi kaikki -debug* asetukset</translation> </message> <message> <location line="+1"/> <source>Output extra network debugging information</source> - <translation type="unfinished"/> + <translation>Tulosta lisää verkkoyhteys debug tietoa</translation> </message> <message> <location line="+2"/> @@ -2286,12 +2291,12 @@ Osoite: %4</translation> <message> <location line="+4"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation type="unfinished"/> + <translation>SSL asetukset (katso Bitcoin Wikistä tarkemmat SSL ohjeet)</translation> </message> <message> <location line="+1"/> <source>Select the version of socks proxy to use (4-5, default: 5)</source> - <translation type="unfinished"/> + <translation>Valitse käytettävän SOCKS-proxyn versio (4-5, vakioasetus: 5)</translation> </message> <message> <location line="+3"/> @@ -2306,32 +2311,37 @@ Osoite: %4</translation> <message> <location line="+7"/> <source>Set maximum block size in bytes (default: 250000)</source> - <translation type="unfinished"/> + <translation>Aseta suurin lohkon koko tavuissa (vakioasetus: 250000)</translation> </message> <message> <location line="+1"/> <source>Set minimum block size in bytes (default: 0)</source> - <translation type="unfinished"/> + <translation>Asetan pienin lohkon koko tavuissa (vakioasetus: 0)</translation> </message> <message> <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation type="unfinished"/> + <translation>Pienennä debug.log tiedosto käynnistyksen yhteydessä (vakioasetus: 1 kun ei -debug)</translation> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>Määritä yhteyden aikakataisu millisekunneissa (vakioasetus: 5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> - <translation type="unfinished"/> + <translation>Käytä UPnP:tä kuunneltavan portin avaamiseen (vakioasetus: 0)</translation> </message> <message> <location line="+1"/> <source>Use UPnP to map the listening port (default: 1 when listening)</source> - <translation type="unfinished"/> + <translation>Käytä UPnP:tä kuunneltavan portin avaamiseen (vakioasetus: 1 kun kuuntelemassa)</translation> </message> <message> <location line="+1"/> <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation type="unfinished"/> + <translation>Käytä proxyä tor yhteyksien avaamiseen (vakioasetus: sama kuin -proxy)</translation> </message> <message> <location line="+2"/> @@ -2341,12 +2351,12 @@ Osoite: %4</translation> <message> <location line="+2"/> <source>Warning: Disk space is low!</source> - <translation type="unfinished"/> + <translation>Varoitus: Levytila on vähissä!</translation> </message> <message> <location line="+1"/> <source>Warning: This version is obsolete, upgrade required!</source> - <translation type="unfinished"/> + <translation>Varoitus: Tämä versio on vanhentunut, päivitys tarpeen!</translation> </message> <message> <location line="-41"/> @@ -2359,22 +2369,22 @@ Osoite: %4</translation> <translation>Kuuntele JSON-RPC -yhteyksiä portista <port> (oletus: 8332)</translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Salli JSON-RPC yhteydet tietystä ip-osoitteesta</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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 line="-89"/> + <location 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 line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>Päivitä lompakko uusimpaan formaattiin</translation> </message> @@ -2389,7 +2399,7 @@ Osoite: %4</translation> <translation>Skannaa uudelleen lohkoketju lompakon puuttuvien rahasiirtojen vuoksi</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <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> @@ -2399,9 +2409,9 @@ Osoite: %4</translation> <translation>Kuinka tiukka lohkovarmistus on (0-6, oletus: 1)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> - <translation type="unfinished"/> + <translation>Tuo lohkoja ulkoisesta blk000?.dat tiedostosta</translation> </message> <message> <location line="+52"/> @@ -2419,18 +2429,18 @@ Osoite: %4</translation> <translation>Palvelimen yksityisavain (oletus: server.pem)</translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Tämä ohjeviesti</translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <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> @@ -2440,27 +2450,27 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> - <translation type="unfinished"/> + <translation>Kytkeytyminen %s tällä tietokonella ei onnistu (kytkeytyminen palautti virheen %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> - <translation type="unfinished"/> + <translation>Yhdistä socks proxyn läpi</translation> </message> <message> <location line="-13"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation type="unfinished"/> + <translation>Salli DNS kyselyt -addnode, -seednode ja -connect yhteydessä</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Ladataan osoitteita...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>Virhe ladattaessa blkindex.dat-tiedostoa</translation> </message> @@ -2475,49 +2485,49 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> <translation>Virhe ladattaessa wallet.dat-tiedostoa: Tarvitset uudemman version Bitcoinista</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Lompakko tarvitsee uudelleenkirjoittaa: käynnistä Bitcoin uudelleen</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>Virhe ladattaessa wallet.dat-tiedostoa</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> - <translation type="unfinished"/> + <translation>Virheellinen proxy-osoite '%s'</translation> </message> <message> <location line="+47"/> <source>Unknown network specified in -onlynet: '%s'</source> - <translation type="unfinished"/> + <translation>Tuntematon verkko -onlynet parametrina: '%s'</translation> </message> <message> <location line="-1"/> <source>Unknown -socks proxy version requested: %i</source> - <translation type="unfinished"/> + <translation>Tuntematon -socks proxy versio pyydetty: %i</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> - <translation type="unfinished"/> + <translation>-bind osoitteen '%s' selvittäminen epäonnistui</translation> </message> <message> <location line="+1"/> <source>Cannot resolve -externalip address: '%s'</source> - <translation type="unfinished"/> + <translation>-externalip osoitteen '%s' selvittäminen epäonnistui</translation> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> - <translation type="unfinished"/> + <translation>-paytxfee=<amount>: '%s' on virheellinen</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> - <translation type="unfinished"/> + <translation>Virhe: ei pystytty käynnistämään noodia.</translation> </message> <message> <location line="-1"/> @@ -2535,17 +2545,17 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> <translation>Virhe: Rahansiirron luonti epäonnistui</translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Lähetetään...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation>Virheellinen määrä</translation> </message> @@ -2560,14 +2570,14 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> <translation>Ladataan lohkoindeksiä...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <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 line="-18"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"/> + <translation>Kytkeytyminen %s ei onnistu tällä tietokoneella. Bitcoin on todennäköisesti jo ajamassa.</translation> </message> <message> <location line="+48"/> @@ -2580,12 +2590,12 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> <translation>Rahansiirtopalkkio per KB lisätään lähettämääsi rahansiirtoon</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Ladataan lompakkoa...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation>Et voi päivittää lompakkoasi vanhempaan versioon</translation> </message> @@ -2600,22 +2610,22 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> <translation>Oletusosoitetta ei voi kirjoittaa</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Skannataan uudelleen...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Lataus on valmis</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation>Käytä %s optiota</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts index de59fb87b1..3937e4f205 100644 --- a/src/qt/locale/bitcoin_fr.ts +++ b/src/qt/locale/bitcoin_fr.ts @@ -13,21 +13,24 @@ <translation><b>Bitcoin</b> version</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation>Copyright © 2009-2012, les développeurs Bitcoin</translation> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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 Développeurs de Bitcoin + <translation> + Ce logiciel est en phase expérimentale. -Ce logiciel est en phase expérimentale. + Distribué sous licence MIT/X11, voir le fichier COPYING ou http://www.opensource.org/licenses/mit-license.php. -Distribué sous licence MIT/X11, voir le fichier COPYING ou http://www.opensource.org/licenses/mit-license.php. - -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> + Ce produit comprend des fonctionnalités développées 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 des fonctionnalités développées pour le logiciel UPnP écrit par Thomas Bernard.</translation> </message> </context> <context> @@ -130,7 +133,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <message> <location line="+0"/> <source>Could not write to file %1.</source> - <translation>Impossible d'écrire sur le fichier %1.</translation> + <translation>Impossible d'écrire dans le fichier %1.</translation> </message> </context> <context> @@ -176,7 +179,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <message> <location filename="../askpassphrasedialog.cpp" line="+33"/> <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>Entrez une nouvelle phrase de passe pour le porte-monnaie.<br/>Veuillez utiliser une phrase de <b>10 caractères au hasard ou plus</b> ou bien de <b>huit mots ou plus</b>.</translation> + <translation>Entrez une nouvelle phrase de passe pour le porte-monnaie.<br/>Veuillez utiliser une phrase composée de <b>10 caractères aléatoires ou plus</b>, ou bien de <b>huit mots ou plus</b>.</translation> </message> <message> <location line="+1"/> @@ -201,7 +204,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <message> <location line="+5"/> <source>Decrypt wallet</source> - <translation>Décrypter le porte-monnaie</translation> + <translation>Déchiffrer le porte-monnaie</translation> </message> <message> <location line="+3"/> @@ -221,7 +224,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation>Attention : Si vous chiffrez votre porte-monnaie et perdez votre phrase de passe, vous <b>PERDREZ TOUS VOS BITCOINS</b> !</translation> + <translation>Attention : Si vous chiffrez votre porte-monnaie et perdez votre phrase de passe, vous <b>PERDREZ ACCÈS À TOUS VOS BITCOINS</b> !</translation> </message> <message> <location line="+0"/> @@ -232,7 +235,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <location line="+106"/> <location line="+24"/> <source>Warning: The Caps Lock key is on!</source> - <translation>Attention : la touche Verrouiller Maj est activée !</translation> + <translation>Attention : la touche Verr. Maj. est activée !</translation> </message> <message> <location line="-121"/> @@ -279,7 +282,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <message> <location line="-20"/> <source>Wallet decryption failed</source> - <translation>Le décryptage du porte-monnaie a échoué</translation> + <translation>Le déchiffrage du porte-monnaie a échoué</translation> </message> <message> <location line="+14"/> @@ -290,29 +293,24 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation>Signer un &message...</translation> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>Afficher/Cacher &Bitcoin</translation> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> - <translation>Synchronisation avec le réseau...</translation> + <translation>Synchronisation avec le réseau…</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Vue d'ensemble</translation> </message> <message> <location line="+1"/> <source>Show general overview of wallet</source> - <translation>Afficher une vue d'ensemble du porte-monnaie</translation> + <translation>Afficher une vue d’ensemble du porte-monnaie</translation> </message> <message> <location line="+5"/> @@ -327,7 +325,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <message> <location line="+5"/> <source>&Address Book</source> - <translation>Carnet d'&adresses</translation> + <translation>Carnet d’&adresses</translation> </message> <message> <location line="+1"/> @@ -357,7 +355,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <message> <location line="+1"/> <source>Quit application</source> - <translation>Quitter l'application</translation> + <translation>Quitter l’application</translation> </message> <message> <location line="+4"/> @@ -377,10 +375,10 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <message> <location line="+2"/> <source>&Options...</source> - <translation>&Options...</translation> + <translation>&Options…</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation>&Chiffrer le porte-monnaie...</translation> </message> @@ -407,10 +405,10 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <message> <location line="-254"/> <source>&Export...</source> - <translation>&Exporter...</translation> + <translation>&Exporter…</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation>Envoyer des pièces à une adresse Bitcoin</translation> </message> @@ -435,19 +433,14 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <translation>Modifier les options de configuration de Bitcoin</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>Afficher ou cacher la fenêtre Bitcoin</translation> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <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 line="+2"/> <source>Encrypt or decrypt wallet</source> - <translation>Chiffrer ou décrypter le porte-monnaie</translation> + <translation>Chiffrer ou déchiffrer le porte-monnaie</translation> </message> <message> <location line="+3"/> @@ -457,7 +450,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <message> <location line="+2"/> <source>Change the passphrase used for wallet encryption</source> - <translation>Modifier la phrase de passe utilisée pour le cryptage du porte-monnaie</translation> + <translation>Modifier la phrase de passe utilisée pour le chiffrement du porte-monnaie</translation> </message> <message> <location line="+1"/> @@ -470,12 +463,12 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <translation>Ouvrir une console de débogage et de diagnostic</translation> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation>&Vérifier un message...</translation> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -485,12 +478,17 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <translation>Porte-monnaie</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> - <translation>À _propos de Bitcoin</translation> + <translation>À &propos de Bitcoin</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>&Afficher / Cacher</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>&Fichier</translation> </message> @@ -564,7 +562,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être <message> <location line="+7"/> <source>Catching up...</source> - <translation>Rattrapage...</translation> + <translation>Rattrapage…</translation> </message> <message> <location line="+10"/> @@ -647,7 +645,7 @@ Adresse : %4 <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="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <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> @@ -655,7 +653,7 @@ Adresse : %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation>Alerte réseau</translation> </message> @@ -675,7 +673,7 @@ Adresse : %4 <message> <location line="+10"/> <source>The label associated with this address book entry</source> - <translation>L'étiquette associée à cette entrée du carnet d'adresses</translation> + <translation>L’étiquette associée à cette entrée du carnet d'adresses</translation> </message> <message> <location line="+7"/> @@ -685,7 +683,7 @@ Adresse : %4 <message> <location line="+10"/> <source>The address associated with this address book entry. This can only be modified for sending addresses.</source> - <translation>L'adresse associée avec cette entrée du carnet d'adresses. Ne peut être modifiée que pour les adresses d'envoi.</translation> + <translation>L’adresse associée avec cette entrée du carnet d'adresses. Ne peut être modifiées que les adresses d’envoi.</translation> </message> <message> <location filename="../editaddressdialog.cpp" line="+20"/> @@ -695,22 +693,22 @@ Adresse : %4 <message> <location line="+4"/> <source>New sending address</source> - <translation>Nouvelle adresse d'envoi</translation> + <translation>Nouvelle adresse d’envoi</translation> </message> <message> <location line="+3"/> <source>Edit receiving address</source> - <translation>Éditer l'adresse de réception</translation> + <translation>Éditer l’adresse de réception</translation> </message> <message> <location line="+4"/> <source>Edit sending address</source> - <translation>Éditer l'adresse d'envoi</translation> + <translation>Éditer l’adresse d'envoi</translation> </message> <message> <location line="+60"/> <source>The entered address "%1" is already in the address book.</source> - <translation>L'adresse fournie « %1 » est déjà présente dans le carnet d'adresses.</translation> + <translation>L’adresse fournie « %1 » est déjà présente dans le carnet d'adresses.</translation> </message> <message> <location line="+5"/> @@ -731,7 +729,7 @@ Adresse : %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation>Bitcoin-Qt</translation> @@ -950,7 +948,7 @@ Adresse : %4 <translation>par défaut</translation> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation>Avertissement</translation> @@ -978,7 +976,7 @@ Adresse : %4 <location line="+33"/> <location line="+183"/> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> - <translation>L'information affichée peut être obsolète. Votre porte-monnaie est automatiquement synchronisé avec le réseau Bitcoin lorsque la connexion s'établit, mais ce processus n'est pas encore terminé.</translation> + <translation>Les informations affichées peuvent être obsolètes. Votre porte-monnaie est automatiquement synchronisé avec le réseau Bitcoin lorsque la connexion s'établit, or ce processus n'est pas encore terminé.</translation> </message> <message> <location line="-141"/> @@ -1023,7 +1021,7 @@ Adresse : %4 <message> <location line="+29"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the current balance</source> - <translation>Total des transactions qui doivent encore être confirmées et qui ne sont pas prises en compte pour le solde actuel</translation> + <translation>Total des transactions qui doivent encore être confirmées et qui ne sont pas prises en compte dans le solde actuel</translation> </message> <message> <location line="+20"/> @@ -1112,7 +1110,7 @@ Adresse : %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation>Indisponible</translation> </message> @@ -1124,7 +1122,7 @@ Adresse : %4 <message> <location line="-45"/> <source>&Information</source> - <translation>&Information</translation> + <translation>&Informations</translation> </message> <message> <location line="+68"/> @@ -1246,7 +1244,7 @@ Adresse : %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1289,7 +1287,7 @@ Adresse : %4 <message> <location line="+31"/> <source>Confirm the send action</source> - <translation>Confirmer l'action d'envoi</translation> + <translation>Confirmer l’action d'envoi</translation> </message> <message> <location line="+3"/> @@ -1304,7 +1302,7 @@ Adresse : %4 <message> <location line="+5"/> <source>Confirm send coins</source> - <translation>Confirmer l'envoi des pièces</translation> + <translation>Confirmer l’envoi des pièces</translation> </message> <message> <location line="+1"/> @@ -1319,7 +1317,7 @@ Adresse : %4 <message> <location line="+23"/> <source>The recipient address is not valid, please recheck.</source> - <translation>Cette adresse de destinataire n'est pas valide, veuillez la vérifier.</translation> + <translation>Cette adresse de destinataire n’est pas valide, veuillez la vérifier.</translation> </message> <message> <location line="+5"/> @@ -1373,7 +1371,7 @@ Adresse : %4 <location line="+24"/> <location filename="../sendcoinsentry.cpp" line="+25"/> <source>Enter a label for this address to add it to your address book</source> - <translation>Entrez une étiquette pour cette adresse afin de l'ajouter à votre carnet d'adresses</translation> + <translation>Entrez une étiquette pour cette adresse afin de l’ajouter à votre carnet d’adresses</translation> </message> <message> <location line="+9"/> @@ -1496,7 +1494,7 @@ Adresse : %4 <message> <location line="-64"/> <source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source> - <translation>Entrez l'adresse ayant servi à signer, le message (assurez-vous d'avoir copié exactement les retours à la ligne, les espacements, tabulations etc.) et la signature ci-dessous pour vérifier le message. Faites attention à ne pas déduire davantage de la signature que ce qui est contenu dans le message signé lui-même pour éviter d'être trompé par une attaque d'homme du milieu.</translation> + <translation>Entrez ci-dessous l'adresse ayant servi à signer, le message (assurez-vous d'avoir copié exactement les retours à la ligne, les espacements, tabulations etc.) et la signature pour vérifier le message. Faites attention à ne pas déduire davantage de la signature que ce qui est contenu dans le message signé lui-même pour éviter d'être trompé par une attaque d'homme du milieu.</translation> </message> <message> <location line="+21"/> @@ -1727,7 +1725,7 @@ Adresse : %4 <message> <location line="+3"/> <source>Generated coins must mature 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, its state will change to "not accepted" and it won't 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 mûrir pendant 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 de blocs. S'il échoue a intégrer la chaîne, son état sera modifié en « non 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> + <translation>Les pièces générées doivent mûrir pendant 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 de blocs. S’il échoue a intégrer la chaîne, son état sera modifié en « non 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> <message> <location line="+7"/> @@ -1762,7 +1760,7 @@ Adresse : %4 <message> <location line="-212"/> <source>, has not been successfully broadcast yet</source> - <translation>, n'a pas encore été diffusée avec succès</translation> + <translation>, n’a pas encore été diffusée avec succès</translation> </message> <message> <location line="+36"/> @@ -1838,7 +1836,7 @@ Adresse : %4 <message> <location line="+5"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Ce bloc n'a été reçu par aucun autre nœud et ne sera probablement pas accepté !</translation> + <translation>Ce bloc n’a été reçu par aucun autre nœud et ne sera probablement pas accepté !</translation> </message> <message> <location line="+3"/> @@ -1893,12 +1891,12 @@ Adresse : %4 <message> <location line="+2"/> <source>Destination address of transaction.</source> - <translation>L'adresse de destination de la transaction.</translation> + <translation>L’adresse de destination de la transaction.</translation> </message> <message> <location line="+2"/> <source>Amount removed from or added to balance.</source> - <translation>Montant ajouté au ou enlevé du solde.</translation> + <translation>Montant ajouté au, ou enlevé du, solde.</translation> </message> </context> <context> @@ -1912,7 +1910,7 @@ Adresse : %4 <message> <location line="-15"/> <source>Today</source> - <translation>Aujourd'hui</translation> + <translation>Aujourd’hui</translation> </message> <message> <location line="+1"/> @@ -1922,7 +1920,7 @@ Adresse : %4 <message> <location line="+1"/> <source>This month</source> - <translation>Ce mois</translation> + <translation>Ce mois-ci</translation> </message> <message> <location line="+1"/> @@ -1937,7 +1935,7 @@ Adresse : %4 <message> <location line="+1"/> <source>Range...</source> - <translation>Intervalle...</translation> + <translation>Intervalle…</translation> </message> <message> <location line="+11"/> @@ -1977,12 +1975,12 @@ Adresse : %4 <message> <location line="+34"/> <source>Copy address</source> - <translation>Copier l'adresse</translation> + <translation>Copier l’adresse</translation> </message> <message> <location line="+1"/> <source>Copy label</source> - <translation>Copier l'étiquette</translation> + <translation>Copier l’étiquette</translation> </message> <message> <location line="+1"/> @@ -1992,7 +1990,7 @@ Adresse : %4 <message> <location line="+1"/> <source>Edit label</source> - <translation>Éditer l'étiquette</translation> + <translation>Éditer l’étiquette</translation> </message> <message> <location line="+1"/> @@ -2047,12 +2045,12 @@ Adresse : %4 <message> <location line="+4"/> <source>Error exporting</source> - <translation>Erreur lors de l'exportation</translation> + <translation>Erreur lors de l’exportation</translation> </message> <message> <location line="+0"/> <source>Could not write to file %1.</source> - <translation>Impossible d'écrire sur le fichier %1.</translation> + <translation>Impossible d'écrire dans le fichier %1.</translation> </message> <message> <location line="+95"/> @@ -2070,7 +2068,7 @@ Adresse : %4 <message> <location filename="../walletmodel.cpp" line="+192"/> <source>Sending...</source> - <translation>Envoi en cours...</translation> + <translation>Envoi en cours…</translation> </message> </context> <context> @@ -2081,7 +2079,7 @@ Adresse : %4 <translation>Version de Bitcoin</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Utilisation :</translation> </message> @@ -2096,12 +2094,12 @@ Adresse : %4 <translation>Lister les commandes</translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> - <translation>Obtenir de l'aide pour une commande</translation> + <translation>Obtenir de l’aide pour une commande</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Options :</translation> </message> @@ -2113,10 +2111,10 @@ Adresse : %4 <message> <location line="+3"/> <source>Specify pid file (default: bitcoind.pid)</source> - <translation>Spécifier le fichier pid (par défaut : bitcoind.pid)</translation> + <translation>Spécifier le fichier PID (par défaut : bitcoind.pid)</translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Générer des pièces</translation> </message> @@ -2126,7 +2124,7 @@ Adresse : %4 <translation>Ne pas générer de pièces</translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Spécifier le répertoire de données</translation> </message> @@ -2141,12 +2139,7 @@ Adresse : %4 <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 line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Spécifier le délai d'expiration de la connexion (en millisecondes)</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <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> @@ -2156,27 +2149,27 @@ Adresse : %4 <translation>Garder au plus <n> connexions avec les pairs (par défaut : 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Se connecter à un nœud pour obtenir des adresses de pairs puis se déconnecter</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation>Spécifier votre propre adresse publique</translation> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation>Attacher à l'adresse définie. Utilisez la notation [hôte]:port pour l'IPv6</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <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 line="-104"/> + <location line="-105"/> <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> @@ -2191,7 +2184,7 @@ Adresse : %4 <translation>Accepter les commandes de JSON-RPC et de la ligne de commande</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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> @@ -2201,7 +2194,7 @@ Adresse : %4 <translation>Utiliser le réseau de test</translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Accepter les connexions entrantes (par défaut : 1 si -proxy ou -connect ne sont pas présents)</translation> </message> @@ -2256,7 +2249,12 @@ Adresse : %4 <translation>Trouver des pairs en utilisant la recherche DNS (par défaut : 1 sauf si -connect est utilisé)</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation>Importation des blocs…</translation> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation>Adresse -tor invalide : « %s »</translation> </message> @@ -2326,7 +2324,12 @@ Adresse : %4 <translation>Réduire le fichier debug.log lors du démarrage du client (par défaut : 1 lorsque -debug n'est pas présent)</translation> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>Spécifier le délai d'expiration de la connexion en millisecondes (par défaut : 5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Utiliser l'UPnP pour rediriger le port d'écoute (par défaut : 0)</translation> </message> @@ -2338,7 +2341,7 @@ Adresse : %4 <message> <location line="+1"/> <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation>Utiliser un proxy pour atteindre les services cachés de tor (par défaut : même chose que -proxy)</translation> + <translation>Utiliser un proxy pour atteindre les services cachés de Tor (par défaut : même valeur que -proxy)</translation> </message> <message> <location line="+2"/> @@ -2366,22 +2369,22 @@ Adresse : %4 <translation>Écouter les connexions JSON-RPC sur le <port> (par défaut : 8332)</translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <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 line="+60"/> + <location line="+61"/> <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 line="-89"/> + <location 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 line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>Mettre à jour le format du porte-monnaie</translation> </message> @@ -2396,7 +2399,7 @@ Adresse : %4 <translation>Réanalyser la chaîne de blocs pour les transactions de porte-monnaie manquantes</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <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> @@ -2406,7 +2409,7 @@ Adresse : %4 <translation>Profondeur de la vérification des blocs (0-6, par défaut : 1)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation>Importe des blocs depuis un fichier blk000?.dat externe</translation> </message> @@ -2426,19 +2429,19 @@ Adresse : %4 <translation>Clef privée du serveur (par défaut : server.pem)</translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Ce message d'aide</translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <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> + <translation>Impossible d’obtenir un verrou sur le répertoire de données %s. Le programme Bitcoin est probablement déjà lancé.</translation> </message> <message> <location line="+45"/> @@ -2446,12 +2449,12 @@ Adresse : %4 <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Impossible de se lier à %s sur cet ordinateur (bind a retourné l'erreur %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation>Connexion via un proxy socks</translation> </message> @@ -2461,12 +2464,12 @@ Adresse : %4 <translation>Autoriser les recherches DNS pour -addnode, -seednode et -connect</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> - <translation>Chargement des adresses...</translation> + <translation>Chargement des adresses…</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>Erreur lors du chargement de blkindex.dat</translation> </message> @@ -2481,17 +2484,17 @@ Adresse : %4 <translation>Erreur lors du chargement de wallet.dat : le porte-monnaie nécessite une version plus récente de Bitcoin</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <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 line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>Erreur lors du chargement de wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation>Adresse -proxy invalide : « %s »</translation> </message> @@ -2506,7 +2509,7 @@ Adresse : %4 <translation>Version inconnue de proxy -socks demandée : %i</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Impossible de résoudre l'adresse -bind : « %s »</translation> </message> @@ -2516,12 +2519,12 @@ Adresse : %4 <translation>Impossible de résoudre l'adresse -externalip : « %s »</translation> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Montant invalide pour -paytxfee=<montant> : « %s »</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation>Erreur : le nœud n'a pu être démarré</translation> </message> @@ -2541,17 +2544,17 @@ Adresse : %4 <translation>Erreur : échec de la création de la transaction </translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Envoi en cours...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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>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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation>Montant invalide</translation> </message> @@ -2563,10 +2566,10 @@ Adresse : %4 <message> <location line="+9"/> <source>Loading block index...</source> - <translation>Chargement de l'index des blocs...</translation> + <translation>Chargement de l’index des blocs…</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <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> @@ -2586,12 +2589,12 @@ Adresse : %4 <translation>Frais par Ko à ajouter aux transactions que vous enverrez</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> - <translation>Chargement du porte-monnaie...</translation> + <translation>Chargement du porte-monnaie…</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation>Impossible de revenir à une version antérieure du porte-monnaie</translation> </message> @@ -2606,22 +2609,22 @@ Adresse : %4 <translation>Impossible d'écrire l'adresse par défaut</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> - <translation>Nouvelle analyse...</translation> + <translation>Nouvelle analyse…</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Chargement terminé</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation>Pour utiliser l'option %s</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_fr_CA.ts b/src/qt/locale/bitcoin_fr_CA.ts index 4f79780878..d0e3378fcc 100644 --- a/src/qt/locale/bitcoin_fr_CA.ts +++ b/src/qt/locale/bitcoin_fr_CA.ts @@ -13,15 +13,24 @@ <translation><b>Bitcoin</b> version</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation>Copyright © 2009-2012 Développeurs de Bitcoin</translation> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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 type="unfinished"/> + <translation> +Ce logiciel est en phase expérimentale. + +Distribué sous licence MIT/X11, voir le fichier COPYING ou http://www.opensource.org/licenses/mit-license.php. + +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> @@ -284,22 +293,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation type="unfinished"/> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation type="unfinished"/> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation type="unfinished"/> </message> @@ -374,7 +378,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation type="unfinished"/> </message> @@ -404,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation type="unfinished"/> </message> @@ -429,12 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation type="unfinished"/> </message> @@ -464,12 +463,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> @@ -479,12 +478,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation type="unfinished"/> </message> @@ -637,7 +641,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -645,7 +649,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -721,7 +725,7 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation type="unfinished"/> @@ -940,7 +944,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation type="unfinished"/> @@ -1102,7 +1106,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1236,7 +1240,7 @@ Address: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -2071,7 +2075,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation type="unfinished"/> </message> @@ -2086,12 +2090,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation type="unfinished"/> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation type="unfinished"/> </message> @@ -2106,7 +2110,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation type="unfinished"/> </message> @@ -2116,7 +2120,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation type="unfinished"/> </message> @@ -2131,12 +2135,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2146,27 +2145,27 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -2181,7 +2180,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> @@ -2191,7 +2190,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -2246,7 +2245,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation type="unfinished"/> </message> @@ -2316,7 +2320,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2356,22 +2365,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> @@ -2386,7 +2395,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2396,7 +2405,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation type="unfinished"/> </message> @@ -2416,17 +2425,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-109"/> + <location line="-110"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"/> </message> <message> - <location line="+121"/> + <location line="+122"/> <source>This help message</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-119"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation type="unfinished"/> </message> @@ -2436,12 +2445,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> @@ -2451,12 +2460,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation type="unfinished"/> </message> @@ -2471,17 +2480,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> @@ -2496,7 +2505,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2506,12 +2515,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"/> </message> @@ -2531,17 +2540,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation type="unfinished"/> </message> <message> - <location line="-99"/> + <location line="-100"/> <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"/> </message> <message> - <location line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation type="unfinished"/> </message> @@ -2556,7 +2565,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2576,12 +2585,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -2596,22 +2605,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts index 8e6a0402e6..f4bee56346 100644 --- a/src/qt/locale/bitcoin_he.ts +++ b/src/qt/locale/bitcoin_he.ts @@ -13,15 +13,24 @@ <translation>גרסת <b>ביטקוין</b></translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation>זכויות יוצרים 2009-2012 שמורות למפתחי הביטקוין</translation> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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 type="unfinished"/> + <translation> +זוהי תוכנה ניסיונית. + +מופצת תחת רישיון התוכנה MIT/X11, ראה את הקובץ המצורף COPYING או http://www.opensource.org/licenses/mit-license.php. + +המוצר הזה כולל תוכנה שפותחה ע"י פרויקט OpenSSL לשימוש בתיבת הכלים OpenSSL (http://www.openssl.org/) ותוכנה קריפטוגרפית שנכתבה ע"י אריק יאנג (eay@cryptsoft.com) ותוכנת UPnP שנכתבה ע"י תומס ברנרד.</translation> </message> </context> <context> @@ -54,7 +63,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-46"/> <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> - <translation type="unfinished"/> + <translation>אלה כתובת הביטקוין שלך עבור קבלת תשלומים. ייתכן ותרצה לתת כתובת שונה לכל שולח כדי שתוכל לעקוב אחר מי משלם לך.</translation> </message> <message> <location line="+60"/> @@ -69,7 +78,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+11"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"/> + <translation>חתום על הודעה בכדי להוכיח כי אתה הבעלים של כתובת ביטקוין.</translation> </message> <message> <location line="+3"/> @@ -79,7 +88,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+11"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> - <translation type="unfinished"/> + <translation>אמת הודעה בכדי להבטיח שהיא נחתמה עם כתובת ביטקוין מסוימת.</translation> </message> <message> <location line="+3"/> @@ -215,18 +224,18 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"/> + <translation>אזהרה: אם אתה מצפין את הארנק ומאבד את הסיסמא, אתה <b>תאבד את כל הביטקוינים שלך</b>!</translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> + <translation>האם אתה בטוח שברצונך להצפין את הארנק?</translation> </message> <message> <location line="+106"/> <location line="+24"/> <source>Warning: The Caps Lock key is on!</source> - <translation type="unfinished"/> + <translation>זהירות: מקש Caps Lock מופעל!</translation> </message> <message> <location line="-121"/> @@ -278,28 +287,23 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"/> + <translation>סיסמת הארנק שונתה בהצלחה.</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation>חתום על הודעה</translation> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>הצג/הסתר את &ביטקוין</translation> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>מסתנכרן עם הרשת...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&סקירה</translation> </message> @@ -374,7 +378,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&אפשרויות</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation>הצפן ארנק</translation> </message> @@ -404,24 +408,24 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>י&צא לקובץ</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation>שלח מטבעות לכתובת ביטקוין</translation> </message> <message> <location line="+6"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"/> + <translation>חתום על הודעה בכדי להוכיח כי אתה הבעלים של כתובת ביטקוין.</translation> </message> <message> <location line="+4"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> - <translation type="unfinished"/> + <translation>אמת הודעה בכדי להבטיח שהיא נחתמה עם כתובת ביטקוין מסוימת.</translation> </message> <message> <location line="+4"/> <source>S&ignatures</source> - <translation type="unfinished"/> + <translation>חתימות</translation> </message> <message> <location line="+37"/> @@ -429,12 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>שנה אפשרויות תצורה עבור ביטקוין</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>הצג או הסתר את חלון ביטקוין.</translation> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation>יצוא הנתונים בטאב הנוכחי לקובץ</translation> </message> @@ -464,12 +463,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>פתח את לוח הבקרה לאבחון וניפוי</translation> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation>אמת הודעה...</translation> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>ביטקוין</translation> </message> @@ -479,12 +478,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>ארנק</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> - <translation type="unfinished"/> + <translation>אודות ביטקוין</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>הצג / הסתר</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>&קובץ</translation> </message> @@ -601,13 +605,13 @@ Address: %4 <location line="+120"/> <location line="+15"/> <source>URI handling</source> - <translation type="unfinished"/> + <translation>תפעול URI</translation> </message> <message> <location line="-15"/> <location line="+15"/> <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation type="unfinished"/> + <translation>לא ניתן לנתח URI! זה יכול להיגרם כתוצאה מכתובת ביטקוין לא תקינה או פרמטרי URI חסרי צורה תקינה.</translation> </message> <message> <location line="+16"/> @@ -640,15 +644,15 @@ Address: %4 <translation>היתה שגיאה בניסיון לשמור את מידע הארנק למיקום החדש.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> - <translation type="unfinished"/> + <translation>שגיאה סופנית אירעה. ביטקוין אינו יכול להמשיך לפעול בבטחה ולכן ייסגר.</translation> </message> </context> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation>אזעקת רשת</translation> </message> @@ -724,7 +728,7 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation>Bitcoin-Qt</translation> @@ -825,7 +829,7 @@ Address: %4 <message> <location line="+7"/> <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source> - <translation type="unfinished"/> + <translation>התחבר לרשת הביטקוין דרך פרוקסי SOCKS (למשל בעת התחברות דרך Tor).</translation> </message> <message> <location line="+3"/> @@ -943,7 +947,7 @@ Address: %4 <translation>ברירת מחדל</translation> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation>אזהרה</translation> @@ -1070,7 +1074,7 @@ Address: %4 <message> <location line="+40"/> <source>The entered amount is invalid, please check.</source> - <translation type="unfinished"/> + <translation>הכמות שהוכנסה אינה תקינה, אנא ודא.</translation> </message> <message> <location line="+23"/> @@ -1105,7 +1109,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation>N/A</translation> </message> @@ -1122,7 +1126,7 @@ Address: %4 <message> <location line="+68"/> <source>Using OpenSSL version</source> - <translation type="unfinished"/> + <translation>משתמש ב-OpenSSL גרסה</translation> </message> <message> <location line="+49"/> @@ -1197,22 +1201,22 @@ Address: %4 <message> <location line="-104"/> <source>Bitcoin - Debug window</source> - <translation type="unfinished"/> + <translation>ביטקוין - חלון ניפוי</translation> </message> <message> <location line="+25"/> <source>Bitcoin Core</source> - <translation type="unfinished"/> + <translation>ליבת ביטקוין</translation> </message> <message> <location line="+279"/> <source>Debug log file</source> - <translation type="unfinished"/> + <translation>קובץ יומן ניפוי</translation> </message> <message> <location line="+7"/> <source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source> - <translation type="unfinished"/> + <translation>פתח את קובץ יומן הניפוי מתיקיית הנתונים הנוכחית. זה עשוי לקחת מספר שניות עבור קובצי יומן גדולים.</translation> </message> <message> <location line="+102"/> @@ -1239,7 +1243,7 @@ Address: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1312,7 +1316,7 @@ Address: %4 <message> <location line="+23"/> <source>The recipient address is not valid, please recheck.</source> - <translation type="unfinished"/> + <translation>כתובת המקבל אינה תקינה, אנא בדוק שנית.</translation> </message> <message> <location line="+5"/> @@ -1414,7 +1418,7 @@ Address: %4 <message> <location filename="../forms/signverifymessagedialog.ui" line="+14"/> <source>Signatures - Sign / Verify a Message</source> - <translation type="unfinished"/> + <translation>חתימות - חתום או אמת הודעה</translation> </message> <message> <location line="+13"/> @@ -1430,19 +1434,19 @@ Address: %4 <message> <location line="+18"/> <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>הכתובת איתה לחתום על ההודעה (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+10"/> <location line="+203"/> <source>Choose an address from the address book</source> - <translation type="unfinished"/> + <translation>בחר כתובת מפנקס הכתובות</translation> </message> <message> <location line="-193"/> <location line="+203"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location line="-193"/> @@ -1452,7 +1456,7 @@ Address: %4 <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location line="+12"/> @@ -1467,7 +1471,7 @@ Address: %4 <message> <location line="+21"/> <source>Sign the message to prove you own this Bitcoin address</source> - <translation type="unfinished"/> + <translation>חתום על ההודעה כדי להוכיח שכתובת הביטקוין הזו בבעלותך.</translation> </message> <message> <location line="+17"/> @@ -1489,17 +1493,17 @@ Address: %4 <message> <location line="-64"/> <source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source> - <translation type="unfinished"/> + <translation>הכנס למטה את הכתובת החותמת, ההודעה (ודא שאתה מעתיק מעברי שורה, רווחים, טאבים וכו' באופן מדויק) והחתימה כדי לאמת את ההודעה. היזהר לא לפרש את החתימה כיותר ממה שמופיע בהודעה החתומה בעצמה, כדי להימנע מליפול קורבן למתקפת איש-באמצע.</translation> </message> <message> <location line="+21"/> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>הכתובת איתה ההודעה נחתמה (למשל 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+40"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> - <translation type="unfinished"/> + <translation>אמת את ההודעה כדי להבטיח שהיא נחתמה עם כתובת הביטקוין הנתונה</translation> </message> <message> <location line="+17"/> @@ -1515,7 +1519,7 @@ Address: %4 <message> <location line="-2"/> <source>Click "Sign Message" to generate signature</source> - <translation type="unfinished"/> + <translation>לחץ "חתום על ההודעה" כדי לחולל חתימה</translation> </message> <message> <location line="+3"/> @@ -1526,7 +1530,7 @@ Address: %4 <location line="+82"/> <location line="+81"/> <source>The entered address is invalid.</source> - <translation type="unfinished"/> + <translation>הכתובת שהוכנסה אינה תקינה.</translation> </message> <message> <location line="-81"/> @@ -1540,27 +1544,27 @@ Address: %4 <location line="-81"/> <location line="+81"/> <source>The entered address does not refer to a key.</source> - <translation type="unfinished"/> + <translation>הכתובת שהוכנסה אינה מתייחסת למפתח.</translation> </message> <message> <location line="-73"/> <source>Wallet unlock was cancelled.</source> - <translation type="unfinished"/> + <translation>פתיחת הארנק בוטלה.</translation> </message> <message> <location line="+8"/> <source>Private key for the entered address is not available.</source> - <translation type="unfinished"/> + <translation>המפתח הפרטי עבור הכתובת שהוכנסה אינו זמין.</translation> </message> <message> <location line="+12"/> <source>Message signing failed.</source> - <translation type="unfinished"/> + <translation>החתימה על ההודעה נכשלה.</translation> </message> <message> <location line="+5"/> <source>Message signed.</source> - <translation type="unfinished"/> + <translation>ההודעה נחתמה.</translation> </message> <message> <location line="+59"/> @@ -1599,12 +1603,12 @@ Address: %4 <message numerus="yes"> <location line="-2"/> <source>Open for %n block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>פתוח למשך בלוק אחד</numerusform><numerusform>פתוח למשך %n בלוקים</numerusform></translation> </message> <message> <location line="+8"/> <source>%1/offline</source> - <translation type="unfinished"/> + <translation>%1/מנותק</translation> </message> <message> <location line="+2"/> @@ -1619,12 +1623,12 @@ Address: %4 <message> <location line="+18"/> <source>Status</source> - <translation type="unfinished"/> + <translation>מצב</translation> </message> <message numerus="yes"> <location line="+7"/> <source>, broadcast through %n node(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>, הופץ דרך צומת אחד</numerusform><numerusform>, הופץ דרך %n צמתים</numerusform></translation> </message> <message> <location line="+4"/> @@ -1634,36 +1638,36 @@ Address: %4 <message> <location line="+7"/> <source>Source</source> - <translation type="unfinished"/> + <translation>מקור</translation> </message> <message> <location line="+0"/> <source>Generated</source> - <translation type="unfinished"/> + <translation>נוצר</translation> </message> <message> <location line="+6"/> <location line="+17"/> <source>From</source> - <translation type="unfinished"/> + <translation>מאת</translation> </message> <message> <location line="+1"/> <location line="+22"/> <location line="+58"/> <source>To</source> - <translation type="unfinished"/> + <translation>אל</translation> </message> <message> <location line="-77"/> <location line="+2"/> <source>own address</source> - <translation type="unfinished"/> + <translation>כתובת עצמית</translation> </message> <message> <location line="-2"/> <source>label</source> - <translation type="unfinished"/> + <translation>תוית</translation> </message> <message> <location line="+37"/> @@ -1672,17 +1676,17 @@ Address: %4 <location line="+17"/> <location line="+30"/> <source>Credit</source> - <translation type="unfinished"/> + <translation>זיכוי</translation> </message> <message numerus="yes"> <location line="-102"/> <source>matures in %n more block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>מבשיל בעוד בלוק אחד</numerusform><numerusform>מבשיל בעוד %n בלוקים</numerusform></translation> </message> <message> <location line="+2"/> <source>not accepted</source> - <translation type="unfinished"/> + <translation>לא התקבל</translation> </message> <message> <location line="+44"/> @@ -1690,17 +1694,17 @@ Address: %4 <location line="+15"/> <location line="+30"/> <source>Debit</source> - <translation type="unfinished"/> + <translation>חיוב</translation> </message> <message> <location line="-39"/> <source>Transaction fee</source> - <translation type="unfinished"/> + <translation>עמלת פעולה</translation> </message> <message> <location line="+16"/> <source>Net amount</source> - <translation type="unfinished"/> + <translation>כמות נקיה</translation> </message> <message> <location line="+6"/> @@ -1710,32 +1714,32 @@ Address: %4 <message> <location line="+2"/> <source>Comment</source> - <translation type="unfinished"/> + <translation>הערה</translation> </message> <message> <location line="+2"/> <source>Transaction ID</source> - <translation type="unfinished"/> + <translation>זיהוי פעולה</translation> </message> <message> <location line="+3"/> <source>Generated coins must mature 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, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> + <translation>מטבעות שנוצרים חייבים להבשיל למשך 120 בלוקים לפני שניתן לנצל אותם. כשיצרת את הבלוק הזה, הוא הופץ לרשת כדי להתווסף לשרשרת הבלוקים. אם הוא אינו מצליח לביע לשרשרת, המצב שלו ישתנה ל"לא התקבל" ולא ניתן יהיה לנצל אותו. זה עשוי לקרות מעת לעת אם צומת אחר יוצר בלוק בטווח של מספר שניות מהבלוק שלך.</translation> </message> <message> <location line="+7"/> <source>Debug information</source> - <translation type="unfinished"/> + <translation>מידע ניפוי</translation> </message> <message> <location line="+8"/> <source>Transaction</source> - <translation type="unfinished"/> + <translation>פעולה</translation> </message> <message> <location line="+5"/> <source>Inputs</source> - <translation type="unfinished"/> + <translation>קלטים</translation> </message> <message> <location line="+23"/> @@ -1745,12 +1749,12 @@ Address: %4 <message> <location line="+1"/> <source>true</source> - <translation type="unfinished"/> + <translation>אמת</translation> </message> <message> <location line="+0"/> <source>false</source> - <translation type="unfinished"/> + <translation>שקר</translation> </message> <message> <location line="-212"/> @@ -2074,7 +2078,7 @@ Address: %4 <translation>גרסת ביטקוין</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>שימוש:</translation> </message> @@ -2089,12 +2093,12 @@ Address: %4 <translation>רשימת פקודות</translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>קבל עזרה עבור פקודה</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>אפשרויות:</translation> </message> @@ -2109,7 +2113,7 @@ Address: %4 <translation>ציין קובץ pid (ברירת מחדל: bitcoind.pid)</translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>צור מטבעות</translation> </message> @@ -2119,7 +2123,7 @@ Address: %4 <translation>אל תייצר מטבעות</translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>ציין תיקיית נתונים</translation> </message> @@ -2134,12 +2138,7 @@ Address: %4 <translation>קבע את גודל יומן פעילות מסד הנתונים במגהבייט (ברירת מחדל: 100)</translation> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>ציין הגבלת זמן לחיבור (במילישניות)</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>האזן לחיבורים ב<פורט> (ברירת מחדל: 8333 או ברשת הבדיקה: 18333)</translation> </message> @@ -2149,27 +2148,27 @@ Address: %4 <translation>החזק לכל היותר <n> חיבורים לעמיתים (ברירת מחדל: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>התחבר לצומת כדי לדלות כתובות עמיתים, ואז התנתק</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation>ציין את הכתובת הפומבית שלך</translation> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation>קשור לכתובת נתונה. השתמש בסימון [host]:port בשביל IPv6</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>סף להתנתקות מעמיתים הנוהגים שלא כהלכה (ברירת מחדל: 100)</translation> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>מספר שניות למנוע מעמיתים הנוהגים שלא כהלכה מלהתחבר מחדש (ברירת מחדל: 86400)</translation> </message> @@ -2184,7 +2183,7 @@ Address: %4 <translation>קבל פקודות משורת הפקודה ו- JSON-RPC</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation>רוץ ברקע כדימון וקבל פקודות</translation> </message> @@ -2194,39 +2193,39 @@ Address: %4 <translation>השתמש ברשת הבדיקה</translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>קבל חיבורים מבחוץ (ברירת מחדל: 1 ללא -proxy או -connect)</translation> </message> <message> <location line="-20"/> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> - <translation type="unfinished"/> + <translation>קבע גודל מקסימלי עבור פעולות עדיפות גבוהה/עמלה נמוכה בבתים (ברירת מחדל: 27000)</translation> </message> <message> <location line="+5"/> <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>אזהרה: -paytxfee נקבע לערך מאד גבוה! זוהי עמלת הפעולה שתשלם אם אתה שולח פעולה.</translation> </message> <message> <location line="+3"/> <source>Warning: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation type="unfinished"/> + <translation>אזהרה: הפעולות המוצגות עשויות לא להיות נכונות! ייתכן ואתה צריך לשדרג, או שצמתים אחרים צריכים לשדרג.</translation> </message> <message> <location line="+3"/> <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>אזהרה: אנא בדוק שהתאריך והשעה של המחשב שלך נכונים! אם השעון שלך אינו נכון ביטקוין לא יעבוד כראוי.</translation> </message> <message> <location line="+13"/> <source>An error occurred while setting up the RPC port %i for listening: %s</source> - <translation type="unfinished"/> + <translation>שגיאה אירעה במהלך קביעת פורט RPC %i להאזנה: %s</translation> </message> <message> <location line="+4"/> <source>Block creation options:</source> - <translation type="unfinished"/> + <translation>אפשרויות יצירת בלוק:</translation> </message> <message> <location line="+6"/> @@ -2246,37 +2245,42 @@ Address: %4 <message> <location line="+2"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> - <translation type="unfinished"/> + <translation>מצא עמיתים ע"י חיפוש DNS (ברירת מחדל: 1 ללא -connect)</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation>מייבא בלוקים...</translation> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> - <translation type="unfinished"/> + <translation>כתובת לא תקינה ל -tor: '%s'</translation> </message> <message> <location line="+10"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> - <translation type="unfinished"/> + <translation>חוצץ קבלה מירבי לכל חיבור, <n>*1000 בתים (ברירת מחדל: 5000)</translation> </message> <message> <location line="+1"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</source> - <translation type="unfinished"/> + <translation>חוצץ שליחה מירבי לכל חיבור, <n>*1000 בתים (ברירת מחדל: 1000)</translation> </message> <message> <location line="+1"/> <source>Only connect to nodes in network <net> (IPv4, IPv6 or Tor)</source> - <translation type="unfinished"/> + <translation>התחבר רק לצמתים ברשת <net> (IPv4, IPv6 או Tor)</translation> </message> <message> <location line="+2"/> <source>Output extra debugging information. Implies all other -debug* options</source> - <translation type="unfinished"/> + <translation>פלוט מידע ניפוי נוסף. נובע מכך כל אפשרויות -debug* האחרות.</translation> </message> <message> <location line="+1"/> <source>Output extra network debugging information</source> - <translation type="unfinished"/> + <translation>פלוט מידע נוסף לניפוי שגיאות ברשת.</translation> </message> <message> <location line="+2"/> @@ -2286,7 +2290,7 @@ Address: %4 <message> <location line="+4"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation type="unfinished"/> + <translation>אפשרויות SSL: (ראה את הויקי של ביטקוין עבור הוראות הגדרת SSL)</translation> </message> <message> <location line="+1"/> @@ -2306,20 +2310,25 @@ Address: %4 <message> <location line="+7"/> <source>Set maximum block size in bytes (default: 250000)</source> - <translation type="unfinished"/> + <translation>קבע את גדול הבלוק המירבי בבתים (ברירת מחדל: 250000)</translation> </message> <message> <location line="+1"/> <source>Set minimum block size in bytes (default: 0)</source> - <translation type="unfinished"/> + <translation>קבע את גודל הבלוק המינימלי בבתים (ברירת מחדל: 0)</translation> </message> <message> <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation type="unfinished"/> + <translation>כווץ את קובץ debug.log בהפעלת הקליינט (ברירת מחדל: 1 ללא -debug)</translation> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>ציין הגבלת זמן לחיבור במילישניות (ברירת מחדל: 5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>השתמש ב-UPnP כדי למפות את הפורט להאזנה (ברירת מחדל: 0)</translation> </message> @@ -2331,7 +2340,7 @@ Address: %4 <message> <location line="+1"/> <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation type="unfinished"/> + <translation>השתמש בפרוקסי כדי להגיע לשירותים חבויים ב-tor (ברירת מחדל: כמו ב- -proxy)</translation> </message> <message> <location line="+2"/> @@ -2341,12 +2350,12 @@ Address: %4 <message> <location line="+2"/> <source>Warning: Disk space is low!</source> - <translation type="unfinished"/> + <translation>אזהרה: חסר מקום בדיסק!</translation> </message> <message> <location line="+1"/> <source>Warning: This version is obsolete, upgrade required!</source> - <translation type="unfinished"/> + <translation>אזהרה: הגרסה הזאת מיושנת, יש צורך בשדרוג!</translation> </message> <message> <location line="-41"/> @@ -2359,22 +2368,22 @@ Address: %4 <translation>האזן לחיבורי JSON-RPC ב<פורט> (ברירת מחדל: 8332)</translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>אפשר חיבורי JSON-RPC מכתובת האינטרנט המצוינת</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>שלח פקודות לצומת ב-<ip> (ברירת מחדל: 127.0.0.1)</translation> </message> <message> - <location line="-89"/> + <location 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 line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>שדרג את הארנק לפורמט העדכני</translation> </message> @@ -2389,7 +2398,7 @@ Address: %4 <translation>סרוק מחדש את שרשרת הבלוקים למציאת פעולות חסרות בארנק</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation>מספר הבלוקים לבדוק בעת ההפעלה (ברירת מחדל: 2500, 0=כולם)</translation> </message> @@ -2399,7 +2408,7 @@ Address: %4 <translation>מידת היסודיות של אימות הבלוקים (0-6, ברירת מחדל: 1)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation>מיבא בלוקים מקובץ blk000?.dat חיצוני</translation> </message> @@ -2419,17 +2428,17 @@ Address: %4 <translation>מפתח פרטי של השרת (ברירת מחדל: server.pem)</translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>הודעת העזרה הזו</translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation>אינו מסוגל לנעול את תיקיית הנתונים %s. כנראה שביטקוין כבר רץ.</translation> </message> @@ -2439,12 +2448,12 @@ Address: %4 <translation>ביטקוין</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>לא מסוגל לקשור ל-%s במחשב זה (הקשירה החזירה שגיאה %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation>התחבר דרך פרוקסי SOCKS</translation> </message> @@ -2454,12 +2463,12 @@ Address: %4 <translation>אפשר בדיקת DNS עבור -addnode, -seednode ו- -connect</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>טוען כתובות...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>שגיאה בטעינת הקובץ blkindex.dat</translation> </message> @@ -2474,17 +2483,17 @@ Address: %4 <translation>שגיאה בטעינת הקובץ wallet.dat: הארנק דורש גרסה חדשה יותר של ביטקוין</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>יש לכתוב מחדש את הארנק: אתחל את ביטקוין לסיום</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>שגיאה בטעינת הקובץ wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation>כתובת -proxy לא תקינה: '%s'</translation> </message> @@ -2499,7 +2508,7 @@ Address: %4 <translation>התבקשה גרסת פרוקסי -socks לא ידועה: %i</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation>לא מסוגל לפתור כתובת -bind: '%s'</translation> </message> @@ -2509,12 +2518,12 @@ Address: %4 <translation>לא מסוגל לפתור כתובת -externalip: '%s'</translation> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>כמות לא תקינה עבור -paytxfee=<amount>: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation>שגיאה: לא ניתן להתחיל צומת</translation> </message> @@ -2534,17 +2543,17 @@ Address: %4 <translation>שגיאה: יצירת הפעולה נכשלה </translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>שולח...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation>כמות לא תקינה</translation> </message> @@ -2559,7 +2568,7 @@ Address: %4 <translation>טוען את אינדקס הבלוקים...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>הוסף צומת להתחברות ונסה לשמור את החיבור פתוח</translation> </message> @@ -2579,12 +2588,12 @@ Address: %4 <translation>עמלה להוסיף לפעולות שאתה שולח עבור כל KB</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>טוען ארנק...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation>לא יכול להוריד דרגת הארנק</translation> </message> @@ -2599,22 +2608,22 @@ Address: %4 <translation>לא יכול לכתוב את כתובת ברירת המחדל</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>סורק מחדש...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>טעינה הושלמה</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation>להשתמש באפשרות %s</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts index db32c85ec9..38892552c6 100644 --- a/src/qt/locale/bitcoin_hr.ts +++ b/src/qt/locale/bitcoin_hr.ts @@ -13,9 +13,13 @@ <translation><b>Bitcoin</b> verzija</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -49,17 +53,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-11"/> <source>&New Address</source> - <translation type="unfinished"/> + <translation>&Nova adresa</translation> </message> <message> <location line="-46"/> <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> - <translation type="unfinished"/> + <translation>Ovo su vaše Bitcoin adrese za primanje isplate. Možda želite dati drukčiju adresu svakom primatelju tako da možete pratiti tko je platio.</translation> </message> <message> <location line="+60"/> <source>&Copy Address</source> - <translation type="unfinished"/> + <translation>&Kopirati adresu</translation> </message> <message> <location line="+11"/> @@ -99,12 +103,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../addressbookpage.cpp" line="+65"/> <source>Copy &Label</source> - <translation type="unfinished"/> + <translation>Kopirati &oznaku</translation> </message> <message> <location line="+2"/> <source>&Edit</source> - <translation type="unfinished"/> + <translation>&Izmjeniti</translation> </message> <message> <location line="+250"/> @@ -215,12 +219,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"/> + <translation>Upozorenje: Ako šifrirate vaš novčanik i izgubite lozinku, <b>IZGUBIT ĆETE SVE SVOJE BITCOINSE!</b></translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> + <translation>Jeste li sigurni da želite šifrirati svoj novčanik?</translation> </message> <message> <location line="+106"/> @@ -278,28 +282,23 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"/> + <translation>Lozinka novčanika je uspješno promijenjena.</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> - <translation type="unfinished"/> + <translation>&Potpišite poruku...</translation> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Usklađivanje s mrežom ...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Pregled</translation> </message> @@ -374,19 +373,19 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Postavke</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> - <translation type="unfinished"/> + <translation>&Šifriraj novčanik...</translation> </message> <message> <location line="+3"/> <source>&Backup Wallet...</source> - <translation type="unfinished"/> + <translation>&Backup novčanika...</translation> </message> <message> <location line="+2"/> <source>&Change Passphrase...</source> - <translation type="unfinished"/> + <translation>&Promijena lozinke...</translation> </message> <message numerus="yes"> <location line="+241"/> @@ -396,7 +395,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+6"/> <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> - <translation type="unfinished"/> + <translation>Preuzeto %1 od %2 blokova povijesti transakcije (%3% done).</translation> </message> <message> <location line="-254"/> @@ -404,9 +403,9 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Izvoz...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Slanje novca na bitcoin adresu</translation> </message> <message> <location line="+6"/> @@ -426,15 +425,10 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+37"/> <source>Modify configuration options for Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation type="unfinished"/> + <translation>Promijeni postavke konfiguracije za bitcoin</translation> </message> <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation>Izvoz podataka iz trenutnog taba u datoteku</translation> </message> @@ -464,27 +458,32 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> <location line="+0"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>Novčanik</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> + <translation>&O Bitcoinu</translation> + </message> + <message> + <location line="+9"/> + <source>&Show / Hide</source> <translation type="unfinished"/> </message> <message> - <location line="+44"/> + <location line="+34"/> <source>&File</source> <translation>&Datoteka</translation> </message> @@ -641,7 +640,7 @@ Adresa:%4 <translation>Došlo je do pogreške kod spremanja podataka novčanika na novu lokaciju.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -649,7 +648,7 @@ Adresa:%4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -709,7 +708,7 @@ Adresa:%4 <message> <location line="+5"/> <source>The entered address "%1" is not a valid Bitcoin address.</source> - <translation type="unfinished"/> + <translation>Upisana adresa "%1" nije valjana bitcoin adresa.</translation> </message> <message> <location line="+5"/> @@ -725,7 +724,7 @@ Adresa:%4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation type="unfinished"/> @@ -733,7 +732,7 @@ Adresa:%4 <message> <location line="-12"/> <source>version</source> - <translation type="unfinished"/> + <translation>verzija</translation> </message> <message> <location line="+2"/> @@ -748,7 +747,7 @@ Adresa:%4 <message> <location line="+4"/> <source>UI options</source> - <translation type="unfinished"/> + <translation>UI postavke</translation> </message> <message> <location line="+1"/> @@ -776,7 +775,7 @@ Adresa:%4 <message> <location line="+16"/> <source>&Main</source> - <translation type="unfinished"/> + <translation>&Glavno</translation> </message> <message> <location line="+6"/> @@ -791,12 +790,12 @@ Adresa:%4 <message> <location line="+31"/> <source>Automatically start Bitcoin after logging in to the system.</source> - <translation type="unfinished"/> + <translation>Automatski pokreni Bitcoin kad se uključi računalo</translation> </message> <message> <location line="+3"/> <source>&Start Bitcoin on system login</source> - <translation type="unfinished"/> + <translation>&Pokreni Bitcoin kod pokretanja sustava</translation> </message> <message> <location line="+7"/> @@ -826,12 +825,12 @@ Adresa:%4 <message> <location line="+7"/> <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source> - <translation type="unfinished"/> + <translation>Spojite se na Bitcon mrežu putem SOCKS proxy-a (npr. kod povezivanja kroz Tor)</translation> </message> <message> <location line="+3"/> <source>&Connect through SOCKS proxy:</source> - <translation type="unfinished"/> + <translation>&Povezivanje putem SOCKS proxy-a:</translation> </message> <message> <location line="+9"/> @@ -851,7 +850,7 @@ Adresa:%4 <message> <location line="+19"/> <source>Port of the proxy (e.g. 9050)</source> - <translation type="unfinished"/> + <translation>Port od proxy-a (npr. 9050)</translation> </message> <message> <location line="+7"/> @@ -871,7 +870,7 @@ Adresa:%4 <message> <location line="+6"/> <source>Show only a tray icon after minimizing the window.</source> - <translation type="unfinished"/> + <translation>Prikaži samo ikonu u sistemskoj traci nakon minimiziranja prozora</translation> </message> <message> <location line="+3"/> @@ -886,12 +885,12 @@ Adresa:%4 <message> <location line="+3"/> <source>M&inimize on close</source> - <translation type="unfinished"/> + <translation>M&inimiziraj kod zatvaranja</translation> </message> <message> <location line="+21"/> <source>&Display</source> - <translation type="unfinished"/> + <translation>&Prikaz</translation> </message> <message> <location line="+8"/> @@ -906,12 +905,12 @@ Adresa:%4 <message> <location line="+11"/> <source>&Unit to show amounts in:</source> - <translation type="unfinished"/> + <translation>&Jedinica za prikazivanje iznosa:</translation> </message> <message> <location line="+13"/> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation type="unfinished"/> + <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 line="+9"/> @@ -921,7 +920,7 @@ Adresa:%4 <message> <location line="+3"/> <source>&Display addresses in transaction list</source> - <translation type="unfinished"/> + <translation>&Prikaži adrese u popisu transakcija</translation> </message> <message> <location line="+71"/> @@ -944,10 +943,10 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> - <translation type="unfinished"/> + <translation>Upozorenje</translation> </message> <message> <location line="-9"/> @@ -992,7 +991,7 @@ Adresa:%4 <message> <location line="-78"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>Novčanik</translation> </message> <message> <location line="+124"/> @@ -1036,7 +1035,7 @@ Adresa:%4 <message> <location filename="../forms/qrcodedialog.ui" line="+14"/> <source>QR Code Dialog</source> - <translation type="unfinished"/> + <translation>QR Code Dijalog</translation> </message> <message> <location line="+59"/> @@ -1106,7 +1105,7 @@ Adresa:%4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1240,7 +1239,7 @@ Adresa:%4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1258,7 +1257,7 @@ Adresa:%4 <message> <location line="+3"/> <source>&Add Recipient</source> - <translation type="unfinished"/> + <translation>&Dodaj primatelja</translation> </message> <message> <location line="+20"/> @@ -1268,7 +1267,7 @@ Adresa:%4 <message> <location line="+3"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>Obriši &sve</translation> </message> <message> <location line="+22"/> @@ -1313,7 +1312,7 @@ Adresa:%4 <message> <location line="+23"/> <source>The recipient address is not valid, please recheck.</source> - <translation type="unfinished"/> + <translation>Adresa primatelja je nevaljala, molimo provjerite je ponovo.</translation> </message> <message> <location line="+5"/> @@ -1323,27 +1322,27 @@ Adresa:%4 <message> <location line="+5"/> <source>The amount exceeds your balance.</source> - <translation type="unfinished"/> + <translation>Iznos je veći od stanja računa.</translation> </message> <message> <location line="+5"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation type="unfinished"/> + <translation>Iznos je veći od stanja računa kad se doda naknada za transakcije od %1.</translation> </message> <message> <location line="+6"/> <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation type="unfinished"/> + <translation>Pronašli smo adresu koja se ponavlja. U svakom plaćanju program može svaku adresu koristiti samo jedanput.</translation> </message> <message> <location line="+5"/> <source>Error: Transaction creation failed.</source> - <translation type="unfinished"/> + <translation>Greška: priprema transakcije nije uspjela.</translation> </message> <message> <location line="+5"/> <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>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> </context> <context> @@ -1431,19 +1430,19 @@ Adresa:%4 <message> <location line="+18"/> <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Unesite Bitcoin adresu (npr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+10"/> <location line="+203"/> <source>Choose an address from the address book</source> - <translation type="unfinished"/> + <translation>Odaberite adresu iz adresara</translation> </message> <message> <location line="-193"/> <location line="+203"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location line="-193"/> @@ -1453,7 +1452,7 @@ Adresa:%4 <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location line="+12"/> @@ -1479,7 +1478,7 @@ Adresa:%4 <location line="+3"/> <location line="+146"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>Obriši &sve</translation> </message> <message> <location line="-87"/> @@ -1495,7 +1494,7 @@ Adresa:%4 <message> <location line="+21"/> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Unesite Bitcoin adresu (npr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+40"/> @@ -1605,7 +1604,7 @@ Adresa:%4 <message> <location line="+8"/> <source>%1/offline</source> - <translation type="unfinished"/> + <translation>%1 nije dostupan</translation> </message> <message> <location line="+2"/> @@ -1646,14 +1645,14 @@ Adresa:%4 <location line="+6"/> <location line="+17"/> <source>From</source> - <translation type="unfinished"/> + <translation>Od</translation> </message> <message> <location line="+1"/> <location line="+22"/> <location line="+58"/> <source>To</source> - <translation type="unfinished"/> + <translation>Za</translation> </message> <message> <location line="-77"/> @@ -1664,7 +1663,7 @@ Adresa:%4 <message> <location line="-2"/> <source>label</source> - <translation type="unfinished"/> + <translation>oznaka</translation> </message> <message> <location line="+37"/> @@ -1683,7 +1682,7 @@ Adresa:%4 <message> <location line="+2"/> <source>not accepted</source> - <translation type="unfinished"/> + <translation>Nije prihvaćeno</translation> </message> <message> <location line="+44"/> @@ -1696,12 +1695,12 @@ Adresa:%4 <message> <location line="-39"/> <source>Transaction fee</source> - <translation type="unfinished"/> + <translation>Naknada za transakciju</translation> </message> <message> <location line="+16"/> <source>Net amount</source> - <translation type="unfinished"/> + <translation>Neto iznos</translation> </message> <message> <location line="+6"/> @@ -1711,7 +1710,7 @@ Adresa:%4 <message> <location line="+2"/> <source>Comment</source> - <translation type="unfinished"/> + <translation>Komentar</translation> </message> <message> <location line="+2"/> @@ -1721,7 +1720,7 @@ Adresa:%4 <message> <location line="+3"/> <source>Generated coins must mature 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, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> + <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 line="+7"/> @@ -2075,7 +2074,7 @@ Adresa:%4 <translation>Bitcoin verzija</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Upotreba:</translation> </message> @@ -2090,12 +2089,12 @@ Adresa:%4 <translation>Prikaži komande</translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Potraži pomoć za komandu</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Postavke:</translation> </message> @@ -2110,7 +2109,7 @@ Adresa:%4 <translation>Odredi proces ID datoteku (ugrađeni izbor: bitcoin.pid)</translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Generiraj novčiće</translation> </message> @@ -2120,7 +2119,7 @@ Adresa:%4 <translation>Ne generiraj novčiće</translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Odredi direktorij za datoteke</translation> </message> @@ -2135,12 +2134,7 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Odredi vremenski prozor za spajanje na mrežu (u milisekundama)</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <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> @@ -2150,27 +2144,27 @@ Adresa:%4 <translation>Održavaj najviše <n> veza sa članovima (default: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <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 line="-104"/> + <location line="-105"/> <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> @@ -2185,7 +2179,7 @@ Adresa:%4 <translation>Prihvati komande iz tekst moda i JSON-RPC</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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> @@ -2195,7 +2189,7 @@ Adresa:%4 <translation>Koristi test mrežu</translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -2207,7 +2201,7 @@ Adresa:%4 <message> <location line="+5"/> <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>Upozorenje: -paytxfee je podešen na preveliki iznos. To je iznos koji ćete platiti za obradu transakcije.</translation> </message> <message> <location line="+3"/> @@ -2217,7 +2211,7 @@ Adresa:%4 <message> <location line="+3"/> <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>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 line="+13"/> @@ -2232,7 +2226,7 @@ Adresa:%4 <message> <location line="+6"/> <source>Connect only to the specified node(s)</source> - <translation type="unfinished"/> + <translation>Poveži se samo sa određenim nodom</translation> </message> <message> <location line="+3"/> @@ -2250,11 +2244,16 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>Invalid -tor address: '%s'</source> + <location line="+6"/> + <source>Importing blocks...</source> <translation type="unfinished"/> </message> <message> + <location line="+4"/> + <source>Invalid -tor address: '%s'</source> + <translation>Nevaljala -tor adresa: '%s'</translation> + </message> + <message> <location line="+10"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> <translation type="unfinished"/> @@ -2287,7 +2286,7 @@ Adresa:%4 <message> <location line="+4"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation type="unfinished"/> + <translation>SSL postavke: (za detalje o podešavanju SSL opcija vidi Bitcoin Wiki)</translation> </message> <message> <location line="+1"/> @@ -2320,14 +2319,19 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>Odredi vremenski prozor za spajanje na mrežu u milisekundama (ugrađeni izbor: 5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> - <translation type="unfinished"/> + <translation>Pokušaj koristiti UPnP da otvoriš port za uslugu (default: 0)</translation> </message> <message> <location line="+1"/> <source>Use UPnP to map the listening port (default: 1 when listening)</source> - <translation type="unfinished"/> + <translation>Pokušaj koristiti UPnP da otvoriš port za uslugu (default: 1 when listening)</translation> </message> <message> <location line="+1"/> @@ -2342,7 +2346,7 @@ Adresa:%4 <message> <location line="+2"/> <source>Warning: Disk space is low!</source> - <translation type="unfinished"/> + <translation>Upozorenje: Malo diskovnog prostora</translation> </message> <message> <location line="+1"/> @@ -2360,22 +2364,22 @@ Adresa:%4 <translation>Prihvaćaj JSON-RPC povezivanje na portu broj <port> (ugrađeni izbor: 8332)</translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Dozvoli JSON-RPC povezivanje s određene IP adrese</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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 line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> @@ -2390,7 +2394,7 @@ Adresa:%4 <translation>Ponovno pretraži lanac blokova za transakcije koje nedostaju</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2400,7 +2404,7 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation type="unfinished"/> </message> @@ -2420,17 +2424,17 @@ Adresa:%4 <translation>Uslužnikov privatni ključ (ugrađeni izbor: server.pem)</translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Ova poruka za pomoć</translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <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> @@ -2440,27 +2444,27 @@ Adresa:%4 <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> - <translation type="unfinished"/> + <translation>Program ne može koristiti %s na ovom računalu (bind returned error %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> - <translation type="unfinished"/> + <translation>Poveži se kroz socks proxy</translation> </message> <message> <location line="-13"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation type="unfinished"/> + <translation>Dozvoli DNS upite za dodavanje nodova i povezivanje</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Učitavanje adresa...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>Greška kod učitavanja blkindex.dat</translation> </message> @@ -2475,19 +2479,19 @@ Adresa:%4 <translation>Greška kod učitavanja wallet.dat: Novčanik zahtjeva noviju verziju Bitcoina</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Novčanik je trebao prepravak: ponovo pokrenite Bitcoin</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>Greška kod učitavanja wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> - <translation type="unfinished"/> + <translation>Nevaljala -proxy adresa: '%s'</translation> </message> <message> <location line="+47"/> @@ -2500,7 +2504,7 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2510,12 +2514,12 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> - <translation type="unfinished"/> + <translation>Nevaljali iznos za opciju -paytxfee=<amount>: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"/> </message> @@ -2527,7 +2531,7 @@ Adresa:%4 <message> <location line="-55"/> <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>Ova transakcija je preko ograničenja veličine. Možete ju ipak poslati za naknadu od %1, koja se daje čvorovima koji procesiraju vaše transakcije i tako podržavate mrežu. Želite li platiti naknadu?</translation> </message> <message> <location line="+54"/> @@ -2535,19 +2539,19 @@ Adresa:%4 <translation>Greška: priprema transakcije nije uspjela</translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Slanje...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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>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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> - <translation type="unfinished"/> + <translation>Nevaljali iznos za opciju</translation> </message> <message> <location line="-4"/> @@ -2560,14 +2564,14 @@ Adresa:%4 <translation>Učitavanje indeksa blokova...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> - <translation type="unfinished"/> + <translation>Unesite nod s kojim se želite spojiti and attempt to keep the connection open</translation> </message> <message> <location line="-18"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"/> + <translation>Program ne može koristiti %s na ovom računalu. Bitcoin program je vjerojatno već pokrenut.</translation> </message> <message> <location line="+48"/> @@ -2580,12 +2584,12 @@ Adresa:%4 <translation>Naknada posredniku po KB-u koja će biti dodana svakoj transakciji koju pošalješ</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Učitavanje novčanika...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -2600,22 +2604,22 @@ Adresa:%4 <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Rescaniranje</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Učitavanje gotovo</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts index cd4df3f2bb..cd3dd4a7df 100644 --- a/src/qt/locale/bitcoin_hu.ts +++ b/src/qt/locale/bitcoin_hu.ts @@ -13,15 +13,23 @@ <translation><b>Bitcoin</b> verzió</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation>Szerzői jog © 2009-2012 Bitcoin Developers</translation> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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 type="unfinished"/> + <translation> +Ez egy kísérleti program. +MIT/X11 szoftverlicenc alatt kiadva, lásd a mellékelt fájlt COPYING vagy http://www.opensource.org/licenses/mit-license.php. + +Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (http://www.openssl.org/) és kriptográfiai szoftvertben való felhasználásra, írta Eric Young (eay@cryptsoft.com) és UPnP szoftver, írta Thomas Bernard.</translation> </message> </context> <context> @@ -49,17 +57,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-11"/> <source>&New Address</source> - <translation type="unfinished"/> + <translation>&Új cím</translation> </message> <message> <location line="-46"/> <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> - <translation type="unfinished"/> + <translation>Ezekkel a Bitcoin-címekkel fogadhatod kifizetéseket. Érdemes lehet minden egyes kifizető számára külön címet létrehozni, hogy könnyebben nyomon követhesd, kitől kaptál már pénzt.</translation> </message> <message> <location line="+60"/> <source>&Copy Address</source> - <translation type="unfinished"/> + <translation>&Cím másolása</translation> </message> <message> <location line="+11"/> @@ -99,7 +107,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../addressbookpage.cpp" line="+65"/> <source>Copy &Label</source> - <translation type="unfinished"/> + <translation>Címke &másolása</translation> </message> <message> <location line="+2"/> @@ -215,12 +223,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"/> + <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></translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> + <translation>Biztosan kódolni akarod a tárcát?</translation> </message> <message> <location line="+106"/> @@ -237,7 +245,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-48"/> <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 type="unfinished"/> + <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 line="+5"/> @@ -278,28 +286,23 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"/> + <translation>Jelszó megváltoztatva.</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation type="unfinished"/> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Szinkronizálás a hálózattal...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Áttekintés</translation> </message> @@ -361,12 +364,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+2"/> <source>About &Qt</source> - <translation type="unfinished"/> + <translation>A &Qt-ról</translation> </message> <message> <location line="+1"/> <source>Show information about Qt</source> - <translation type="unfinished"/> + <translation>Információk a Qt ról</translation> </message> <message> <location line="+2"/> @@ -374,9 +377,9 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Opciók...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> - <translation type="unfinished"/> + <translation>Tárca &kódolása...</translation> </message> <message> <location line="+3"/> @@ -386,7 +389,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+2"/> <source>&Change Passphrase...</source> - <translation type="unfinished"/> + <translation>Jelszó &megváltoztatása...</translation> </message> <message numerus="yes"> <location line="+241"/> @@ -396,7 +399,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+6"/> <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> - <translation type="unfinished"/> + <translation>%1 blokk letöltve a tranzakciótörténet %2 blokkjából (%3% done).</translation> </message> <message> <location line="-254"/> @@ -404,9 +407,9 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Exportálás...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Érmék küldése megadott címre</translation> </message> <message> <location line="+6"/> @@ -426,17 +429,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+37"/> <source>Modify configuration options for Bitcoin</source> - <translation type="unfinished"/> + <translation>Bitcoin konfigurációs opciók</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> + <translation>Jelenlegi nézet exportálása fájlba</translation> </message> <message> <location line="+2"/> @@ -464,27 +462,32 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> <location line="+0"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>Tárca</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> + <translation>&A Bitcoinról</translation> + </message> + <message> + <location line="+9"/> + <source>&Show / Hide</source> <translation type="unfinished"/> </message> <message> - <location line="+44"/> + <location line="+34"/> <source>&File</source> <translation>&Fájl</translation> </message> @@ -641,7 +644,7 @@ Cím: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -649,7 +652,7 @@ Cím: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -709,7 +712,7 @@ Cím: %4 <message> <location line="+5"/> <source>The entered address "%1" is not a valid Bitcoin address.</source> - <translation type="unfinished"/> + <translation>A megadott "%1" cím nem egy érvényes Bitcoin-cím.</translation> </message> <message> <location line="+5"/> @@ -725,7 +728,7 @@ Cím: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation type="unfinished"/> @@ -733,7 +736,7 @@ Cím: %4 <message> <location line="-12"/> <source>version</source> - <translation type="unfinished"/> + <translation>verzió</translation> </message> <message> <location line="+2"/> @@ -748,7 +751,7 @@ Cím: %4 <message> <location line="+4"/> <source>UI options</source> - <translation type="unfinished"/> + <translation>UI opciók</translation> </message> <message> <location line="+1"/> @@ -777,12 +780,12 @@ Cím: %4 <message> <location line="+16"/> <source>&Main</source> - <translation type="unfinished"/> + <translation>&Fő</translation> </message> <message> <location line="+6"/> <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>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 line="+15"/> @@ -792,12 +795,12 @@ Cím: %4 <message> <location line="+31"/> <source>Automatically start Bitcoin after logging in to the system.</source> - <translation type="unfinished"/> + <translation>Induljon el a Bitcoin a számítógép bekapcsolásakor</translation> </message> <message> <location line="+3"/> <source>&Start Bitcoin on system login</source> - <translation type="unfinished"/> + <translation>&Induljon el a számítógép bekapcsolásakor</translation> </message> <message> <location line="+7"/> @@ -827,12 +830,12 @@ Cím: %4 <message> <location line="+7"/> <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source> - <translation type="unfinished"/> + <translation>SOCKS proxyn keresztüli csatlakozás a Bitcoin hálózatához (pl. Tor-on keresztüli csatlakozás esetén)</translation> </message> <message> <location line="+3"/> <source>&Connect through SOCKS proxy:</source> - <translation type="unfinished"/> + <translation>&Csatlakozás SOCKS proxyn keresztül:</translation> </message> <message> <location line="+9"/> @@ -852,7 +855,7 @@ Cím: %4 <message> <location line="+19"/> <source>Port of the proxy (e.g. 9050)</source> - <translation type="unfinished"/> + <translation>Proxy portja (pl.: 9050)</translation> </message> <message> <location line="+7"/> @@ -872,7 +875,7 @@ Cím: %4 <message> <location line="+6"/> <source>Show only a tray icon after minimizing the window.</source> - <translation type="unfinished"/> + <translation>Kicsinyítés után csak eszköztár-ikont mutass</translation> </message> <message> <location line="+3"/> @@ -887,12 +890,12 @@ Cím: %4 <message> <location line="+3"/> <source>M&inimize on close</source> - <translation type="unfinished"/> + <translation>K&icsinyítés záráskor</translation> </message> <message> <location line="+21"/> <source>&Display</source> - <translation type="unfinished"/> + <translation>&Megjelenítés</translation> </message> <message> <location line="+8"/> @@ -907,12 +910,12 @@ Cím: %4 <message> <location line="+11"/> <source>&Unit to show amounts in:</source> - <translation type="unfinished"/> + <translation>&Mértékegység:</translation> </message> <message> <location line="+13"/> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation type="unfinished"/> + <translation>Válaszd ki az interfészen és érmék küldésekor megjelenítendő alapértelmezett alegységet.</translation> </message> <message> <location line="+9"/> @@ -922,7 +925,7 @@ Cím: %4 <message> <location line="+3"/> <source>&Display addresses in transaction list</source> - <translation type="unfinished"/> + <translation>&Címek megjelenítése a tranzakciólistában</translation> </message> <message> <location line="+71"/> @@ -945,10 +948,10 @@ Cím: %4 <translation type="unfinished"/> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> - <translation type="unfinished"/> + <translation>Figyelem</translation> </message> <message> <location line="-9"/> @@ -993,7 +996,7 @@ Cím: %4 <message> <location line="-78"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>Tárca</translation> </message> <message> <location line="+124"/> @@ -1047,12 +1050,12 @@ Cím: %4 <message> <location line="+56"/> <source>Amount:</source> - <translation type="unfinished"/> + <translation>Összeg:</translation> </message> <message> <location line="-44"/> <source>Label:</source> - <translation type="unfinished"/> + <translation>Címke:</translation> </message> <message> <location line="+19"/> @@ -1107,7 +1110,7 @@ Cím: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1241,7 +1244,7 @@ Cím: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1259,7 +1262,7 @@ Cím: %4 <message> <location line="+3"/> <source>&Add Recipient</source> - <translation type="unfinished"/> + <translation>&Címzett hozzáadása</translation> </message> <message> <location line="+20"/> @@ -1269,7 +1272,7 @@ Cím: %4 <message> <location line="+3"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>Mindent &töröl</translation> </message> <message> <location line="+22"/> @@ -1314,7 +1317,7 @@ Cím: %4 <message> <location line="+23"/> <source>The recipient address is not valid, please recheck.</source> - <translation type="unfinished"/> + <translation>A címzett címe érvénytelen, kérlek, ellenőrizd.</translation> </message> <message> <location line="+5"/> @@ -1324,27 +1327,27 @@ Cím: %4 <message> <location line="+5"/> <source>The amount exceeds your balance.</source> - <translation type="unfinished"/> + <translation>Nincs ennyi bitcoin az egyenlegeden.</translation> </message> <message> <location line="+5"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation type="unfinished"/> + <translation>A küldeni kívánt összeg és a %1 tranzakciós díj együtt meghaladja az egyenlegeden rendelkezésedre álló összeget.</translation> </message> <message> <location line="+6"/> <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation type="unfinished"/> + <translation>Többször szerepel ugyanaz a cím. Egy küldési műveletben egy címre csak egyszer lehet küldeni.</translation> </message> <message> <location line="+5"/> <source>Error: Transaction creation failed.</source> - <translation type="unfinished"/> + <translation>Hiba: nem sikerült létrehozni a tranzakciót.</translation> </message> <message> <location line="+5"/> <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>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> </context> <context> @@ -1433,19 +1436,19 @@ Cím: %4 <message> <location line="+18"/> <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Adj meg egy Bitcoin-címet (pl.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L )</translation> </message> <message> <location line="+10"/> <location line="+203"/> <source>Choose an address from the address book</source> - <translation type="unfinished"/> + <translation>Válassz egy címet a címjegyzékből</translation> </message> <message> <location line="-193"/> <location line="+203"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location line="-193"/> @@ -1455,7 +1458,7 @@ Cím: %4 <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location line="+12"/> @@ -1481,7 +1484,7 @@ Cím: %4 <location line="+3"/> <location line="+146"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>Mindent &töröl</translation> </message> <message> <location line="-87"/> @@ -1497,7 +1500,7 @@ Cím: %4 <message> <location line="+21"/> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Adj meg egy Bitcoin-címet (pl.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L )</translation> </message> <message> <location line="+40"/> @@ -1648,14 +1651,14 @@ Cím: %4 <location line="+6"/> <location line="+17"/> <source>From</source> - <translation type="unfinished"/> + <translation>Űrlap</translation> </message> <message> <location line="+1"/> <location line="+22"/> <location line="+58"/> <source>To</source> - <translation type="unfinished"/> + <translation>Címzett</translation> </message> <message> <location line="-77"/> @@ -1666,7 +1669,7 @@ Cím: %4 <message> <location line="-2"/> <source>label</source> - <translation type="unfinished"/> + <translation>címke</translation> </message> <message> <location line="+37"/> @@ -1685,7 +1688,7 @@ Cím: %4 <message> <location line="+2"/> <source>not accepted</source> - <translation type="unfinished"/> + <translation>elutasítva</translation> </message> <message> <location line="+44"/> @@ -1698,22 +1701,22 @@ Cím: %4 <message> <location line="-39"/> <source>Transaction fee</source> - <translation type="unfinished"/> + <translation>Tranzakciós díj</translation> </message> <message> <location line="+16"/> <source>Net amount</source> - <translation type="unfinished"/> + <translation>Nettó összeg</translation> </message> <message> <location line="+6"/> <source>Message</source> - <translation type="unfinished"/> + <translation>Üzenet</translation> </message> <message> <location line="+2"/> <source>Comment</source> - <translation type="unfinished"/> + <translation>Megjegyzés</translation> </message> <message> <location line="+2"/> @@ -1723,7 +1726,7 @@ Cím: %4 <message> <location line="+3"/> <source>Generated coins must mature 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, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> + <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 line="+7"/> @@ -1733,7 +1736,7 @@ Cím: %4 <message> <location line="+8"/> <source>Transaction</source> - <translation type="unfinished"/> + <translation>Tranzakció</translation> </message> <message> <location line="+5"/> @@ -1849,7 +1852,7 @@ Cím: %4 <message> <location line="+2"/> <source>Received from</source> - <translation type="unfinished"/> + <translation>Erről az</translation> </message> <message> <location line="+3"/> @@ -2077,7 +2080,7 @@ Cím: %4 <translation>Bitcoin verzió</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Használat:</translation> </message> @@ -2094,13 +2097,13 @@ Cím: %4 </translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Segítség egy parancsról </translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Opciók </translation> @@ -2118,7 +2121,7 @@ Cím: %4 </translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Érmék generálása </translation> @@ -2130,7 +2133,7 @@ Cím: %4 </translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Adatkönyvtár </translation> @@ -2146,15 +2149,9 @@ Cím: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Csatlakozás időkerete (milliszekundumban) -</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation type="unfinished"/> + <translation>Csatlakozásokhoz figyelendő <port> (alapértelmezett: 8333 or testnet: 18333)</translation> </message> <message> <location line="+4"/> @@ -2162,27 +2159,27 @@ Cím: %4 <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -2198,7 +2195,7 @@ Cím: %4 </translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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> @@ -2210,7 +2207,7 @@ Cím: %4 </translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -2222,7 +2219,7 @@ Cím: %4 <message> <location line="+5"/> <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>Figyelem: a -paytxfee nagyon magas. Ennyi tranzakciós díjat fogsz fizetni, ha elküldöd a tranzakciót.</translation> </message> <message> <location line="+3"/> @@ -2232,7 +2229,7 @@ Cím: %4 <message> <location line="+3"/> <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>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 line="+13"/> @@ -2247,7 +2244,7 @@ Cím: %4 <message> <location line="+6"/> <source>Connect only to the specified node(s)</source> - <translation type="unfinished"/> + <translation>Csatlakozás csak a megadott csomóponthoz</translation> </message> <message> <location line="+3"/> @@ -2265,11 +2262,16 @@ Cím: %4 <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>Invalid -tor address: '%s'</source> + <location line="+6"/> + <source>Importing blocks...</source> <translation type="unfinished"/> </message> <message> + <location line="+4"/> + <source>Invalid -tor address: '%s'</source> + <translation>Érvénytelen -tor cím: '%s'</translation> + </message> + <message> <location line="+10"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> <translation type="unfinished"/> @@ -2302,7 +2304,7 @@ Cím: %4 <message> <location line="+4"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation type="unfinished"/> + <translation>SSL-opciók: (lásd a Bitcoin Wiki SSL-beállítási instrukcióit)</translation> </message> <message> <location line="+1"/> @@ -2335,14 +2337,19 @@ Cím: %4 <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>Csatlakozás időkerete milliszekundumban (alapértelmezett: 5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> - <translation type="unfinished"/> + <translation>UPnP-használat engedélyezése a figyelő port feltérképezésénél (default: 0)</translation> </message> <message> <location line="+1"/> <source>Use UPnP to map the listening port (default: 1 when listening)</source> - <translation type="unfinished"/> + <translation>UPnP-használat engedélyezése a figyelő port feltérképezésénél (default: 1 when listening)</translation> </message> <message> <location line="+1"/> @@ -2358,7 +2365,7 @@ Cím: %4 <message> <location line="+2"/> <source>Warning: Disk space is low!</source> - <translation type="unfinished"/> + <translation>Figyelem: kevés a hely a lemezen</translation> </message> <message> <location line="+1"/> @@ -2378,24 +2385,24 @@ Cím: %4 </translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <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 line="+60"/> + <location line="+61"/> <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 line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> @@ -2412,7 +2419,7 @@ Cím: %4 </translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2422,7 +2429,7 @@ Cím: %4 <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation type="unfinished"/> </message> @@ -2445,19 +2452,19 @@ Cím: %4 </translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Ez a súgó-üzenet </translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <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> @@ -2467,54 +2474,54 @@ Cím: %4 <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> - <translation type="unfinished"/> + <translation>A %s nem elérhető ezen a gépen (bind returned error %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> - <translation type="unfinished"/> + <translation>Csatlakozás SOCKS proxyn keresztül</translation> </message> <message> <location line="-13"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation type="unfinished"/> + <translation>DNS-kikeresés engedélyezése az addnode-nál és a connect-nél</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Címek betöltése...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> - <translation type="unfinished"/> + <translation>Hiba az blkindex.dat betöltése közben</translation> </message> <message> <location line="+2"/> <source>Error loading wallet.dat: Wallet corrupted</source> - <translation type="unfinished"/> + <translation>Hiba a wallet.dat betöltése közben: meghibásodott tárca</translation> </message> <message> <location line="+1"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation type="unfinished"/> + <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 line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> - <translation type="unfinished"/> + <translation>Hiba az wallet.dat betöltése közben</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> - <translation type="unfinished"/> + <translation>Érvénytelen -proxy cím: '%s'</translation> </message> <message> <location line="+47"/> @@ -2527,7 +2534,7 @@ Cím: %4 <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2537,12 +2544,12 @@ Cím: %4 <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> - <translation type="unfinished"/> + <translation>Étvénytelen -paytxfee=<összeg> összeg: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"/> </message> @@ -2554,7 +2561,7 @@ Cím: %4 <message> <location line="-55"/> <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>Ez a tranzakció túllépi a mérethatárt, de %1 tranzakciós díj ellenében így is elküldheted. Ezt a plusz összeget a tranzakcióidat feldolgozó csomópontok kapják, így magát a hálózatot támogatod vele. Hajlandó vagy megfizetni a díjat?</translation> </message> <message> <location line="+54"/> @@ -2562,19 +2569,19 @@ Cím: %4 <translation>Hiba: nem sikerült létrehozni a tranzakciót </translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Küldés...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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>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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> - <translation type="unfinished"/> + <translation>Étvénytelen összeg</translation> </message> <message> <location line="-4"/> @@ -2587,14 +2594,14 @@ Cím: %4 <translation>Blokkindex betöltése...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> - <translation type="unfinished"/> + <translation>Elérendő csomópont megadása and attempt to keep the connection open</translation> </message> <message> <location line="-18"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"/> + <translation>A %s nem elérhető ezen a gépen. A Bitcoin valószínűleg fut már.</translation> </message> <message> <location line="+48"/> @@ -2604,15 +2611,15 @@ Cím: %4 <message> <location line="-2"/> <source>Fee per KB to add to transactions you send</source> - <translation type="unfinished"/> + <translation>kB-onként felajánlandó díj az általad küldött tranzakciókhoz</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Tárca betöltése...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -2627,22 +2634,22 @@ Cím: %4 <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Újraszkennelés...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Betöltés befejezve.</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2656,7 +2663,7 @@ If the file does not exist, create it with owner-readable-only file permissions. <message> <location line="+74"/> <source>Error</source> - <translation type="unfinished"/> + <translation>Hiba</translation> </message> <message> <location line="-30"/> diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts index 76f6396a03..ea6c4c1f3a 100644 --- a/src/qt/locale/bitcoin_it.ts +++ b/src/qt/locale/bitcoin_it.ts @@ -13,15 +13,24 @@ <translation>Versione di <b>Bitcoin</b></translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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 type="unfinished"/> + <translation> +Questo è un software sperimentale. + +Distribuito sotto la licenza software MIT/X11, vedi il file COPYING incluso oppure su http://www.opensource.org/licenses/mit-license.php. + +Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso del Toolkit OpenSSL (http://www.openssl.org/), software crittografico scritto da Eric Young (eay@cryptsoft.com) e software UPnP scritto da Thomas Bernard.</translation> </message> </context> <context> @@ -49,17 +58,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-11"/> <source>&New Address</source> - <translation type="unfinished"/> + <translation>&Nuovo indirizzo</translation> </message> <message> <location line="-46"/> <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> - <translation type="unfinished"/> + <translation>Questi sono i tuoi indirizzi Bitcoin per ricevere pagamenti. Potrai darne uno diverso ad ognuno per tenere così traccia di chi ti sta pagando.</translation> </message> <message> <location line="+60"/> <source>&Copy Address</source> - <translation type="unfinished"/> + <translation>&Copia l'indirizzo</translation> </message> <message> <location line="+11"/> @@ -69,7 +78,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+11"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Firma un messaggio per dimostrare di possedere questo indirizzo</translation> </message> <message> <location line="+3"/> @@ -99,12 +108,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../addressbookpage.cpp" line="+65"/> <source>Copy &Label</source> - <translation type="unfinished"/> + <translation>Copia &l'etichetta</translation> </message> <message> <location line="+2"/> <source>&Edit</source> - <translation type="unfinished"/> + <translation>&Modifica</translation> </message> <message> <location line="+250"/> @@ -215,18 +224,18 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"/> + <translation>Attenzione: se si cifra il portamonete e si perde la frase d'ordine, <b>SI PERDERANNO TUTTI I PROPRI BITCOIN</b>!</translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> + <translation>Si è sicuri di voler cifrare il portamonete?</translation> </message> <message> <location line="+106"/> <location line="+24"/> <source>Warning: The Caps Lock key is on!</source> - <translation type="unfinished"/> + <translation>Attenzione: tasto Blocco maiuscole attivo.</translation> </message> <message> <location line="-121"/> @@ -278,28 +287,23 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"/> + <translation>Passphrase del portamonete modificata con successo.</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>Mostra/Nascondi &Bitcoin</translation> + <translation>Firma il &messaggio...</translation> </message> <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Sto sincronizzando con la rete...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Sintesi</translation> </message> @@ -374,19 +378,19 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Opzioni...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> - <translation type="unfinished"/> + <translation>&Cifra il portamonete...</translation> </message> <message> <location line="+3"/> <source>&Backup Wallet...</source> - <translation type="unfinished"/> + <translation>&Backup Portamonete...</translation> </message> <message> <location line="+2"/> <source>&Change Passphrase...</source> - <translation type="unfinished"/> + <translation>&Cambia la passphrase...</translation> </message> <message numerus="yes"> <location line="+241"/> @@ -404,14 +408,14 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Esporta...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Invia monete ad un indirizzo bitcoin</translation> </message> <message> <location line="+6"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Firma un messaggio per dimostrare di possedere questo indirizzo</translation> </message> <message> <location line="+4"/> @@ -426,15 +430,10 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+37"/> <source>Modify configuration options for Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>Mostra o nascondi la finestra Bitcoin</translation> + <translation>Modifica configurazione opzioni per bitcoin</translation> </message> <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation>Esporta i dati nella tabella corrente su un file</translation> </message> @@ -464,27 +463,32 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> <location line="+0"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>Portamonete</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> - <translation type="unfinished"/> + <translation>&Info su Bitcoin</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>&Mostra/Nascondi</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>&File</translation> </message> @@ -642,7 +646,7 @@ Indirizzo: %4 <translation>C'è stato un errore tentanto di salvare i dati del portamonete in un'altra locazione</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -650,7 +654,7 @@ Indirizzo: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -710,7 +714,7 @@ Indirizzo: %4 <message> <location line="+5"/> <source>The entered address "%1" is not a valid Bitcoin address.</source> - <translation type="unfinished"/> + <translation>L'indirizzo inserito "%1" non è un indirizzo bitcoin valido.</translation> </message> <message> <location line="+5"/> @@ -726,7 +730,7 @@ Indirizzo: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation type="unfinished"/> @@ -734,7 +738,7 @@ Indirizzo: %4 <message> <location line="-12"/> <source>version</source> - <translation type="unfinished"/> + <translation>versione</translation> </message> <message> <location line="+2"/> @@ -749,7 +753,7 @@ Indirizzo: %4 <message> <location line="+4"/> <source>UI options</source> - <translation type="unfinished"/> + <translation>UI opzioni</translation> </message> <message> <location line="+1"/> @@ -778,7 +782,7 @@ Indirizzo: %4 <message> <location line="+16"/> <source>&Main</source> - <translation type="unfinished"/> + <translation>&Principale</translation> </message> <message> <location line="+6"/> @@ -793,12 +797,12 @@ Indirizzo: %4 <message> <location line="+31"/> <source>Automatically start Bitcoin after logging in to the system.</source> - <translation type="unfinished"/> + <translation>Avvia automaticamente Bitcoin all'accensione del computer</translation> </message> <message> <location line="+3"/> <source>&Start Bitcoin on system login</source> - <translation type="unfinished"/> + <translation>&Fai partire Bitcoin all'avvio del sistema</translation> </message> <message> <location line="+7"/> @@ -828,17 +832,17 @@ Indirizzo: %4 <message> <location line="+7"/> <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source> - <translation type="unfinished"/> + <translation>Connettiti alla rete Bitcon attraverso un proxy SOCKS (ad esempio quando ci si collega via Tor)</translation> </message> <message> <location line="+3"/> <source>&Connect through SOCKS proxy:</source> - <translation type="unfinished"/> + <translation>&Collegati tramite SOCKS proxy:</translation> </message> <message> <location line="+9"/> <source>Proxy &IP:</source> - <translation type="unfinished"/> + <translation>&IP del proxy:</translation> </message> <message> <location line="+19"/> @@ -848,12 +852,12 @@ Indirizzo: %4 <message> <location line="+7"/> <source>&Port:</source> - <translation type="unfinished"/> + <translation>&Porta:</translation> </message> <message> <location line="+19"/> <source>Port of the proxy (e.g. 9050)</source> - <translation type="unfinished"/> + <translation>Porta del proxy (es. 9050)</translation> </message> <message> <location line="+7"/> @@ -873,7 +877,7 @@ Indirizzo: %4 <message> <location line="+6"/> <source>Show only a tray icon after minimizing the window.</source> - <translation type="unfinished"/> + <translation>Mostra solo un'icona nel tray quando si minimizza la finestra</translation> </message> <message> <location line="+3"/> @@ -888,12 +892,12 @@ Indirizzo: %4 <message> <location line="+3"/> <source>M&inimize on close</source> - <translation type="unfinished"/> + <translation>M&inimizza alla chiusura</translation> </message> <message> <location line="+21"/> <source>&Display</source> - <translation type="unfinished"/> + <translation>&Mostra</translation> </message> <message> <location line="+8"/> @@ -908,12 +912,12 @@ Indirizzo: %4 <message> <location line="+11"/> <source>&Unit to show amounts in:</source> - <translation type="unfinished"/> + <translation>&Unità di misura degli importi in:</translation> </message> <message> <location line="+13"/> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation type="unfinished"/> + <translation>Scegli l'unità di suddivisione di default per l'interfaccia e per l'invio di monete</translation> </message> <message> <location line="+9"/> @@ -923,7 +927,7 @@ Indirizzo: %4 <message> <location line="+3"/> <source>&Display addresses in transaction list</source> - <translation type="unfinished"/> + <translation>&Mostra gli indirizzi nella lista delle transazioni</translation> </message> <message> <location line="+71"/> @@ -946,10 +950,10 @@ Indirizzo: %4 <translation type="unfinished"/> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> - <translation type="unfinished"/> + <translation>Attenzione</translation> </message> <message> <location line="-9"/> @@ -994,7 +998,7 @@ Indirizzo: %4 <message> <location line="-78"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>Portamonete</translation> </message> <message> <location line="+124"/> @@ -1108,7 +1112,7 @@ Indirizzo: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1242,7 +1246,7 @@ Indirizzo: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1260,7 +1264,7 @@ Indirizzo: %4 <message> <location line="+3"/> <source>&Add Recipient</source> - <translation type="unfinished"/> + <translation>&Aggiungi beneficiario</translation> </message> <message> <location line="+20"/> @@ -1270,7 +1274,7 @@ Indirizzo: %4 <message> <location line="+3"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>Cancella &tutto</translation> </message> <message> <location line="+22"/> @@ -1315,7 +1319,7 @@ Indirizzo: %4 <message> <location line="+23"/> <source>The recipient address is not valid, please recheck.</source> - <translation type="unfinished"/> + <translation>L'indirizzo del beneficiario non è valido, per cortesia controlla.</translation> </message> <message> <location line="+5"/> @@ -1325,27 +1329,27 @@ Indirizzo: %4 <message> <location line="+5"/> <source>The amount exceeds your balance.</source> - <translation type="unfinished"/> + <translation>Nincs ennyi bitcoin az egyenlegeden.</translation> </message> <message> <location line="+5"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation type="unfinished"/> + <translation>Il totale è superiore al saldo attuale includendo la commissione %1.</translation> </message> <message> <location line="+6"/> <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation type="unfinished"/> + <translation>Trovato un indirizzo doppio, si può spedire solo una volta a ciascun indirizzo in una singola operazione.</translation> </message> <message> <location line="+5"/> <source>Error: Transaction creation failed.</source> - <translation type="unfinished"/> + <translation>Errore: creazione della transazione fallita.</translation> </message> <message> <location line="+5"/> <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>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> @@ -1433,19 +1437,19 @@ Indirizzo: %4 <message> <location line="+18"/> <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Inserisci un indirizzo Bitcoin (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+10"/> <location line="+203"/> <source>Choose an address from the address book</source> - <translation type="unfinished"/> + <translation>Scegli l'indirizzo dalla rubrica</translation> </message> <message> <location line="-193"/> <location line="+203"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location line="-193"/> @@ -1455,7 +1459,7 @@ Indirizzo: %4 <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location line="+12"/> @@ -1470,7 +1474,7 @@ Indirizzo: %4 <message> <location line="+21"/> <source>Sign the message to prove you own this Bitcoin address</source> - <translation type="unfinished"/> + <translation>Firma un messaggio per dimostrare di possedere questo indirizzo</translation> </message> <message> <location line="+17"/> @@ -1481,7 +1485,7 @@ Indirizzo: %4 <location line="+3"/> <location line="+146"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>Cancella &tutto</translation> </message> <message> <location line="-87"/> @@ -1497,7 +1501,7 @@ Indirizzo: %4 <message> <location line="+21"/> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Inserisci un indirizzo Bitcoin (ad esempio 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+40"/> @@ -1518,7 +1522,7 @@ Indirizzo: %4 <message> <location line="-2"/> <source>Click "Sign Message" to generate signature</source> - <translation type="unfinished"/> + <translation>Clicca "Firma il messaggio" per ottenere la firma</translation> </message> <message> <location line="+3"/> @@ -1648,7 +1652,7 @@ Indirizzo: %4 <location line="+6"/> <location line="+17"/> <source>From</source> - <translation type="unfinished"/> + <translation>Da</translation> </message> <message> <location line="+1"/> @@ -1666,7 +1670,7 @@ Indirizzo: %4 <message> <location line="-2"/> <source>label</source> - <translation type="unfinished"/> + <translation>etichetta</translation> </message> <message> <location line="+37"/> @@ -1685,7 +1689,7 @@ Indirizzo: %4 <message> <location line="+2"/> <source>not accepted</source> - <translation type="unfinished"/> + <translation>non accettate</translation> </message> <message> <location line="+44"/> @@ -1698,12 +1702,12 @@ Indirizzo: %4 <message> <location line="-39"/> <source>Transaction fee</source> - <translation type="unfinished"/> + <translation>Tranzakciós díj</translation> </message> <message> <location line="+16"/> <source>Net amount</source> - <translation type="unfinished"/> + <translation>Importo netto</translation> </message> <message> <location line="+6"/> @@ -1713,17 +1717,17 @@ Indirizzo: %4 <message> <location line="+2"/> <source>Comment</source> - <translation type="unfinished"/> + <translation>Commento</translation> </message> <message> <location line="+2"/> <source>Transaction ID</source> - <translation type="unfinished"/> + <translation>ID della transazione</translation> </message> <message> <location line="+3"/> <source>Generated coins must mature 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, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> + <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 line="+7"/> @@ -2077,7 +2081,7 @@ Indirizzo: %4 <translation>Versione di Bitcoin</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Utilizzo:</translation> </message> @@ -2094,13 +2098,13 @@ Indirizzo: %4 </translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Aiuto su un comando </translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Opzioni: </translation> @@ -2118,7 +2122,7 @@ Indirizzo: %4 </translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Genera Bitcoin </translation> @@ -2130,7 +2134,7 @@ Indirizzo: %4 </translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Specifica la cartella dati </translation> @@ -2146,13 +2150,7 @@ Indirizzo: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Specifica il timeout di connessione (in millisecondi) -</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <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> @@ -2162,27 +2160,27 @@ Indirizzo: %4 <translation>Mantieni al massimo <n> connessioni ai peer (default: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Soglia di disconnessione dei peer di cattiva qualità (default: 100)</translation> </message> <message> - <location line="-104"/> + <location line="-105"/> <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> @@ -2198,7 +2196,7 @@ Indirizzo: %4 </translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation>Esegui in background come demone e accetta i comandi </translation> @@ -2210,7 +2208,7 @@ Indirizzo: %4 </translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -2222,7 +2220,7 @@ Indirizzo: %4 <message> <location line="+5"/> <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>Attenzione: -paytxfee è molto alta. Questa è la commissione che si paga quando si invia una transazione.</translation> </message> <message> <location line="+3"/> @@ -2232,7 +2230,7 @@ Indirizzo: %4 <message> <location line="+3"/> <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>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 line="+13"/> @@ -2265,19 +2263,24 @@ Indirizzo: %4 <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>Invalid -tor address: '%s'</source> + <location line="+6"/> + <source>Importing blocks...</source> <translation type="unfinished"/> </message> <message> + <location line="+4"/> + <source>Invalid -tor address: '%s'</source> + <translation>Indirizzo -tor non valido: '%s'</translation> + </message> + <message> <location line="+10"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> - <translation type="unfinished"/> + <translation>Buffer di ricezione massimo per connessione, <n>*1000 byte (default: 5000)</translation> </message> <message> <location line="+1"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</source> - <translation type="unfinished"/> + <translation>Buffer di invio massimo per connessione, <n>*1000 byte (default: 1000)</translation> </message> <message> <location line="+1"/> @@ -2287,7 +2290,7 @@ Indirizzo: %4 <message> <location line="+2"/> <source>Output extra debugging information. Implies all other -debug* options</source> - <translation type="unfinished"/> + <translation>Produci informazioni extra utili al debug. Implies all other -debug* options</translation> </message> <message> <location line="+1"/> @@ -2302,7 +2305,7 @@ Indirizzo: %4 <message> <location line="+4"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation type="unfinished"/> + <translation>Opzioni SSL: (vedi il wiki di Bitcoin per le istruzioni di configurazione SSL)</translation> </message> <message> <location line="+1"/> @@ -2335,14 +2338,19 @@ Indirizzo: %4 <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>Specifica il timeout di connessione in millisecondi (default: 5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> - <translation type="unfinished"/> + <translation>UPnP-használat engedélyezése a figyelő port feltérképezésénél (default: 0)</translation> </message> <message> <location line="+1"/> <source>Use UPnP to map the listening port (default: 1 when listening)</source> - <translation type="unfinished"/> + <translation>UPnP-használat engedélyezése a figyelő port feltérképezésénél (default: 1 when listening)</translation> </message> <message> <location line="+1"/> @@ -2358,7 +2366,7 @@ Indirizzo: %4 <message> <location line="+2"/> <source>Warning: Disk space is low!</source> - <translation type="unfinished"/> + <translation>Attenzione: lo spazio su disco è scarso</translation> </message> <message> <location line="+1"/> @@ -2378,24 +2386,24 @@ Indirizzo: %4 </translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Consenti connessioni JSON-RPC dall'indirizzo IP specificato </translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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 line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>Aggiorna il wallet all'ultimo formato</translation> </message> @@ -2412,7 +2420,7 @@ Indirizzo: %4 </translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <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> @@ -2422,7 +2430,7 @@ Indirizzo: %4 <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation type="unfinished"/> </message> @@ -2445,19 +2453,19 @@ Indirizzo: %4 </translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Questo messaggio di aiuto </translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <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> @@ -2467,27 +2475,28 @@ Indirizzo: %4 <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> - <translation type="unfinished"/> + <translation>Impossibile collegarsi alla %s su questo computer (bind returned error %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> - <translation type="unfinished"/> + <translation>Connessione tramite socks proxy</translation> </message> <message> <location line="-13"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation type="unfinished"/> + <translation>Consenti ricerche DNS per aggiungere nodi e collegare +</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Caricamento indirizzi...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>Errore caricamento blkindex.dat</translation> </message> @@ -2502,19 +2511,19 @@ Indirizzo: %4 <translation>Errore caricamento wallet.dat: il wallet richiede una versione nuova di Bitcoin</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <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 line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>Errore caricamento wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> - <translation type="unfinished"/> + <translation>Indirizzo -proxy non valido: '%s'</translation> </message> <message> <location line="+47"/> @@ -2527,7 +2536,7 @@ Indirizzo: %4 <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2537,12 +2546,12 @@ Indirizzo: %4 <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> - <translation type="unfinished"/> + <translation>Importo non valido per -paytxfee=<amount>: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"/> </message> @@ -2554,7 +2563,7 @@ Indirizzo: %4 <message> <location line="-55"/> <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>Questa transazione è superiore al limite di dimensione. È comunque possibile inviarla con una commissione di %1, che va ai nodi che processano la tua transazione e contribuisce a sostenere la rete. Vuoi pagare la commissione?</translation> </message> <message> <location line="+54"/> @@ -2562,19 +2571,19 @@ Indirizzo: %4 <translation>Errore: creazione della transazione fallita </translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Invio...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> - <translation type="unfinished"/> + <translation>Importo non valido</translation> </message> <message> <location line="-4"/> @@ -2587,14 +2596,14 @@ Indirizzo: %4 <translation>Caricamento dell'indice del blocco...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> - <translation type="unfinished"/> + <translation>Elérendő csomópont megadása and attempt to keep the connection open</translation> </message> <message> <location line="-18"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"/> + <translation>Impossibile collegarsi alla %s su questo computer. Probabilmente Bitcoin è già in esecuzione.</translation> </message> <message> <location line="+48"/> @@ -2607,12 +2616,12 @@ Indirizzo: %4 <translation>Commissione per KB da aggiungere alle transazioni in uscita</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Caricamento portamonete...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -2627,22 +2636,22 @@ Indirizzo: %4 <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Ripetere la scansione...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Caricamento completato</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts index e6207a10df..deb2d9498d 100644 --- a/src/qt/locale/bitcoin_lt.ts +++ b/src/qt/locale/bitcoin_lt.ts @@ -5,7 +5,7 @@ <message> <location filename="../forms/aboutdialog.ui" line="+14"/> <source>About Bitcoin</source> - <translation>Apie Bitcoiną</translation> + <translation>Apie Bitcoin</translation> </message> <message> <location line="+39"/> @@ -13,15 +13,23 @@ <translation><b>Bitcoin</b> versija</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation>Copyright © 2009-2012 Bitcoin programuotojai</translation> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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 type="unfinished"/> + <translation>Tai eksperimentinė programa. + +Platinama pagal MIT/X11 licenciją, kurią rasite faile COPYING arba http://www.opensource.org/licenses/mit-license.php. + +Šiame produkte yra OpenSSL projekto kuriamas OpenSSL Toolkit (http://www.openssl.org/), Eric Young parašyta kriptografinė programinė įranga bei Thomas Bernard sukurta UPnP programinė įranga.</translation> </message> </context> <context> @@ -34,7 +42,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+22"/> <source>Double-click to edit address or label</source> - <translation>Tam, kad pakeisti ar redaguoti adresą arba žymę turite objektą dukart spragtelti pele.</translation> + <translation>Spragtelėkite, kad pakeistumėte adresą arba žymę</translation> </message> <message> <location line="+27"/> @@ -49,17 +57,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-11"/> <source>&New Address</source> - <translation type="unfinished"/> + <translation>&Naujas adresas</translation> </message> <message> <location line="-46"/> <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> - <translation type="unfinished"/> + <translation>Tai yra jūsų Bitcoin adresai mokėjimų gavimui. Galite duoti skirtingus adresus atskiriems siuntėjams, kad galėtumėte sekti, kas jums moka.</translation> </message> <message> <location line="+60"/> <source>&Copy Address</source> - <translation type="unfinished"/> + <translation>&Kopijuoti adresą</translation> </message> <message> <location line="+11"/> @@ -69,22 +77,22 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+11"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Pasirašykite žinutę, kad įrodytume, jog esate Bitcoin adreso savininkas</translation> </message> <message> <location line="+3"/> <source>&Sign Message</source> - <translation>&S Registruotis žinute</translation> + <translation>&Pasirašyti žinutę</translation> </message> <message> <location line="+11"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> - <translation type="unfinished"/> + <translation>Patikrinkite žinutę, jog įsitikintumėte, kad ją pasirašė nurodytas Bitcoin adresas</translation> </message> <message> <location line="+3"/> <source>&Verify Message</source> - <translation type="unfinished"/> + <translation>&Tikrinti žinutę</translation> </message> <message> <location line="+11"/> @@ -94,17 +102,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+3"/> <source>&Delete</source> - <translation>&D Pašalinti</translation> + <translation>&Trinti</translation> </message> <message> <location filename="../addressbookpage.cpp" line="+65"/> <source>Copy &Label</source> - <translation type="unfinished"/> + <translation>Kopijuoti ž&ymę</translation> </message> <message> <location line="+2"/> <source>&Edit</source> - <translation type="unfinished"/> + <translation>&Keisti</translation> </message> <message> <location line="+250"/> @@ -150,27 +158,27 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../forms/askpassphrasedialog.ui" line="+26"/> <source>Passphrase Dialog</source> - <translation type="unfinished"/> + <translation>Slaptafrazės dialogas</translation> </message> <message> <location line="+21"/> <source>Enter passphrase</source> - <translation>Įvesti slaptažodį</translation> + <translation>Įvesti slaptafrazę</translation> </message> <message> <location line="+14"/> <source>New passphrase</source> - <translation>Naujas slaptažodis</translation> + <translation>Nauja slaptafrazė</translation> </message> <message> <location line="+14"/> <source>Repeat new passphrase</source> - <translation>Pakartoti naują slaptažodį</translation> + <translation>Pakartokite naują slaptafrazę</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="+33"/> <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>Įveskite naują slaptažodį piniginei <br/> Prašome naudoti slaptažodį iš <b> 10 ar daugiau atsitiktinių simbolių </b> arba <b> aštuonių ar daugiau žodžių </b>.</translation> + <translation>Įveskite naują piniginės slaptafrazę.<br/>Prašome naudoti slaptafrazę iš <b> 10 ar daugiau atsitiktinių simbolių</b> arba <b>aštuonių ar daugiau žodžių</b>.</translation> </message> <message> <location line="+1"/> @@ -180,7 +188,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+3"/> <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>Ši operacija reikalauja jūsų piniginės slaptažodžio jai atrakinti.</translation> + <translation>Ši operacija reikalauja jūsų piniginės slaptafrazės jai atrakinti.</translation> </message> <message> <location line="+5"/> @@ -190,7 +198,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+3"/> <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>Ši operacija reikalauja jūsų piniginės slaptažodžio jai iššifruoti.</translation> + <translation>Ši operacija reikalauja jūsų piniginės slaptafrazės jai iššifruoti.</translation> </message> <message> <location line="+5"/> @@ -200,12 +208,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+3"/> <source>Change passphrase</source> - <translation>Pakeisti slaptažodį</translation> + <translation>Pakeisti slaptafrazę</translation> </message> <message> <location line="+1"/> <source>Enter the old and new passphrase to the wallet.</source> - <translation>Įveskite seną ir naują piniginės slaptažodžius</translation> + <translation>Įveskite seną ir naują piniginės slaptafrazes.</translation> </message> <message> <location line="+46"/> @@ -215,18 +223,18 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"/> + <translation>Dėmesio: jei užšifruosite savo piniginę ir pamesite slaptafrazę, jūs<b>PRARASITE VISUS SAVO BITCOINUS</b>! </translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> + <translation>Ar tikrai norite šifruoti savo piniginę?</translation> </message> <message> <location line="+106"/> <location line="+24"/> <source>Warning: The Caps Lock key is on!</source> - <translation type="unfinished"/> + <translation>Įspėjimas: įjungtas Caps Lock klavišas!</translation> </message> <message> <location line="-121"/> @@ -237,7 +245,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-48"/> <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 dabar užsidarys šifravimo proceso pabaigai. Atminkite, kad piniginės šifravimas negali pilnai apsaugoti bitcoinų vagysčių kai tinkle esančios kenkėjiškos programos patenka į jūsų kompiuterį.</translation> + <translation>Bitcoin dabar užsidarys šifravimo proceso pabaigai. Atminkite, kad piniginės šifravimas negali pilnai apsaugoti bitcoinų vagysčių kai tinkle esančios kenkėjiškos programos patenka į jūsų kompiuterį.</translation> </message> <message> <location line="+5"/> @@ -256,7 +264,7 @@ This product includes software developed by the OpenSSL Project for use in the O <location line="+7"/> <location line="+48"/> <source>The supplied passphrases do not match.</source> - <translation>Įvestas slaptažodis nesutampa</translation> + <translation>Įvestos slaptafrazės nesutampa.</translation> </message> <message> <location line="-37"/> @@ -268,40 +276,35 @@ This product includes software developed by the OpenSSL Project for use in the O <location line="+11"/> <location line="+19"/> <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation> Neteisingai įvestas slaptažodis piniginės iššifravimui</translation> + <translation>Neteisingai įvestas slaptažodis piniginės iššifravimui.</translation> </message> <message> <location line="-20"/> <source>Wallet decryption failed</source> - <translation>Nepavyko iššifruoti piniginę</translation> + <translation>Nepavyko iššifruoti piniginės</translation> </message> <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"/> + <translation>Piniginės slaptažodis sėkmingai pakeistas.</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation type="unfinished"/> + <translation>Pasirašyti ži&nutę...</translation> </message> <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Sinchronizavimas su tinklu ...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> - <translation>&O Apžvalga</translation> + <translation>&Apžvalga</translation> </message> <message> <location line="+1"/> @@ -311,7 +314,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+5"/> <source>&Transactions</source> - <translation>&T Sandoriai</translation> + <translation>&Sandoriai</translation> </message> <message> <location line="+1"/> @@ -331,7 +334,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+5"/> <source>&Receive coins</source> - <translation>&R Gautos monetos</translation> + <translation>&Gauti monetas</translation> </message> <message> <location line="+1"/> @@ -346,7 +349,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+41"/> <source>E&xit</source> - <translation>&x išėjimas</translation> + <translation>&Išeiti</translation> </message> <message> <location line="+1"/> @@ -356,7 +359,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+4"/> <source>Show information about Bitcoin</source> - <translation>Rodyti informaciją apie Bitkoiną</translation> + <translation>Rodyti informaciją apie Bitcoin</translation> </message> <message> <location line="+2"/> @@ -371,77 +374,72 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+2"/> <source>&Options...</source> - <translation>&Opcijos...</translation> + <translation>&Parinktys...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> - <translation type="unfinished"/> + <translation>&Užšifruoti piniginę...</translation> </message> <message> <location line="+3"/> <source>&Backup Wallet...</source> - <translation type="unfinished"/> + <translation>&Backup piniginę...</translation> </message> <message> <location line="+2"/> <source>&Change Passphrase...</source> - <translation type="unfinished"/> + <translation>&Keisti slaptafrazę...</translation> </message> <message numerus="yes"> <location line="+241"/> <source>~%n block(s) remaining</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>~liko %n blokas</numerusform><numerusform>~liko %n blokai</numerusform><numerusform>~liko %n blokų</numerusform></translation> </message> <message> <location line="+6"/> <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> - <translation type="unfinished"/> + <translation>Atsisiuntė %1 iš %2 sandorių istorijos blokų (%3% done).</translation> </message> <message> <location line="-254"/> <source>&Export...</source> - <translation>&Eksportas...</translation> + <translation>&Eksportuoti...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Siųsti monetas Bitcoin adresui</translation> </message> <message> <location line="+6"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Pasirašykite žinutę, kad įrodytume, jog esate Bitcoin adreso savininkas</translation> </message> <message> <location line="+4"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> - <translation type="unfinished"/> + <translation>Patikrinkite žinutę, jog įsitikintumėte, kad ją pasirašė nurodytas Bitcoin adresas</translation> </message> <message> <location line="+4"/> <source>S&ignatures</source> - <translation type="unfinished"/> + <translation>&Parašai</translation> </message> <message> <location line="+37"/> <source>Modify configuration options for Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation type="unfinished"/> + <translation>Keisti bitcoin konfigūracijos galimybes</translation> </message> <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> <source>Encrypt or decrypt wallet</source> - <translation>Užšifruoti ar iššifruoti piniginę</translation> + <translation>Užšifruoti ar iššifruoti piniginę</translation> </message> <message> <location line="+3"/> @@ -451,62 +449,67 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+2"/> <source>Change the passphrase used for wallet encryption</source> - <translation>Pakeisti slaptažodį naudojamą piniginės užšifravimui</translation> + <translation>Pakeisti slaptafrazę naudojamą piniginės užšifravimui</translation> </message> <message> <location line="+1"/> <source>&Debug window</source> - <translation type="unfinished"/> + <translation>&Derinimo langas</translation> </message> <message> <location line="+1"/> <source>Open debugging and diagnostic console</source> - <translation type="unfinished"/> + <translation>Atverti derinimo ir diagnostikos konsolę</translation> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> - <translation type="unfinished"/> + <translation>&Tikrinti žinutę...</translation> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> - <translation type="unfinished"/> + <translation>Bitcoin</translation> </message> <message> <location line="+0"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>Piniginė</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> - <translation type="unfinished"/> + <translation>&Apie Bitcoin</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>&Rodyti / Slėpti</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>&Failas</translation> </message> <message> <location line="+10"/> <source>&Settings</source> - <translation>Nu&Statymai</translation> + <translation>&Nustatymai</translation> </message> <message> <location line="+6"/> <source>&Help</source> - <translation>&H Pagelba</translation> + <translation>&Pagalba</translation> </message> <message> <location line="+9"/> <source>Tabs toolbar</source> - <translation>Tabs įrankių juosta</translation> + <translation>Kortelių įrankinė</translation> </message> <message> <location line="+11"/> <source>Actions toolbar</source> - <translation>Veiksmų įrankių juosta</translation> + <translation>Veiksmų įrankinė</translation> </message> <message> <location line="+13"/> @@ -518,7 +521,7 @@ This product includes software developed by the OpenSSL Project for use in the O <location line="+0"/> <location line="+60"/> <source>Bitcoin client</source> - <translation type="unfinished"/> + <translation>Bitcoin klientas</translation> </message> <message numerus="yes"> <location line="+71"/> @@ -553,12 +556,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+6"/> <source>Up to date</source> - <translation>Iki šiol</translation> + <translation>Atnaujinta</translation> </message> <message> <location line="+7"/> <source>Catching up...</source> - <translation>Gaudo...</translation> + <translation>Vejamasi...</translation> </message> <message> <location line="+10"/> @@ -573,7 +576,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+5"/> <source>Confirm transaction fee</source> - <translation type="unfinished"/> + <translation>Patvirtinti sandorio mokestį</translation> </message> <message> <location line="+27"/> @@ -622,12 +625,12 @@ Adresas: %4</translation> <message> <location line="+23"/> <source>Backup Wallet</source> - <translation type="unfinished"/> + <translation>Backup piniginę</translation> </message> <message> <location line="+0"/> <source>Wallet Data (*.dat)</source> - <translation type="unfinished"/> + <translation>Piniginės duomenys (*.dat)</translation> </message> <message> <location line="+3"/> @@ -640,7 +643,7 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -648,9 +651,9 @@ Adresas: %4</translation> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> - <translation type="unfinished"/> + <translation>Tinklo įspėjimas</translation> </message> </context> <context> @@ -658,12 +661,12 @@ Adresas: %4</translation> <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> <source>Edit Address</source> - <translation>Redaguoti adresą</translation> + <translation>Keisti adresą</translation> </message> <message> <location line="+11"/> <source>&Label</source> - <translation>&L Žymė</translation> + <translation>Ž&ymė</translation> </message> <message> <location line="+10"/> @@ -693,46 +696,46 @@ Adresas: %4</translation> <message> <location line="+3"/> <source>Edit receiving address</source> - <translation>Taisyti gavimo adresą</translation> + <translation>Keisti gavimo adresą</translation> </message> <message> <location line="+4"/> <source>Edit sending address</source> - <translation>Taisyti siuntimo adresą</translation> + <translation>Keisti siuntimo adresą</translation> </message> <message> <location line="+60"/> <source>The entered address "%1" is already in the address book.</source> - <translation>Įvestas adresas "%1"yra adresų knygelėje</translation> + <translation>Įvestas adresas „%1“ jau yra adresų knygelėje.</translation> </message> <message> <location line="+5"/> <source>The entered address "%1" is not a valid Bitcoin address.</source> - <translation type="unfinished"/> + <translation>Įvestas adresas „%1“ nėra galiojantis Bitcoin adresas.</translation> </message> <message> <location line="+5"/> <source>Could not unlock wallet.</source> - <translation>Neįmanoma atrakinti piniginės</translation> + <translation>Nepavyko atrakinti piniginės.</translation> </message> <message> <location line="+5"/> <source>New key generation failed.</source> - <translation>Naujas raktas nesukurtas</translation> + <translation>Naujo rakto generavimas nepavyko.</translation> </message> </context> <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> - <translation type="unfinished"/> + <translation>Bitcoin-Qt</translation> </message> <message> <location line="-12"/> <source>version</source> - <translation type="unfinished"/> + <translation>versija</translation> </message> <message> <location line="+2"/> @@ -742,22 +745,22 @@ Adresas: %4</translation> <message> <location line="+1"/> <source>command-line options</source> - <translation type="unfinished"/> + <translation>komandinės eilutės parametrai</translation> </message> <message> <location line="+4"/> <source>UI options</source> - <translation type="unfinished"/> + <translation>Naudotoji sąsajos parametrai</translation> </message> <message> <location line="+1"/> <source>Set language, for example "de_DE" (default: system locale)</source> - <translation type="unfinished"/> + <translation>Nustatyti kalbą, pavyzdžiui "lt_LT" (numatyta: sistemos kalba)</translation> </message> <message> <location line="+1"/> <source>Start minimized</source> - <translation>Pradžia sumažinta</translation> + <translation>Paleisti sumažintą</translation> </message> <message> <location line="+1"/> @@ -770,32 +773,32 @@ Adresas: %4</translation> <message> <location filename="../forms/optionsdialog.ui" line="+14"/> <source>Options</source> - <translation>Opcijos</translation> + <translation>Parinktys</translation> </message> <message> <location line="+16"/> <source>&Main</source> - <translation type="unfinished"/> + <translation>&Pagrindinės</translation> </message> <message> <location line="+6"/> <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> + <translation>Neprivalomas sandorio mokestis už KB, kuris padeda greičiau sutvarkyti sandorius. Daugelis sandorių yra tik 1KB dydžio. Rekomenduojamas 0,01 mokestis.</translation> </message> <message> <location line="+15"/> <source>Pay transaction &fee</source> - <translation>&f Mokėti sandorio mokestį</translation> + <translation>&Mokėti sandorio mokestį</translation> </message> <message> <location line="+31"/> <source>Automatically start Bitcoin after logging in to the system.</source> - <translation type="unfinished"/> + <translation>Automatiškai paleisti Bitkoin programą kai yra įjungiamas kompiuteris</translation> </message> <message> <location line="+3"/> <source>&Start Bitcoin on system login</source> - <translation type="unfinished"/> + <translation>&S Paleisti Bitcoin programą su window sistemos paleidimu</translation> </message> <message> <location line="+7"/> @@ -805,72 +808,72 @@ Adresas: %4</translation> <message> <location line="+3"/> <source>&Detach databases at shutdown</source> - <translation type="unfinished"/> + <translation>&Atjungti duombazes išsijungiant</translation> </message> <message> <location line="+21"/> <source>&Network</source> - <translation type="unfinished"/> + <translation>&Tinklas</translation> </message> <message> <location line="+6"/> <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> + <translation>Automatiškai atidaryti Bitcoin kliento prievadą maršrutizatoriuje. Tai veikia tik tada, kai jūsų maršrutizatorius palaiko UPnP ir ji įjungta.</translation> </message> <message> <location line="+3"/> <source>Map port using &UPnP</source> - <translation>Prievado struktūra naudojant & UPnP</translation> + <translation>Persiųsti prievadą naudojant &UPnP</translation> </message> <message> <location line="+7"/> <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source> - <translation type="unfinished"/> + <translation>Jungtis į Bitkoin tinklą per socks proxy (pvz. jungiantis per Tor)</translation> </message> <message> <location line="+3"/> <source>&Connect through SOCKS proxy:</source> - <translation type="unfinished"/> + <translation>&Jungtis per SOCKS tarpinį serverį:</translation> </message> <message> <location line="+9"/> <source>Proxy &IP:</source> - <translation type="unfinished"/> + <translation>Tarpinio serverio &IP:</translation> </message> <message> <location line="+19"/> <source>IP address of the proxy (e.g. 127.0.0.1)</source> - <translation>IP adresas proxy (pvz. 127.0.0.1)</translation> + <translation>Tarpinio serverio IP adresas (pvz. 127.0.0.1)</translation> </message> <message> <location line="+7"/> <source>&Port:</source> - <translation type="unfinished"/> + <translation>&Prievadas:</translation> </message> <message> <location line="+19"/> <source>Port of the proxy (e.g. 9050)</source> - <translation type="unfinished"/> + <translation>Tarpinio serverio preivadas (pvz, 9050)</translation> </message> <message> <location line="+7"/> <source>SOCKS &Version:</source> - <translation type="unfinished"/> + <translation>SOCKS &versija:</translation> </message> <message> <location line="+13"/> <source>SOCKS version of the proxy (e.g. 5)</source> - <translation type="unfinished"/> + <translation>Tarpinio serverio SOCKS versija (pvz., 5)</translation> </message> <message> <location line="+36"/> <source>&Window</source> - <translation type="unfinished"/> + <translation>&Langas</translation> </message> <message> <location line="+6"/> <source>Show only a tray icon after minimizing the window.</source> - <translation type="unfinished"/> + <translation>Po programos lango sumažinimo rodyti tik programos ikoną.</translation> </message> <message> <location line="+3"/> @@ -885,32 +888,32 @@ Adresas: %4</translation> <message> <location line="+3"/> <source>M&inimize on close</source> - <translation type="unfinished"/> + <translation>&Sumažinti uždarant</translation> </message> <message> <location line="+21"/> <source>&Display</source> - <translation type="unfinished"/> + <translation>&Rodymas</translation> </message> <message> <location line="+8"/> <source>User Interface &language:</source> - <translation type="unfinished"/> + <translation>Naudotojo sąsajos &kalba:</translation> </message> <message> <location line="+13"/> <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation type="unfinished"/> + <translation>Čia gali būti nustatyta naudotojo sąsajos kalba. Šis nustatymas įsigalios iš naujo paleidus Bitcoin.</translation> </message> <message> <location line="+11"/> <source>&Unit to show amounts in:</source> - <translation type="unfinished"/> + <translation>&Vienetai, kuriais rodyti sumas:</translation> </message> <message> <location line="+13"/> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation type="unfinished"/> + <translation>Rodomų ir siunčiamų monetų kiekio matavimo vienetai</translation> </message> <message> <location line="+9"/> @@ -920,22 +923,22 @@ Adresas: %4</translation> <message> <location line="+3"/> <source>&Display addresses in transaction list</source> - <translation type="unfinished"/> + <translation>&Rodyti adresus sandorių sąraše</translation> </message> <message> <location line="+71"/> <source>&OK</source> - <translation type="unfinished"/> + <translation>&Gerai</translation> </message> <message> <location line="+7"/> <source>&Cancel</source> - <translation type="unfinished"/> + <translation>&Atšaukti</translation> </message> <message> <location line="+10"/> <source>&Apply</source> - <translation type="unfinished"/> + <translation>&Pritaikyti</translation> </message> <message> <location filename="../optionsdialog.cpp" line="+55"/> @@ -943,10 +946,10 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> - <translation type="unfinished"/> + <translation>Įspėjimas</translation> </message> <message> <location line="-9"/> @@ -976,12 +979,12 @@ Adresas: %4</translation> <message> <location line="-141"/> <source>Balance:</source> - <translation>Balansas</translation> + <translation>Balansas:</translation> </message> <message> <location line="+58"/> <source>Number of transactions:</source> - <translation>Sandorių kiekis</translation> + <translation>Sandorių kiekis:</translation> </message> <message> <location line="-29"/> @@ -991,12 +994,12 @@ Adresas: %4</translation> <message> <location line="-78"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>Piniginė</translation> </message> <message> <location line="+124"/> <source>Immature:</source> - <translation type="unfinished"/> + <translation>Nepribrendę:</translation> </message> <message> <location line="+13"/> @@ -1006,7 +1009,7 @@ Adresas: %4</translation> <message> <location line="+46"/> <source><b>Recent transactions</b></source> - <translation><b>Naujausi sandoris</b></translation> + <translation><b>Naujausi sandoriai</b></translation> </message> <message> <location line="-118"/> @@ -1035,7 +1038,7 @@ Adresas: %4</translation> <message> <location filename="../forms/qrcodedialog.ui" line="+14"/> <source>QR Code Dialog</source> - <translation type="unfinished"/> + <translation>QR kodo dialogas</translation> </message> <message> <location line="+59"/> @@ -1060,7 +1063,7 @@ Adresas: %4</translation> <message> <location line="+71"/> <source>&Save As...</source> - <translation>&S išsaugoti kaip...</translation> + <translation>Į&rašyti kaip...</translation> </message> <message> <location filename="../qrcodedialog.cpp" line="+62"/> @@ -1070,7 +1073,7 @@ Adresas: %4</translation> <message> <location line="+40"/> <source>The entered amount is invalid, please check.</source> - <translation type="unfinished"/> + <translation>Įvesta suma neteisinga, prašom patikrinti.</translation> </message> <message> <location line="+23"/> @@ -1080,12 +1083,12 @@ Adresas: %4</translation> <message> <location line="+25"/> <source>Save QR Code</source> - <translation type="unfinished"/> + <translation>Įrašyti QR kodą</translation> </message> <message> <location line="+0"/> <source>PNG Images (*.png)</source> - <translation type="unfinished"/> + <translation>PNG paveikslėliai (*.png)</translation> </message> </context> <context> @@ -1093,7 +1096,7 @@ Adresas: %4</translation> <message> <location filename="../forms/rpcconsole.ui" line="+46"/> <source>Client name</source> - <translation type="unfinished"/> + <translation>Kliento pavadinimas</translation> </message> <message> <location line="+10"/> @@ -1105,54 +1108,54 @@ Adresas: %4</translation> <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> - <translation type="unfinished"/> + <translation>nėra</translation> </message> <message> <location line="-217"/> <source>Client version</source> - <translation type="unfinished"/> + <translation>Kliento versija</translation> </message> <message> <location line="-45"/> <source>&Information</source> - <translation type="unfinished"/> + <translation>&Informacija</translation> </message> <message> <location line="+68"/> <source>Using OpenSSL version</source> - <translation type="unfinished"/> + <translation>Naudojama OpenSSL versija</translation> </message> <message> <location line="+49"/> <source>Startup time</source> - <translation type="unfinished"/> + <translation>Paleidimo laikas</translation> </message> <message> <location line="+29"/> <source>Network</source> - <translation type="unfinished"/> + <translation>Tinklas</translation> </message> <message> <location line="+7"/> <source>Number of connections</source> - <translation type="unfinished"/> + <translation>Prisijungimų kiekis</translation> </message> <message> <location line="+23"/> <source>On testnet</source> - <translation type="unfinished"/> + <translation>Testnete</translation> </message> <message> <location line="+23"/> <source>Block chain</source> - <translation type="unfinished"/> + <translation>Blokų grandinė</translation> </message> <message> <location line="+7"/> <source>Current number of blocks</source> - <translation type="unfinished"/> + <translation>Dabartinis blokų skaičius</translation> </message> <message> <location line="+23"/> @@ -1162,17 +1165,17 @@ Adresas: %4</translation> <message> <location line="+23"/> <source>Last block time</source> - <translation type="unfinished"/> + <translation>Paskutinio bloko laikas</translation> </message> <message> <location line="+52"/> <source>&Open</source> - <translation type="unfinished"/> + <translation>&Atverti</translation> </message> <message> <location line="+16"/> <source>Command-line options</source> - <translation type="unfinished"/> + <translation>Komandinės eilutės parametrai</translation> </message> <message> <location line="+7"/> @@ -1182,27 +1185,27 @@ Adresas: %4</translation> <message> <location line="+3"/> <source>&Show</source> - <translation type="unfinished"/> + <translation>&Rodyti</translation> </message> <message> <location line="+24"/> <source>&Console</source> - <translation type="unfinished"/> + <translation>&Konsolė</translation> </message> <message> <location line="-260"/> <source>Build date</source> - <translation type="unfinished"/> + <translation>Kompiliavimo data</translation> </message> <message> <location line="-104"/> <source>Bitcoin - Debug window</source> - <translation type="unfinished"/> + <translation>Bitcoin - Derinimo langas</translation> </message> <message> <location line="+25"/> <source>Bitcoin Core</source> - <translation type="unfinished"/> + <translation>Bitcoin branduolys</translation> </message> <message> <location line="+279"/> @@ -1217,7 +1220,7 @@ Adresas: %4</translation> <message> <location line="+102"/> <source>Clear console</source> - <translation type="unfinished"/> + <translation>Išvalyti konsolę</translation> </message> <message> <location filename="../rpcconsole.cpp" line="-33"/> @@ -1239,7 +1242,7 @@ Adresas: %4</translation> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1257,7 +1260,7 @@ Adresas: %4</translation> <message> <location line="+3"/> <source>&Add Recipient</source> - <translation type="unfinished"/> + <translation>&A Pridėti gavėją</translation> </message> <message> <location line="+20"/> @@ -1267,7 +1270,7 @@ Adresas: %4</translation> <message> <location line="+3"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>Išvalyti &viską</translation> </message> <message> <location line="+22"/> @@ -1297,52 +1300,52 @@ Adresas: %4</translation> <message> <location line="+5"/> <source>Confirm send coins</source> - <translation>Patvirtinti siuntimui monetas</translation> + <translation>Patvirtinti monetų siuntimą</translation> </message> <message> <location line="+1"/> <source>Are you sure you want to send %1?</source> - <translation>Ar esate įsitikinę, kad norite siųsti %1?</translation> + <translation>Ar tikrai norite siųsti %1?</translation> </message> <message> <location line="+0"/> <source> and </source> - <translation>ir</translation> + <translation> ir </translation> </message> <message> <location line="+23"/> <source>The recipient address is not valid, please recheck.</source> - <translation type="unfinished"/> + <translation>Negaliojantis gavėjo adresas. Patikrinkite.</translation> </message> <message> <location line="+5"/> <source>The amount to pay must be larger than 0.</source> - <translation>Apmokėjimo suma turi būti didesnė negu 0.</translation> + <translation>Apmokėjimo suma turi būti didesnė nei 0.</translation> </message> <message> <location line="+5"/> <source>The amount exceeds your balance.</source> - <translation type="unfinished"/> + <translation>Suma viršija jūsų balansą.</translation> </message> <message> <location line="+5"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation type="unfinished"/> + <translation>Jei pridedame sandorio mokestį %1 bendra suma viršija jūsų balansą.</translation> </message> <message> <location line="+6"/> <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation type="unfinished"/> + <translation>Rastas adreso dublikatas.</translation> </message> <message> <location line="+5"/> <source>Error: Transaction creation failed.</source> - <translation type="unfinished"/> + <translation>KLAIDA:nepavyko sudaryti sandorio.</translation> </message> <message> <location line="+5"/> <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>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> </context> <context> @@ -1360,7 +1363,7 @@ Adresas: %4</translation> <message> <location line="+13"/> <source>Pay &To:</source> - <translation>Mokėti &T gavėjui:</translation> + <translation>Mokėti &gavėjui:</translation> </message> <message> <location line="+24"/> @@ -1371,7 +1374,7 @@ Adresas: %4</translation> <message> <location line="+9"/> <source>&Label:</source> - <translation>&L žymė:</translation> + <translation>Ž&ymė:</translation> </message> <message> <location line="+18"/> @@ -1401,7 +1404,7 @@ Adresas: %4</translation> <message> <location line="+7"/> <source>Remove this recipient</source> - <translation>Pašalinti šitą gavėją</translation> + <translation>Pašalinti šį gavėją</translation> </message> <message> <location filename="../sendcoinsentry.cpp" line="+1"/> @@ -1420,7 +1423,7 @@ Adresas: %4</translation> <location line="+13"/> <location line="+124"/> <source>&Sign Message</source> - <translation>&S Registravimosi žinutė</translation> + <translation>&Pasirašyti žinutę</translation> </message> <message> <location line="-118"/> @@ -1430,19 +1433,19 @@ Adresas: %4</translation> <message> <location line="+18"/> <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Įveskite bitkoinų adresą (pvz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+10"/> <location line="+203"/> <source>Choose an address from the address book</source> - <translation type="unfinished"/> + <translation>Pasirinkite adresą iš adresų knygelės</translation> </message> <message> <location line="-193"/> <location line="+203"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location line="-193"/> @@ -1452,7 +1455,7 @@ Adresas: %4</translation> <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location line="+12"/> @@ -1467,7 +1470,7 @@ Adresas: %4</translation> <message> <location line="+21"/> <source>Sign the message to prove you own this Bitcoin address</source> - <translation type="unfinished"/> + <translation>Registruotis žinute įrodymuii, kad turite šį adresą</translation> </message> <message> <location line="+17"/> @@ -1478,13 +1481,13 @@ Adresas: %4</translation> <location line="+3"/> <location line="+146"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>Išvalyti &viską</translation> </message> <message> <location line="-87"/> <location line="+70"/> <source>&Verify Message</source> - <translation type="unfinished"/> + <translation>&Patikrinti žinutę</translation> </message> <message> <location line="-64"/> @@ -1494,12 +1497,12 @@ Adresas: %4</translation> <message> <location line="+21"/> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Įveskite bitkoinų adresą (pvz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+40"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> - <translation type="unfinished"/> + <translation>Patikrinkite žinutę, jog įsitikintumėte, kad ją pasirašė nurodytas Bitcoin adresas</translation> </message> <message> <location line="+17"/> @@ -1515,18 +1518,18 @@ Adresas: %4</translation> <message> <location line="-2"/> <source>Click "Sign Message" to generate signature</source> - <translation type="unfinished"/> + <translation>Spragtelėkite "Registruotis žinutę" tam, kad gauti parašą</translation> </message> <message> <location line="+3"/> <source>Enter Bitcoin signature</source> - <translation type="unfinished"/> + <translation>Įveskite Bitcoin parašą</translation> </message> <message> <location line="+82"/> <location line="+81"/> <source>The entered address is invalid.</source> - <translation type="unfinished"/> + <translation>Įvestas adresas negalioja.</translation> </message> <message> <location line="-81"/> @@ -1534,7 +1537,7 @@ Adresas: %4</translation> <location line="+73"/> <location line="+8"/> <source>Please check the address and try again.</source> - <translation type="unfinished"/> + <translation>Prašom patikrinti adresą ir bandyti iš naujo.</translation> </message> <message> <location line="-81"/> @@ -1555,38 +1558,38 @@ Adresas: %4</translation> <message> <location line="+12"/> <source>Message signing failed.</source> - <translation type="unfinished"/> + <translation>Žinutės pasirašymas nepavyko.</translation> </message> <message> <location line="+5"/> <source>Message signed.</source> - <translation type="unfinished"/> + <translation>Žinutė pasirašyta.</translation> </message> <message> <location line="+59"/> <source>The signature could not be decoded.</source> - <translation type="unfinished"/> + <translation>Nepavyko iškoduoti parašo.</translation> </message> <message> <location line="+0"/> <location line="+13"/> <source>Please check the signature and try again.</source> - <translation type="unfinished"/> + <translation>Prašom patikrinti parašą ir bandyti iš naujo.</translation> </message> <message> <location line="+0"/> <source>The signature did not match the message digest.</source> - <translation type="unfinished"/> + <translation>Parašas neatitinka žinutės.</translation> </message> <message> <location line="+7"/> <source>Message verification failed.</source> - <translation type="unfinished"/> + <translation>Žinutės tikrinimas nepavyko.</translation> </message> <message> <location line="+5"/> <source>Message verified.</source> - <translation type="unfinished"/> + <translation>Žinutė patikrinta.</translation> </message> </context> <context> @@ -1599,12 +1602,12 @@ Adresas: %4</translation> <message numerus="yes"> <location line="-2"/> <source>Open for %n block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>Atverti %n blokui</numerusform><numerusform>Atverti %n blokams</numerusform><numerusform>Atverti %n blokų</numerusform></translation> </message> <message> <location line="+8"/> <source>%1/offline</source> - <translation type="unfinished"/> + <translation>%1/neprisijungęs</translation> </message> <message> <location line="+2"/> @@ -1614,12 +1617,12 @@ Adresas: %4</translation> <message> <location line="+2"/> <source>%1 confirmations</source> - <translation>%1 patvirtinimai</translation> + <translation>%1 patvirtinimų</translation> </message> <message> <location line="+18"/> <source>Status</source> - <translation type="unfinished"/> + <translation>Būsena</translation> </message> <message numerus="yes"> <location line="+7"/> @@ -1634,36 +1637,36 @@ Adresas: %4</translation> <message> <location line="+7"/> <source>Source</source> - <translation type="unfinished"/> + <translation>Šaltinis</translation> </message> <message> <location line="+0"/> <source>Generated</source> - <translation type="unfinished"/> + <translation>Sugeneruotas</translation> </message> <message> <location line="+6"/> <location line="+17"/> <source>From</source> - <translation type="unfinished"/> + <translation>Nuo</translation> </message> <message> <location line="+1"/> <location line="+22"/> <location line="+58"/> <source>To</source> - <translation type="unfinished"/> + <translation>Kam</translation> </message> <message> <location line="-77"/> <location line="+2"/> <source>own address</source> - <translation type="unfinished"/> + <translation>savo adresas</translation> </message> <message> <location line="-2"/> <source>label</source> - <translation type="unfinished"/> + <translation>žymė</translation> </message> <message> <location line="+37"/> @@ -1672,7 +1675,7 @@ Adresas: %4</translation> <location line="+17"/> <location line="+30"/> <source>Credit</source> - <translation type="unfinished"/> + <translation>Kreditas</translation> </message> <message numerus="yes"> <location line="-102"/> @@ -1682,7 +1685,7 @@ Adresas: %4</translation> <message> <location line="+2"/> <source>not accepted</source> - <translation type="unfinished"/> + <translation>nepriimta</translation> </message> <message> <location line="+44"/> @@ -1690,17 +1693,17 @@ Adresas: %4</translation> <location line="+15"/> <location line="+30"/> <source>Debit</source> - <translation type="unfinished"/> + <translation>Debitas</translation> </message> <message> <location line="-39"/> <source>Transaction fee</source> - <translation type="unfinished"/> + <translation>Sandorio mokestis</translation> </message> <message> <location line="+16"/> <source>Net amount</source> - <translation type="unfinished"/> + <translation>Neto suma</translation> </message> <message> <location line="+6"/> @@ -1710,27 +1713,27 @@ Adresas: %4</translation> <message> <location line="+2"/> <source>Comment</source> - <translation type="unfinished"/> + <translation>Komentaras</translation> </message> <message> <location line="+2"/> <source>Transaction ID</source> - <translation type="unfinished"/> + <translation>Sandorio ID</translation> </message> <message> <location line="+3"/> <source>Generated coins must mature 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, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> + <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 line="+7"/> <source>Debug information</source> - <translation type="unfinished"/> + <translation>Derinimo informacija</translation> </message> <message> <location line="+8"/> <source>Transaction</source> - <translation type="unfinished"/> + <translation>Sandoris</translation> </message> <message> <location line="+5"/> @@ -1768,7 +1771,7 @@ Adresas: %4</translation> <message> <location filename="../forms/transactiondescdialog.ui" line="+14"/> <source>Transaction details</source> - <translation>Sandorio išsami informacija</translation> + <translation>Sandorio detelės</translation> </message> <message> <location line="+6"/> @@ -1881,7 +1884,7 @@ Adresas: %4</translation> <message> <location line="+2"/> <source>Type of transaction.</source> - <translation>Sandorio tipas</translation> + <translation>Sandorio tipas.</translation> </message> <message> <location line="+2"/> @@ -1930,7 +1933,7 @@ Adresas: %4</translation> <message> <location line="+1"/> <source>Range...</source> - <translation>Grupė</translation> + <translation>Intervalas...</translation> </message> <message> <location line="+11"/> @@ -1990,7 +1993,7 @@ Adresas: %4</translation> <message> <location line="+1"/> <source>Show transaction details</source> - <translation type="unfinished"/> + <translation>Rodyti sandėrio detales</translation> </message> <message> <location line="+142"/> @@ -2063,7 +2066,7 @@ Adresas: %4</translation> <message> <location filename="../walletmodel.cpp" line="+192"/> <source>Sending...</source> - <translation>Siunčiama</translation> + <translation>Siunčiama...</translation> </message> </context> <context> @@ -2074,7 +2077,7 @@ Adresas: %4</translation> <translation>Bitcoin versija</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Naudojimas:</translation> </message> @@ -2089,14 +2092,14 @@ Adresas: %4</translation> <translation>Komandų sąrašas</translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Suteikti pagalba komandai</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> - <translation>Opcijos:</translation> + <translation>Parinktys:</translation> </message> <message> <location line="+23"/> @@ -2106,22 +2109,22 @@ Adresas: %4</translation> <message> <location line="+3"/> <source>Specify pid file (default: bitcoind.pid)</source> - <translation>Nurodyti pid failą (pagal nutylėjimą: bitcoind.pid)</translation> + <translation>Nurodyti pid failą (pagal nutylėjimą: bitcoind.pid)</translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> - <translation>Sukurti monetas</translation> + <translation>Generuoti monetas</translation> </message> <message> <location line="-14"/> <source>Don't generate coins</source> - <translation>Neišgavinėti monetų</translation> + <translation>Negeneruoti monetų</translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> - <translation>Nustatyti duomenų direktoriją</translation> + <translation>Nustatyti duomenų aplanką</translation> </message> <message> <location line="-8"/> @@ -2134,12 +2137,7 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Nustatyti sujungimo trukmę (milisekundėmis)</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <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> @@ -2149,27 +2147,27 @@ Adresas: %4</translation> <translation>Palaikyti ne daugiau <n> jungčių kolegoms (pagal nutylėjimą: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <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 line="-104"/> + <location line="-105"/> <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> @@ -2184,7 +2182,7 @@ Adresas: %4</translation> <translation>Priimti komandinę eilutę ir JSON-RPC komandas</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation>Dirbti fone kaip šešėlyje ir priimti komandas</translation> </message> @@ -2194,7 +2192,7 @@ Adresas: %4</translation> <translation>Naudoti testavimo tinklą</translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -2206,7 +2204,7 @@ Adresas: %4</translation> <message> <location line="+5"/> <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>Įspėjimas: -paytxfee yra nustatytas per didelis. Tai sandorio mokestis, kurį turėsite mokėti, jei siųsite sandorį.</translation> </message> <message> <location line="+3"/> @@ -2216,7 +2214,7 @@ Adresas: %4</translation> <message> <location line="+3"/> <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>Įspėjimas: Patikrinkite, kad kompiuterio data ir laikas yra teisingi.Jei Jūsų laikrodis neteisingai nustatytas Bitcoin, veiks netinkamai.</translation> </message> <message> <location line="+13"/> @@ -2231,7 +2229,7 @@ Adresas: %4</translation> <message> <location line="+6"/> <source>Connect only to the specified node(s)</source> - <translation type="unfinished"/> + <translation>Prisijungti tik prie nurodyto mazgo</translation> </message> <message> <location line="+3"/> @@ -2249,19 +2247,24 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation>Importuojami blokai...</translation> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> - <translation type="unfinished"/> + <translation>Neteisingas tor adresas: '%s'</translation> </message> <message> <location line="+10"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> - <translation type="unfinished"/> + <translation>Maksimalus buferis priėmimo sujungimui <n>*1000 bitų (pagal nutylėjimą: 5000)</translation> </message> <message> <location line="+1"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</source> - <translation type="unfinished"/> + <translation>Maksimalus buferis siuntimo sujungimui <n>*1000 bitų (pagal nutylėjimą: 1000)</translation> </message> <message> <location line="+1"/> @@ -2271,7 +2274,7 @@ Adresas: %4</translation> <message> <location line="+2"/> <source>Output extra debugging information. Implies all other -debug* options</source> - <translation type="unfinished"/> + <translation>Išėjimo papildomas derinimo informacija. Implies all other -debug* options</translation> </message> <message> <location line="+1"/> @@ -2319,14 +2322,19 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>Nustatyti sujungimo trukmę milisekundėmis (pagal nutylėjimą: 5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> - <translation type="unfinished"/> + <translation>Bandymas naudoti UPnP struktūra klausymosi prievadui (default: 0)</translation> </message> <message> <location line="+1"/> <source>Use UPnP to map the listening port (default: 1 when listening)</source> - <translation type="unfinished"/> + <translation>Bandymas naudoti UPnP struktūra klausymosi prievadui (default: 1 when listening)</translation> </message> <message> <location line="+1"/> @@ -2341,7 +2349,7 @@ Adresas: %4</translation> <message> <location line="+2"/> <source>Warning: Disk space is low!</source> - <translation type="unfinished"/> + <translation>Dėmesio: Diskas baigia užsipildyti!</translation> </message> <message> <location line="+1"/> @@ -2359,22 +2367,22 @@ Adresas: %4</translation> <translation>Klausymas JSON-RPC sujungimui prijungčiai <port> (pagal nutylėjimą: 8332)</translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Leisti JSON-RPC tik iš nurodytų IP adresų</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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 line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> @@ -2389,7 +2397,7 @@ Adresas: %4</translation> <translation>Ieškoti prarastų piniginės sandorių blokų grandinėje</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2399,14 +2407,14 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation type="unfinished"/> </message> <message> <location line="+52"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>Naudoti OpenSSL (https) jungimuisi JSON-RPC </translation> + <translation>Naudoti OpenSSL (https) jungimuisi JSON-RPC </translation> </message> <message> <location line="-21"/> @@ -2416,50 +2424,50 @@ Adresas: %4</translation> <message> <location line="+1"/> <source>Server private key (default: server.pem)</source> - <translation>Serverio privatus raktas (pagal nutylėjimą: server.pem)</translation> + <translation>Serverio privatus raktas (pagal nutylėjimą: server.pem)</translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Pagelbos žinutė</translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <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 line="+45"/> <source>Bitcoin</source> - <translation type="unfinished"/> + <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> - <translation type="unfinished"/> + <translation>Nepavyko susieti šiame kompiuteryje prievado %s (bind returned error %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> - <translation type="unfinished"/> + <translation>Jungtis per socks tarpinį serverį</translation> </message> <message> <location line="-13"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation type="unfinished"/> + <translation>Leisti DNS paiešką sujungimui ir mazgo pridėjimui</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Užkraunami adresai...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>blkindex.dat pakrovimo klaida</translation> </message> @@ -2474,19 +2482,19 @@ Adresas: %4</translation> <translation> wallet.dat pakrovimo klaida, wallet.dat reikalauja naujasnės Bitcoin versijos</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <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 line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation> wallet.dat pakrovimo klaida</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> - <translation type="unfinished"/> + <translation>Neteisingas proxy adresas: '%s'</translation> </message> <message> <location line="+47"/> @@ -2499,7 +2507,7 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2509,12 +2517,12 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> - <translation type="unfinished"/> + <translation>Neteisinga suma -paytxfee=<amount>: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"/> </message> @@ -2526,7 +2534,7 @@ Adresas: %4</translation> <message> <location line="-55"/> <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>Šis sandoris viršija leistiną dydį. Jūs galite įvykdyti jį papildomai sumokėję %1 mokesčių, kurie bus išsiųsti tais pačiais mazgais kuriais vyko sandoris ir padės palaikyti tinklą. Ar jūs norite apmokėti papildomą mokestį?</translation> </message> <message> <location line="+54"/> @@ -2534,19 +2542,19 @@ Adresas: %4</translation> <translation>KLAIDA:nepavyko sudaryti sandorio</translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> - <translation>Siunčiama</translation> + <translation>Siunčiama...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> - <translation type="unfinished"/> + <translation>Neteisinga suma</translation> </message> <message> <location line="-4"/> @@ -2556,17 +2564,17 @@ Adresas: %4</translation> <message> <location line="+9"/> <source>Loading block index...</source> - <translation>Užkraunami blokų indeksai...</translation> + <translation>Įkeliamas blokų indeksas...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> - <translation type="unfinished"/> + <translation>Pridėti mazgą prie sujungti su and attempt to keep the connection open</translation> </message> <message> <location line="-18"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"/> + <translation>Nepavyko susieti šiame kompiuteryje prievado %s. Bitcoin tikriausiai jau veikia.</translation> </message> <message> <location line="+48"/> @@ -2576,15 +2584,15 @@ Adresas: %4</translation> <message> <location line="-2"/> <source>Fee per KB to add to transactions you send</source> - <translation type="unfinished"/> + <translation>Įtraukti mokestį už kB siunčiamiems sandoriams</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Užkraunama piniginė...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -2599,22 +2607,22 @@ Adresas: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Peržiūra</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> - <translation>Pakrovimas baigtas</translation> + <translation>Įkėlimas baigtas</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2628,7 +2636,7 @@ If the file does not exist, create it with owner-readable-only file permissions. <message> <location line="+74"/> <source>Error</source> - <translation type="unfinished"/> + <translation>Klaida</translation> </message> <message> <location line="-30"/> diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts index 42ee170997..67779480e2 100644 --- a/src/qt/locale/bitcoin_nb.ts +++ b/src/qt/locale/bitcoin_nb.ts @@ -13,16 +13,19 @@ <translation><b>Bitcoin</b> versjon</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation>Copyright © 2009-2012 Bitcoin Utviklerne</translation> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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 Utviklerne - + <translation> Dette er eksperimentell programvare. Distribuert under MIT/X11 programvarelisensen, se medfølgende fil COPYING eller http://www.opensource.org/licenses/mit-license.php. @@ -290,22 +293,17 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation>Signer &melding...</translation> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>Gjem/vis &Bitcoin</translation> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Synkroniserer med nettverk...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Oversikt</translation> </message> @@ -380,7 +378,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>&Innstillinger...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation>&Krypter Lommebok...</translation> </message> @@ -410,7 +408,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>&Eksporter...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation>Send til en Bitcoin-adresse</translation> </message> @@ -435,12 +433,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Endre oppsett for Bitcoin</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>Vis eller gjem Bitcoinvinduet</translation> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation>Eksporter data fra nåværende fane til fil</translation> </message> @@ -470,12 +463,12 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Åpne konsoll for feilsøk og diagnostikk</translation> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation>&Verifiser melding...</translation> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -485,12 +478,17 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Lommebok</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> <translation>&Om Bitcoin</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>&Gjem / vis</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>&Fil</translation> </message> @@ -647,7 +645,7 @@ Adresse: %4 <translation>En feil oppstod ved lagring av lommebok til nytt sted</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <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> @@ -655,7 +653,7 @@ Adresse: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation>Nettverksvarsel</translation> </message> @@ -731,7 +729,7 @@ Adresse: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation>Bitcoin-Qt</translation> @@ -951,7 +949,7 @@ Adresse: %4 <translation>standardverdi</translation> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation>Advarsel</translation> @@ -1113,7 +1111,7 @@ Adresse: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation>-</translation> </message> @@ -1247,7 +1245,7 @@ Adresse: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -2082,7 +2080,7 @@ Adresse: %4 <translation>Bitcoin versjon</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Bruk:</translation> </message> @@ -2097,12 +2095,12 @@ Adresse: %4 <translation>List opp kommandoer</translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Vis hjelpetekst for en kommando</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Innstillinger:</translation> </message> @@ -2117,7 +2115,7 @@ Adresse: %4 <translation>Angi pid-fil (standardverdi: bitcoind.pid)</translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Generér bitcoins</translation> </message> @@ -2127,7 +2125,7 @@ Adresse: %4 <translation>Ikke generér bitcoins</translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Angi mappe for datafiler</translation> </message> @@ -2142,12 +2140,7 @@ Adresse: %4 <translation>Sett størrelse på disklogg for database i megabytes (standardverdi: 100)</translation> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Angi tidsavbrudd for forbindelse (i millisekunder)</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <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> @@ -2157,27 +2150,27 @@ Adresse: %4 <translation>Hold maks <n> koblinger åpne til andre noder (standardverdi: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Koble til node for å hente adresser til andre noder, koble så fra igjen</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation>Angi din egen offentlige adresse</translation> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation>Bind til angitt adresse. Bruk [vertsmaskin]:port notasjon for IPv6</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <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 line="-104"/> + <location line="-105"/> <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> @@ -2192,7 +2185,7 @@ Adresse: %4 <translation>Ta imot kommandolinje- og JSON-RPC-kommandoer</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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> @@ -2202,7 +2195,7 @@ Adresse: %4 <translation>Bruk testnettverket</translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Ta imot tilkoblinger fra utsiden (standardverdi: 1 hvis uten -proxy eller -connect)</translation> </message> @@ -2257,7 +2250,12 @@ Adresse: %4 <translation>Finn andre noder gjennom DNS-oppslag (standardverdi: 1 med mindre -connect er oppgit)</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation>Ugyldig -tor adresse: '%s'</translation> </message> @@ -2327,7 +2325,12 @@ Adresse: %4 <translation>Krymp debug.log filen når klienten starter (standardverdi: 1 hvis uten -debug)</translation> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>Angi tidsavbrudd for forbindelse i millisekunder (standardverdi: 5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Bruk UPnP for lytteport (standardverdi: 0)</translation> </message> @@ -2367,22 +2370,22 @@ Adresse: %4 <translation>Lytt etter JSON-RPC tilkoblinger på <port> (standardverdi: 8332)</translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Tillat JSON-RPC tilkoblinger fra angitt IP-adresse</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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 line="-89"/> + <location 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 line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>Oppgradér lommebok til nyeste format</translation> </message> @@ -2397,7 +2400,7 @@ Adresse: %4 <translation>Se gjennom blokk-kjeden etter manglende lommeboktransaksjoner</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <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> @@ -2407,7 +2410,7 @@ Adresse: %4 <translation>Hvor grundig verifisering av blokker gjøres (0-6, standardverdi: 1)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation>Importerer blokker fra ekstern blk000?.dat fil</translation> </message> @@ -2427,17 +2430,17 @@ Adresse: %4 <translation>Servers private nøkkel (standardverdi: server.pem)</translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Denne hjelpemeldingen</translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <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> @@ -2447,12 +2450,12 @@ Adresse: %4 <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Kan ikke binde til %s på denne datamaskinen (bind returnerte feil %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation>Koble til gjennom socks proxy</translation> </message> @@ -2462,12 +2465,12 @@ Adresse: %4 <translation>Tillat DNS oppslag for -addnode, -seednode og -connect</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Laster adresser...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>Feil ved lasting av blkindex.dat</translation> </message> @@ -2482,17 +2485,17 @@ Adresse: %4 <translation>Feil ved lasting av wallet.dat: Lommeboken krever en nyere versjon av Bitcoin</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <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 line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>Feil ved lasting av wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation>Ugyldig -proxy adresse: '%s'</translation> </message> @@ -2507,7 +2510,7 @@ Adresse: %4 <translation>Ukjent -socks proxy versjon angitt: %i</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Kunne ikke slå opp -bind adresse: '%s'</translation> </message> @@ -2517,12 +2520,12 @@ Adresse: %4 <translation>Kunne ikke slå opp -externalip adresse: '%s'</translation> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Ugyldig beløp for -paytxfee=<beløp>: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation>Feil: kunne ikke starte node</translation> </message> @@ -2542,17 +2545,17 @@ Adresse: %4 <translation>Feil: Opprettelse av transaksjon feilet </translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Sender...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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>Feil: Transaksjonen ble avvist. Dette kan skje hvis noen av myntene i lommeboken allerede var brukt, f.eks. hvis du kopierte wallet.dat og mynter ble brukt i kopien uten å bli markert brukt her.</translation> </message> <message> - <location line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation>Ugyldig beløp</translation> </message> @@ -2567,7 +2570,7 @@ Adresse: %4 <translation>Laster blokkindeks...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <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> @@ -2587,12 +2590,12 @@ Adresse: %4 <translation>Gebyr per KB for transaksjoner du sender</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Laster lommebok...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation>Kan ikke nedgradere lommebok</translation> </message> @@ -2607,22 +2610,22 @@ Adresse: %4 <translation>Kan ikke skrive standardadresse</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Leser gjennom...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Ferdig med lasting</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation>For å bruke %s opsjonen</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts index 59a096e894..2463a7ede0 100644 --- a/src/qt/locale/bitcoin_nl.ts +++ b/src/qt/locale/bitcoin_nl.ts @@ -14,16 +14,19 @@ <translation><b>Bitcoin</b> versie</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation>Copyright © 2009-2012 The Bitcoin Ontwikkelaars</translation> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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 Ontwikkelaars - + <translation> Dit is experimentele software. Gedistribueerd onder de MIT/X11 software licentie, zie het bijgevoegde bestand COPYING of http://www.opensource.org/licenses/mit-license.php. @@ -291,22 +294,17 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation>&Onderteken bericht...</translation> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>&Toon/Verberg Bitcoin</translation> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Synchroniseren met netwerk...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Overzicht</translation> </message> @@ -381,7 +379,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>O&pties...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation>&Versleutel Portemonnee...</translation> </message> @@ -411,7 +409,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>&Exporteer...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation>Verstuur munten naar een Bitcoinadres</translation> </message> @@ -436,12 +434,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Wijzig instellingen van Bitcoin</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>Toon of verberg Bitcoin venster</translation> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <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> @@ -471,12 +464,12 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Open debugging en diagnostische console</translation> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation>&Verifiëer bericht...</translation> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -486,12 +479,17 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Portemonnee</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> <translation>&Over Bitcoin</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>&Toon / Verberg</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>&Bestand</translation> </message> @@ -648,7 +646,7 @@ Adres: %4 <translation>Er is een fout opgetreden bij het wegschrijven van de portemonnee-data naar de nieuwe locatie.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <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> @@ -656,7 +654,7 @@ Adres: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation>Netwerkwaarschuwing</translation> </message> @@ -732,7 +730,7 @@ Adres: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation>Bitcoin-Qt</translation> @@ -952,7 +950,7 @@ Adres: %4 <translation>standaard</translation> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation>Waarschuwing</translation> @@ -1114,7 +1112,7 @@ Adres: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation>N.v.t.</translation> </message> @@ -1248,7 +1246,7 @@ Adres: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -2083,7 +2081,7 @@ Adres: %4 <translation>Bitcoinversie</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Gebruik:</translation> </message> @@ -2100,13 +2098,13 @@ Adres: %4 </translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Toon hulp voor een commando </translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Opties: </translation> @@ -2124,7 +2122,7 @@ Adres: %4 </translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Genereer munten </translation> @@ -2136,7 +2134,7 @@ Adres: %4 </translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Stel datamap in </translation> @@ -2152,13 +2150,7 @@ Adres: %4 <translation>Stel databankloggrootte in in megabytes (standaard: 100)</translation> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Specificeer de time-out tijd (in milliseconden) -</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <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> @@ -2168,27 +2160,27 @@ Adres: %4 <translation>Onderhoud maximaal <n> verbindingen naar peers (standaard: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Verbind naar een node om adressen van anderen op te halen, en verbreek vervolgens de verbinding</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation>Specificeer uw eigen publieke adres</translation> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation>Bind aan gegeven adres. Gebruik [host]:poort -notatie voor IPv6</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <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 line="-104"/> + <location line="-105"/> <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> @@ -2204,7 +2196,7 @@ Adres: %4 </translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation>Draai in de achtergrond als daemon en aanvaard commando's </translation> @@ -2216,7 +2208,7 @@ Adres: %4 </translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Accepteer verbindingen van buitenaf (standaard: 1 als geen -proxy of -connect is opgegeven)</translation> </message> @@ -2271,7 +2263,12 @@ Adres: %4 <translation>Vind andere nodes d.m.v. DNS-naslag (standaard: 1 tenzij -connect)</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation>Blokken aan het importeren...</translation> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation>Ongeldig -tor adres: '%s'</translation> </message> @@ -2341,7 +2338,12 @@ Adres: %4 <translation>Verklein debug.log-bestand bij het opstarten van de client (standaard: 1 als geen -debug)</translation> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>Specificeer de time-out tijd in milliseconden (standaard: 5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Gebruik UPnP om de luisterende poort te mappen (standaard: 0)</translation> </message> @@ -2384,24 +2386,24 @@ Adres: %4 </translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Sta JSON-RPC verbindingen van opgegeven IP adres toe </translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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 line="-89"/> + <location 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 line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>Vernieuw portemonnee naar nieuwste versie</translation> </message> @@ -2417,7 +2419,7 @@ Adres: %4 <translation>Doorzoek de blokkenketen op ontbrekende portemonnee-transacties</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <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> @@ -2427,7 +2429,7 @@ Adres: %4 <translation>De grondigheid van de blokverificatie (0-6, standaard: 1)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation>Importeert blokken van extern blk000?.dat bestand</translation> </message> @@ -2450,18 +2452,18 @@ Adres: %4 </translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Dit helpbericht </translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <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> @@ -2471,12 +2473,12 @@ Adres: %4 <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Niet in staat om aan %s te binden op deze computer (bind gaf error %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation>Verbind via een socks-proxy</translation> </message> @@ -2486,12 +2488,12 @@ Adres: %4 <translation>Sta DNS-naslag toe voor -addnode, -seednode en -connect</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Adressen aan het laden...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>Fout bij laden blkindex.dat</translation> </message> @@ -2506,17 +2508,17 @@ Adres: %4 <translation>Fout bij laden wallet.dat: Portemonnee vereist een nieuwere versie van Bitcoin</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <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 line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>Fout bij laden wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation>Ongeldig -proxy adres: '%s'</translation> </message> @@ -2531,7 +2533,7 @@ Adres: %4 <translation>Onbekende -socks proxyversie aangegeven: %i</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Kan -bind adres niet herleiden: '%s'</translation> </message> @@ -2541,12 +2543,12 @@ Adres: %4 <translation>Kan -externlip adres niet herleiden: '%s'</translation> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Ongeldig bedrag voor -paytxfee=<bedrag>: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation>Fout: Kon node niet starten</translation> </message> @@ -2566,17 +2568,17 @@ Adres: %4 <translation>Fout: Aanmaak transactie mislukt</translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Aan het versturen...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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 wallet.dat heeft gebruikt en in de kopie deze munten zijn gemarkeerd als uitgegeven, maar in de huidige nog niet.</translation> </message> <message> - <location line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation>Ongeldig aantal</translation> </message> @@ -2591,7 +2593,7 @@ Adres: %4 <translation>Blokindex aan het laden...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <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> @@ -2611,12 +2613,12 @@ Adres: %4 <translation>Kosten per KB om aan transacties toe te voegen die u verstuurt</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Portemonnee aan het laden...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation>Kan portemonnee niet downgraden</translation> </message> @@ -2631,22 +2633,22 @@ Adres: %4 <translation>Kan standaard adres niet schrijven</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Opnieuw aan het scannen ...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Klaar met laden</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation>Om de %s optie te gebruiken</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts index 7eac379276..9cb1bca833 100644 --- a/src/qt/locale/bitcoin_pl.ts +++ b/src/qt/locale/bitcoin_pl.ts @@ -13,15 +13,24 @@ <translation>Wersja <b>Bitcoin</b></translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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 type="unfinished"/> + <translation> +Oprogramowanie eksperymentalne. + +Distributed under the MIT/X11 software license, see the accompanying file COPYING 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.</translation> </message> </context> <context> @@ -54,7 +63,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-46"/> <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> - <translation type="unfinished"/> + <translation>Tutaj znajdują się twoje adresy Bitcoin do odbioru płatności. Możesz nadać oddzielne adresy dla każdego z wysyłających monety, żeby śledzić oddzielnie ich opłaty.</translation> </message> <message> <location line="+60"/> @@ -69,7 +78,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+11"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Podpisz wiadomość aby dowieść, że ten adres jest twój</translation> </message> <message> <location line="+3"/> @@ -84,7 +93,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+3"/> <source>&Verify Message</source> - <translation type="unfinished"/> + <translation>&Zweryfikuj wiadomość</translation> </message> <message> <location line="+11"/> @@ -284,22 +293,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation>Podpisz wiado&mość...</translation> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>Pokaż/Ukryj &Bitcoin</translation> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Synchronizacja z siecią...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>P&odsumowanie</translation> </message> @@ -374,7 +378,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Opcje...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation>Zaszyfruj Portf&el</translation> </message> @@ -404,14 +408,14 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Eksportuj...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation>Wyślij monety na adres Bitcoin</translation> </message> <message> <location line="+6"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Podpisz wiadomość aby dowieść, że ten adres jest twój</translation> </message> <message> <location line="+4"/> @@ -426,15 +430,10 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+37"/> <source>Modify configuration options for Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>Pokaż lub ukryj okno Bitcoin</translation> + <translation>Zmienia opcje konfiguracji bitcoina</translation> </message> <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation>Eksportuj dane z aktywnej karty do pliku</translation> </message> @@ -464,12 +463,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Otwórz konsolę debugowania i diagnostyki</translation> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation>&Zweryfikuj wiadomość...</translation> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -479,12 +478,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Portfel</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> <translation>O Bitcoin</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>&Pokaż / Ukryj</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>&Plik</translation> </message> @@ -563,7 +567,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+10"/> <source>Last received block was generated %1.</source> - <translation>Ostatnio otrzymany blok została wygenerowany %1.</translation> + <translation>Ostatnio otrzymany blok został wygenerowany %1.</translation> </message> <message> <location line="+59"/> @@ -641,7 +645,7 @@ Adres: %4 <translation>Wystąpił błąd podczas próby zapisu portfela do nowej lokalizacji.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <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> @@ -649,9 +653,9 @@ Adres: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> - <translation type="unfinished"/> + <translation>Sieć Alert</translation> </message> </context> <context> @@ -725,7 +729,7 @@ Adres: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation>Bitcoin-Qt</translation> @@ -891,7 +895,7 @@ Adres: %4 <message> <location line="+21"/> <source>&Display</source> - <translation type="unfinished"/> + <translation>&Wyświetlanie</translation> </message> <message> <location line="+8"/> @@ -906,12 +910,12 @@ Adres: %4 <message> <location line="+11"/> <source>&Unit to show amounts in:</source> - <translation type="unfinished"/> + <translation>&Jednostka pokazywana przy kwocie:</translation> </message> <message> <location line="+13"/> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation type="unfinished"/> + <translation>Wybierz podział jednostki pokazywany w interfejsie oraz podczas wysyłania monet</translation> </message> <message> <location line="+9"/> @@ -921,7 +925,7 @@ Adres: %4 <message> <location line="+3"/> <source>&Display addresses in transaction list</source> - <translation type="unfinished"/> + <translation>&Wyświetlaj adresy w liście transakcji</translation> </message> <message> <location line="+71"/> @@ -944,7 +948,7 @@ Adres: %4 <translation>domyślny</translation> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation>Ostrzeżenie</translation> @@ -1106,7 +1110,7 @@ Adres: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation>NIEDOSTĘPNE</translation> </message> @@ -1198,7 +1202,7 @@ Adres: %4 <message> <location line="-104"/> <source>Bitcoin - Debug window</source> - <translation type="unfinished"/> + <translation>Bitcoin - Okno debudowania</translation> </message> <message> <location line="+25"/> @@ -1240,7 +1244,7 @@ Adres: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1328,7 +1332,7 @@ Adres: %4 <message> <location line="+5"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation type="unfinished"/> + <translation>Suma przekracza twoje saldo, gdy doliczymy %1 prowizji transakcyjnej.</translation> </message> <message> <location line="+6"/> @@ -1343,7 +1347,7 @@ Adres: %4 <message> <location line="+5"/> <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>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> </context> <context> @@ -1431,7 +1435,7 @@ Adres: %4 <message> <location line="+18"/> <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Wprowadź adres Bitcoin (np. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+10"/> @@ -1468,7 +1472,7 @@ Adres: %4 <message> <location line="+21"/> <source>Sign the message to prove you own this Bitcoin address</source> - <translation type="unfinished"/> + <translation>Podpisz wiadomość aby dowieść, że ten adres jest twój</translation> </message> <message> <location line="+17"/> @@ -1495,7 +1499,7 @@ Adres: %4 <message> <location line="+21"/> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Wprowadź adres Bitcoin (np. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+40"/> @@ -1516,7 +1520,7 @@ Adres: %4 <message> <location line="-2"/> <source>Click "Sign Message" to generate signature</source> - <translation type="unfinished"/> + <translation>Kliknij "Podpisz Wiadomość" żeby uzyskać podpis</translation> </message> <message> <location line="+3"/> @@ -1673,7 +1677,7 @@ Adres: %4 <location line="+17"/> <location line="+30"/> <source>Credit</source> - <translation type="unfinished"/> + <translation>Przypisy</translation> </message> <message numerus="yes"> <location line="-102"/> @@ -1683,7 +1687,7 @@ Adres: %4 <message> <location line="+2"/> <source>not accepted</source> - <translation type="unfinished"/> + <translation>niezaakceptowane</translation> </message> <message> <location line="+44"/> @@ -1701,7 +1705,7 @@ Adres: %4 <message> <location line="+16"/> <source>Net amount</source> - <translation type="unfinished"/> + <translation>Kwota netto</translation> </message> <message> <location line="+6"/> @@ -1721,7 +1725,7 @@ Adres: %4 <message> <location line="+3"/> <source>Generated coins must mature 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, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> + <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 line="+7"/> @@ -2075,7 +2079,7 @@ Adres: %4 <translation>Wersja Bitcoin</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Użycie:</translation> </message> @@ -2090,12 +2094,12 @@ Adres: %4 <translation>Lista poleceń</translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Uzyskaj pomoc do polecenia</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Opcje:</translation> </message> @@ -2110,7 +2114,7 @@ Adres: %4 <translation>Wskaż plik pid (domyślnie: bitcoin.pid)</translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Generuj monety</translation> </message> @@ -2120,7 +2124,7 @@ Adres: %4 <translation>Nie generuj monet</translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Wskaż folder danych</translation> </message> @@ -2135,12 +2139,7 @@ Adres: %4 <translation>Ustaw rozmiar w megabajtach logu dyskowego bazy danych (domyślnie: 100)</translation> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Wskaż czas oczekiwania bezczynności połączenia (w milisekundach)</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <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> @@ -2150,27 +2149,27 @@ Adres: %4 <translation>Utrzymuj maksymalnie <n> połączeń z peerami (domyślnie: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Podłącz się do węzła aby otrzymać adresy peerów i rozłącz</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation>Skojarz z podanym adresem. Użyj formatu [host]:port dla IPv6 </translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -2185,7 +2184,7 @@ Adres: %4 <translation>Akceptuj linię poleceń oraz polecenia JSON-RPC</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation>Uruchom w tle jako daemon i przyjmuj polecenia</translation> </message> @@ -2195,7 +2194,7 @@ Adres: %4 <translation>Użyj sieci testowej</translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Akceptuj połączenia z zewnątrz (domyślnie: 1 jeśli nie ustawiono -proxy lub -connect)</translation> </message> @@ -2207,7 +2206,7 @@ Adres: %4 <message> <location line="+5"/> <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>Ostrzeżenie: -paytxfee jest bardzo duży. To jest prowizja za transakcje, którą płacisz, gdy wysyłasz monety.</translation> </message> <message> <location line="+3"/> @@ -2232,7 +2231,7 @@ Adres: %4 <message> <location line="+6"/> <source>Connect only to the specified node(s)</source> - <translation type="unfinished"/> + <translation>Łącz tylko do wskazanego węzła</translation> </message> <message> <location line="+3"/> @@ -2250,19 +2249,24 @@ Adres: %4 <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>Invalid -tor address: '%s'</source> + <location line="+6"/> + <source>Importing blocks...</source> <translation type="unfinished"/> </message> <message> + <location line="+4"/> + <source>Invalid -tor address: '%s'</source> + <translation>Nieprawidłowy adres -tor: '%s'</translation> + </message> + <message> <location line="+10"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> - <translation type="unfinished"/> + <translation>Maksymalny bufor odbioru na połączenie, <n>*1000 bajtów (domyślnie: 5000)</translation> </message> <message> <location line="+1"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</source> - <translation type="unfinished"/> + <translation>Maksymalny bufor wysyłu na połączenie, <n>*1000 bajtów (domyślnie: 1000)</translation> </message> <message> <location line="+1"/> @@ -2320,7 +2324,12 @@ Adres: %4 <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>Wskaż czas oczekiwania bezczynności połączenia w milisekundach (domyślnie: 5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Używaj UPnP do mapowania portu nasłuchu (domyślnie: 0)</translation> </message> @@ -2360,22 +2369,22 @@ Adres: %4 <translation>Nasłuchuj połączeń JSON-RPC na <port> (domyślnie: 8332)</translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Przyjmuj połączenia JSON-RPC ze wskazanego adresu IP</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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 line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>Zaktualizuj portfel do najnowszego formatu.</translation> </message> @@ -2390,7 +2399,7 @@ Adres: %4 <translation>Przeskanuj blok łańcuchów żeby znaleźć zaginione transakcje portfela</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <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> @@ -2400,7 +2409,7 @@ Adres: %4 <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation type="unfinished"/> </message> @@ -2420,17 +2429,17 @@ Adres: %4 <translation>Klucz prywatny serwera (domyślnie: server.pem)</translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Ta wiadomość pomocy</translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <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> @@ -2440,14 +2449,14 @@ Adres: %4 <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> - <translation type="unfinished"/> + <translation>Nie można przywiązać %s na tym komputerze (bind returned error %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> - <translation type="unfinished"/> + <translation>Łączy przez proxy socks</translation> </message> <message> <location line="-13"/> @@ -2455,12 +2464,12 @@ Adres: %4 <translation type="unfinished"/> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Wczytywanie adresów...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>Błąd ładownia blkindex.dat</translation> </message> @@ -2475,19 +2484,19 @@ Adres: %4 <translation>Błąd ładowania wallet.dat: Portfel wymaga nowszej wersji Bitcoin</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Portfel wymaga przepisania: zrestartuj Bitcoina żeby ukończyć</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>Błąd ładowania wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> - <translation type="unfinished"/> + <translation>Nieprawidłowy adres -proxy: '%s'</translation> </message> <message> <location line="+47"/> @@ -2500,7 +2509,7 @@ Adres: %4 <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2510,12 +2519,12 @@ Adres: %4 <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Nieprawidłowa kwota dla -paytxfee=<amount>: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation>Błąd: nie można utworzyć węzła</translation> </message> @@ -2527,7 +2536,7 @@ Adres: %4 <message> <location line="-55"/> <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>Transakcja przekracza limit. Możesz wysłać ją płacąc prowizję %1, która zostaje przekazana do węzłów, które ją prześlą i pomoże wspierać sieć Bitcoin. Czy chcesz zapłacić prowizję?</translation> </message> <message> <location line="+54"/> @@ -2535,17 +2544,17 @@ Adres: %4 <translation>Błąd: Tworzenie transakcji nie powiodło się </translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Wysyłanie...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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>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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation>Nieprawidłowa kwota</translation> </message> @@ -2560,14 +2569,14 @@ Adres: %4 <translation>Ładowanie indeksu bloku...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> - <translation type="unfinished"/> + <translation>Dodaj węzeł do łączenia się and attempt to keep the connection open</translation> </message> <message> <location line="-18"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"/> + <translation>Nie można przywiązać %s na tym komputerze. Bitcoin prawdopodobnie już działa.</translation> </message> <message> <location line="+48"/> @@ -2581,12 +2590,12 @@ Adres: %4 </translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Wczytywanie portfela...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation>Nie można dezaktualizować portfela</translation> </message> @@ -2601,22 +2610,22 @@ Adres: %4 <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Ponowne skanowanie...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Wczytywanie zakończone</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation>Aby użyć opcji %s</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts index fbc2d904cf..62e1e18e3f 100644 --- a/src/qt/locale/bitcoin_pt_BR.ts +++ b/src/qt/locale/bitcoin_pt_BR.ts @@ -13,9 +13,13 @@ <translation><b>Bitcoin</b> versão</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -49,12 +53,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-11"/> <source>&New Address</source> - <translation type="unfinished"/> + <translation>&Novo endereço</translation> </message> <message> <location line="-46"/> <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> - <translation type="unfinished"/> + <translation>Estes são os seus endereços Bitcoin para receber pagamentos. Você pode querer enviar um endereço diferente para cada remetente, para acompanhar quem está pagando.</translation> </message> <message> <location line="+60"/> @@ -104,7 +108,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+2"/> <source>&Edit</source> - <translation type="unfinished"/> + <translation>&Editar</translation> </message> <message> <location line="+250"/> @@ -215,12 +219,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"/> + <translation>Aviso: Se você criptografar sua carteira e perder sua senha, você vai <b>perder todos os seus BITCOINS!</b></translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> + <translation>Tem certeza de que deseja criptografar sua carteira?</translation> </message> <message> <location line="+106"/> @@ -278,28 +282,23 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"/> + <translation>A frase de segurança da carteira foi alterada com êxito.</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>Exibir/Ocultar &Bitcoin</translation> + <translation>&Assinar Mensagem...</translation> </message> <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Sincronizando com a rede...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Visão geral</translation> </message> @@ -374,19 +373,19 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Opções...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> - <translation type="unfinished"/> + <translation>&Criptografar Carteira...</translation> </message> <message> <location line="+3"/> <source>&Backup Wallet...</source> - <translation type="unfinished"/> + <translation>&Backup Carteira...</translation> </message> <message> <location line="+2"/> <source>&Change Passphrase...</source> - <translation type="unfinished"/> + <translation>&Mudar frase de segurança...</translation> </message> <message numerus="yes"> <location line="+241"/> @@ -396,7 +395,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+6"/> <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> - <translation type="unfinished"/> + <translation>Carregados %1 de %2 blocos do histórico de transações (%3% done).</translation> </message> <message> <location line="-254"/> @@ -404,9 +403,9 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Exportar...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Enviar moedas para um endereço bitcoin</translation> </message> <message> <location line="+6"/> @@ -426,15 +425,10 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+37"/> <source>Modify configuration options for Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>Exibir ou ocultar a janela Bitcoin</translation> + <translation>Modificar opções de configuração para bitcoin</translation> </message> <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation>Exportar os dados na aba atual para um arquivo</translation> </message> @@ -464,27 +458,32 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> <location line="+0"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>Carteira</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> - <translation type="unfinished"/> + <translation>&Sobre o Bitcoin</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>&Exibir/Ocultar</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>&Arquivo</translation> </message> @@ -640,7 +639,7 @@ Endereço: %4</translation> <translation>Houve um erro ao tentar salvar os dados da carteira para uma nova localização.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -648,7 +647,7 @@ Endereço: %4</translation> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -724,7 +723,7 @@ Endereço: %4</translation> <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation type="unfinished"/> @@ -886,7 +885,7 @@ Endereço: %4</translation> <message> <location line="+3"/> <source>M&inimize on close</source> - <translation type="unfinished"/> + <translation>M&inimize on close</translation> </message> <message> <location line="+21"/> @@ -944,7 +943,7 @@ Endereço: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation type="unfinished"/> @@ -992,7 +991,7 @@ Endereço: %4</translation> <message> <location line="-78"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>Carteira</translation> </message> <message> <location line="+124"/> @@ -1106,7 +1105,7 @@ Endereço: %4</translation> <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1240,7 +1239,7 @@ Endereço: %4</translation> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1443,7 +1442,7 @@ Endereço: %4</translation> <location line="-193"/> <location line="+203"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location line="-193"/> @@ -1453,7 +1452,7 @@ Endereço: %4</translation> <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location line="+12"/> @@ -2075,7 +2074,7 @@ Endereço: %4</translation> <translation>Bitcoin version</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Usage:</translation> </message> @@ -2092,13 +2091,13 @@ Endereço: %4</translation> </translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Get help for a command </translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Options: </translation> @@ -2116,7 +2115,7 @@ Endereço: %4</translation> </translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Generate coins </translation> @@ -2128,7 +2127,7 @@ Endereço: %4</translation> </translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Specify data directory </translation> @@ -2144,13 +2143,7 @@ Endereço: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Specify connection timeout (in milliseconds) -</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <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> @@ -2160,27 +2153,27 @@ Endereço: %4</translation> <translation>Manter no máximo <n> conexões aos peers (padrão: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Limite para desconectar peers mal comportados (padrão: 100)</translation> </message> <message> - <location line="-104"/> + <location line="-105"/> <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> @@ -2196,7 +2189,7 @@ Endereço: %4</translation> </translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation>Run in the background as a daemon and accept commands </translation> @@ -2208,7 +2201,7 @@ Endereço: %4</translation> </translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -2263,7 +2256,12 @@ Endereço: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation type="unfinished"/> </message> @@ -2333,7 +2331,12 @@ Endereço: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2376,24 +2379,24 @@ Endereço: %4</translation> </translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Allow JSON-RPC connections from specified IP address </translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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 line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>Atualizar carteira para o formato mais recente</translation> </message> @@ -2410,7 +2413,7 @@ Endereço: %4</translation> </translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <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> @@ -2420,7 +2423,7 @@ Endereço: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation type="unfinished"/> </message> @@ -2443,19 +2446,19 @@ Endereço: %4</translation> </translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>This help message </translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <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> @@ -2465,12 +2468,12 @@ Endereço: %4</translation> <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> @@ -2480,12 +2483,12 @@ Endereço: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Loading addresses...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>Erro ao carregar blkindex.dat</translation> </message> @@ -2500,17 +2503,17 @@ Endereço: %4</translation> <translation>Erro ao carregar wallet.dat: Carteira requer uma versão mais nova do Bitcoin</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <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 line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>Erro ao carregar wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> @@ -2525,7 +2528,7 @@ Endereço: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2535,12 +2538,12 @@ Endereço: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"/> </message> @@ -2560,17 +2563,17 @@ Endereço: %4</translation> <translation>Error: Transaction creation failed </translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Enviando...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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: 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.</translation> </message> <message> - <location line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation type="unfinished"/> </message> @@ -2585,7 +2588,7 @@ Endereço: %4</translation> <translation>Loading block index...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2605,12 +2608,12 @@ Endereço: %4</translation> <translation>Fee per KB to add to transactions you send</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Loading wallet...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -2625,22 +2628,22 @@ Endereço: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Rescanning...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Done loading</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts index 93a057080c..e6432abaa4 100644 --- a/src/qt/locale/bitcoin_pt_PT.ts +++ b/src/qt/locale/bitcoin_pt_PT.ts @@ -13,9 +13,13 @@ <translation><b>Bitcoin</b> versão</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -284,22 +288,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation>Assinar &mensagem...</translation> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>Mostrar/Ocultar &Bitcoin</translation> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Sincronizando com a rede...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Visão geral</translation> </message> @@ -374,7 +373,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Opções...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation>&Encriptar Carteira...</translation> </message> @@ -404,7 +403,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Exportar...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation>Enviar moedas para um endereço bitcoin</translation> </message> @@ -429,12 +428,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Modificar opções de configuração para bitcoin</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>Mostrar ou Ocultar a janela Bitcoin</translation> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation>Exportar os dados no separador actual para um ficheiro</translation> </message> @@ -464,12 +458,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Abrir consola de diagnóstico e depuração</translation> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation>&Verificar mensagem...</translation> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -479,12 +473,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Carteira</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> + <translation>&Sobre o Bitcoin</translation> + </message> + <message> + <location line="+9"/> + <source>&Show / Hide</source> <translation type="unfinished"/> </message> <message> - <location line="+44"/> + <location line="+34"/> <source>&File</source> <translation>&Ficheiro</translation> </message> @@ -640,7 +639,7 @@ Endereço: %4</translation> <translation>Ocorreu um erro ao tentar guardar os dados da carteira na nova localização.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -648,7 +647,7 @@ Endereço: %4</translation> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation>Alerta da Rede</translation> </message> @@ -724,7 +723,7 @@ Endereço: %4</translation> <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation>Bitcoin-Qt</translation> @@ -943,7 +942,7 @@ Endereço: %4</translation> <translation>padrão</translation> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation>Aviso</translation> @@ -1105,7 +1104,7 @@ Endereço: %4</translation> <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation>N/D</translation> </message> @@ -1197,7 +1196,7 @@ Endereço: %4</translation> <message> <location line="-104"/> <source>Bitcoin - Debug window</source> - <translation type="unfinished"/> + <translation>Bitcoin - Janela de depuração</translation> </message> <message> <location line="+25"/> @@ -1239,7 +1238,7 @@ Endereço: %4</translation> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1430,19 +1429,19 @@ Endereço: %4</translation> <message> <location line="+18"/> <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Introduza um endereço Bitcoin (p.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+10"/> <location line="+203"/> <source>Choose an address from the address book</source> - <translation type="unfinished"/> + <translation>Escolher endereço do livro de endereços</translation> </message> <message> <location line="-193"/> <location line="+203"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location line="-193"/> @@ -1452,7 +1451,7 @@ Endereço: %4</translation> <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location line="+12"/> @@ -1494,7 +1493,7 @@ Endereço: %4</translation> <message> <location line="+21"/> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Introduza um endereço Bitcoin (p.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+40"/> @@ -1639,7 +1638,7 @@ Endereço: %4</translation> <message> <location line="+0"/> <source>Generated</source> - <translation type="unfinished"/> + <translation>Gerado</translation> </message> <message> <location line="+6"/> @@ -1663,7 +1662,7 @@ Endereço: %4</translation> <message> <location line="-2"/> <source>label</source> - <translation type="unfinished"/> + <translation>rótulo</translation> </message> <message> <location line="+37"/> @@ -1695,7 +1694,7 @@ Endereço: %4</translation> <message> <location line="-39"/> <source>Transaction fee</source> - <translation type="unfinished"/> + <translation>Taxa de transação</translation> </message> <message> <location line="+16"/> @@ -2074,7 +2073,7 @@ Endereço: %4</translation> <translation>Versão Bitcoin</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Utilização:</translation> </message> @@ -2089,12 +2088,12 @@ Endereço: %4</translation> <translation>Listar comandos</translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Obter ajuda para um comando</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Opções:</translation> </message> @@ -2109,7 +2108,7 @@ Endereço: %4</translation> <translation>Especificar ficheiro pid (por defeito: bitcoind.pid)</translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Gerar moedas</translation> </message> @@ -2119,7 +2118,7 @@ Endereço: %4</translation> <translation>Não gerar moedas</translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Especificar pasta de dados</translation> </message> @@ -2134,12 +2133,7 @@ Endereço: %4</translation> <translation>Definir o tamanho de registo do disco de base de dados em megabytes (por defeito: 100)</translation> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Especificar tempo de espera da ligação (em millisegundos)</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Escute por ligações em <port> (por defeito: 8333 ou testnet: 18333)</translation> </message> @@ -2149,27 +2143,27 @@ Endereço: %4</translation> <translation>Manter no máximo <n> ligações a outros nós da rede (por defeito: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Ligar a um nó para recuperar endereços de pares, e desligar</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation>Especifique o seu endereço público</translation> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation>Trancar a endereço específio. Use a notação [anfitrião]:porta para IPv6</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Tolerância para desligar nós mal-formados (por defeito: 100)</translation> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Número de segundos a impedir que nós mal-formados se liguem de novo (por defeito: 86400)</translation> </message> @@ -2184,7 +2178,7 @@ Endereço: %4</translation> <translation>Aceitar comandos da consola e JSON-RPC</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation>Correr o processo como um daemon e aceitar comandos</translation> </message> @@ -2194,7 +2188,7 @@ Endereço: %4</translation> <translation>Utilizar a rede de testes - testnet</translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Aceitar ligações externas (padrão: 1 sem -proxy ou -connect)</translation> </message> @@ -2249,7 +2243,12 @@ Endereço: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation type="unfinished"/> </message> @@ -2319,7 +2318,12 @@ Endereço: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Usar UPnP para mapear a porta de escuta (padrão: 0)</translation> </message> @@ -2359,22 +2363,22 @@ Endereço: %4</translation> <translation>Escutar por ligações JSON-RPC na porta <port> (por defeito: 8332)</translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Permitir ligações JSON-RPC do endereço IP especificado</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Enviar comandos para o nó a correr em <ip> (por defeito: 127.0.0.1)</translation> </message> <message> - <location line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Executar comando quando mudar o melhor bloco (na consola, %s é substituído pela hash do bloco)</translation> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>Atualize a carteira para o formato mais recente</translation> </message> @@ -2389,7 +2393,7 @@ Endereço: %4</translation> <translation>Reexaminar a cadeia de blocos para transações em falta na carteira</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation>Verificar quantos blocos ao iniciar (por defeito: 2500, 0 = todos)</translation> </message> @@ -2399,7 +2403,7 @@ Endereço: %4</translation> <translation>Minuciosidade da verificação de blocos é (0-6, por defeito: 1)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation>Importar blocos de ficheiro blk000?.dat externo</translation> </message> @@ -2419,17 +2423,17 @@ Endereço: %4</translation> <translation>Chave privada do servidor (por defeito: server.pem)</translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation>Cifras aceitáveis (por defeito: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> </message> <message> - <location line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Esta mensagem de ajuda</translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation>Impossível trancar a pasta de dados %s. Provavelmente o Bitcoin já está a ser executado.</translation> </message> @@ -2439,12 +2443,12 @@ Endereço: %4</translation> <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation>Ligar através de um proxy socks</translation> </message> @@ -2454,12 +2458,12 @@ Endereço: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>A carregar endereços...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>Erro ao carregar blkindex.dat</translation> </message> @@ -2474,17 +2478,17 @@ Endereço: %4</translation> <translation>Erro ao carregar wallet.dat: A Carteira requer uma versão mais recente do Bitcoin</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <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 line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>Erro ao carregar wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> @@ -2499,7 +2503,7 @@ Endereço: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2509,12 +2513,12 @@ Endereço: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Quantia inválida para -paytxfee=<amount>: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"/> </message> @@ -2534,17 +2538,17 @@ Endereço: %4</translation> <translation>Error: Transaction creation failed </translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Enviando...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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: 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.</translation> </message> <message> - <location line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation>Quantia inválida</translation> </message> @@ -2559,7 +2563,7 @@ Endereço: %4</translation> <translation>A carregar índice de blocos...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Adicione um nó ao qual se ligar e tentar manter a ligação aberta</translation> </message> @@ -2579,12 +2583,12 @@ Endereço: %4</translation> <translation>Fee per KB to add to transactions you send</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>A carregar carteira...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation>Impossível mudar a carteira para uma versão anterior</translation> </message> @@ -2599,22 +2603,22 @@ Endereço: %4</translation> <translation>Impossível escrever endereço por defeito</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Reexaminando...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Carregamento completo</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation>Para usar a opção %s</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts index 5eba94dcf9..efe3d6088c 100644 --- a/src/qt/locale/bitcoin_ro_RO.ts +++ b/src/qt/locale/bitcoin_ro_RO.ts @@ -13,9 +13,13 @@ <translation><b>Bitcoin</b> versiunea</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -49,17 +53,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-11"/> <source>&New Address</source> - <translation type="unfinished"/> + <translation>&Adresă nouă</translation> </message> <message> <location line="-46"/> <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> - <translation type="unfinished"/> + <translation>Acestea sunt adresele dumneavoastră Bitcoin pentru a primi plăţi. Dacă doriţi, puteți da o adresa diferită fiecărui expeditor, pentru a putea ţine evidenţa plăţilor.</translation> </message> <message> <location line="+60"/> <source>&Copy Address</source> - <translation type="unfinished"/> + <translation>&Copiază adresa</translation> </message> <message> <location line="+11"/> @@ -99,12 +103,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../addressbookpage.cpp" line="+65"/> <source>Copy &Label</source> - <translation type="unfinished"/> + <translation>Copiază &eticheta</translation> </message> <message> <location line="+2"/> <source>&Edit</source> - <translation type="unfinished"/> + <translation>&Editează</translation> </message> <message> <location line="+250"/> @@ -215,12 +219,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"/> + <translation>Atenție: Dacă pierdeţi parola portofelului electronic dupa criptare, <b>VEŢI PIERDE ÎNTREAGA SUMĂ DE BITCOIN ACUMULATĂ</b>!</translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> + <translation>Sunteţi sigur că doriţi să criptaţi portofelul electronic?</translation> </message> <message> <location line="+106"/> @@ -278,28 +282,23 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"/> + <translation>Parola portofelului electronic a fost schimbată.</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation type="unfinished"/> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Se sincronizează cu reţeaua...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Detalii</translation> </message> @@ -361,12 +360,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+2"/> <source>About &Qt</source> - <translation type="unfinished"/> + <translation>Despre &Qt</translation> </message> <message> <location line="+1"/> <source>Show information about Qt</source> - <translation type="unfinished"/> + <translation>Informaţii despre Qt</translation> </message> <message> <location line="+2"/> @@ -374,19 +373,19 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Setări...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> - <translation type="unfinished"/> + <translation>Criptează portofelul electronic...</translation> </message> <message> <location line="+3"/> <source>&Backup Wallet...</source> - <translation type="unfinished"/> + <translation>&Backup portofelul electronic...</translation> </message> <message> <location line="+2"/> <source>&Change Passphrase...</source> - <translation type="unfinished"/> + <translation>&Schimbă parola...</translation> </message> <message numerus="yes"> <location line="+241"/> @@ -396,7 +395,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+6"/> <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> - <translation type="unfinished"/> + <translation>S-au descărcat %1 din %2 blocuri din istoricul tranzaciilor (%3% done).</translation> </message> <message> <location line="-254"/> @@ -404,9 +403,9 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Exportă...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> - <translation type="unfinished"/> + <translation>&Trimiteţi Bitcoin către o anumită adresă</translation> </message> <message> <location line="+6"/> @@ -426,15 +425,10 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+37"/> <source>Modify configuration options for Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation type="unfinished"/> + <translation>Modifică setările pentru Bitcoin</translation> </message> <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation type="unfinished"/> </message> @@ -464,27 +458,32 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> <location line="+0"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>Portofelul</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> + <translation>&Despre Bitcoin</translation> + </message> + <message> + <location line="+9"/> + <source>&Show / Hide</source> <translation type="unfinished"/> </message> <message> - <location line="+44"/> + <location line="+34"/> <source>&File</source> <translation>&Fişier</translation> </message> @@ -619,7 +618,7 @@ Address: %4 <message> <location line="+23"/> <source>Backup Wallet</source> - <translation type="unfinished"/> + <translation>Backup portofelul electronic</translation> </message> <message> <location line="+0"/> @@ -637,7 +636,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -645,7 +644,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -705,7 +704,7 @@ Address: %4 <message> <location line="+5"/> <source>The entered address "%1" is not a valid Bitcoin address.</source> - <translation type="unfinished"/> + <translation>Adresa introdusă "%1" nu este o adresă bitcoin valabilă.</translation> </message> <message> <location line="+5"/> @@ -721,7 +720,7 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation type="unfinished"/> @@ -729,7 +728,7 @@ Address: %4 <message> <location line="-12"/> <source>version</source> - <translation type="unfinished"/> + <translation>versiunea</translation> </message> <message> <location line="+2"/> @@ -739,12 +738,12 @@ Address: %4 <message> <location line="+1"/> <source>command-line options</source> - <translation type="unfinished"/> + <translation>command-line setări</translation> </message> <message> <location line="+4"/> <source>UI options</source> - <translation type="unfinished"/> + <translation>UI setări</translation> </message> <message> <location line="+1"/> @@ -772,7 +771,7 @@ Address: %4 <message> <location line="+16"/> <source>&Main</source> - <translation type="unfinished"/> + <translation>&Principal</translation> </message> <message> <location line="+6"/> @@ -787,12 +786,12 @@ Address: %4 <message> <location line="+31"/> <source>Automatically start Bitcoin after logging in to the system.</source> - <translation type="unfinished"/> + <translation>Porneşte automat programul Bitcoin la pornirea computerului.</translation> </message> <message> <location line="+3"/> <source>&Start Bitcoin on system login</source> - <translation type="unfinished"/> + <translation>&S Porneşte Bitcoin la pornirea sistemului</translation> </message> <message> <location line="+7"/> @@ -822,12 +821,12 @@ Address: %4 <message> <location line="+7"/> <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source> - <translation type="unfinished"/> + <translation>Conectare la reţeaua Bitcoin folosind un proxy SOCKS (de exemplu, când conexiunea se stabileşte prin reţeaua Tor)</translation> </message> <message> <location line="+3"/> <source>&Connect through SOCKS proxy:</source> - <translation type="unfinished"/> + <translation>&Conectează prin proxy SOCKS:</translation> </message> <message> <location line="+9"/> @@ -847,7 +846,7 @@ Address: %4 <message> <location line="+19"/> <source>Port of the proxy (e.g. 9050)</source> - <translation type="unfinished"/> + <translation>Portul pe care se concetează proxy serverul (de exemplu: 9050)</translation> </message> <message> <location line="+7"/> @@ -867,7 +866,7 @@ Address: %4 <message> <location line="+6"/> <source>Show only a tray icon after minimizing the window.</source> - <translation type="unfinished"/> + <translation>Afişează doar un icon in tray la ascunderea ferestrei</translation> </message> <message> <location line="+3"/> @@ -882,12 +881,12 @@ Address: %4 <message> <location line="+3"/> <source>M&inimize on close</source> - <translation type="unfinished"/> + <translation>&i Ascunde fereastra în locul închiderii programului</translation> </message> <message> <location line="+21"/> <source>&Display</source> - <translation type="unfinished"/> + <translation>&Afişare</translation> </message> <message> <location line="+8"/> @@ -902,12 +901,12 @@ Address: %4 <message> <location line="+11"/> <source>&Unit to show amounts in:</source> - <translation type="unfinished"/> + <translation>&Unitatea de măsură pentru afişarea sumelor:</translation> </message> <message> <location line="+13"/> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation type="unfinished"/> + <translation>Alege subdiviziunea folosită la afişarea interfeţei şi la trimiterea de bitcoin.</translation> </message> <message> <location line="+9"/> @@ -917,7 +916,7 @@ Address: %4 <message> <location line="+3"/> <source>&Display addresses in transaction list</source> - <translation type="unfinished"/> + <translation>&Afişează adresele în lista de tranzacţii</translation> </message> <message> <location line="+71"/> @@ -940,7 +939,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation type="unfinished"/> @@ -988,7 +987,7 @@ Address: %4 <message> <location line="-78"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>Portofelul</translation> </message> <message> <location line="+124"/> @@ -1042,12 +1041,12 @@ Address: %4 <message> <location line="+56"/> <source>Amount:</source> - <translation type="unfinished"/> + <translation>Sumă:</translation> </message> <message> <location line="-44"/> <source>Label:</source> - <translation type="unfinished"/> + <translation>Etichetă:</translation> </message> <message> <location line="+19"/> @@ -1102,7 +1101,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1169,7 +1168,7 @@ Address: %4 <message> <location line="+16"/> <source>Command-line options</source> - <translation type="unfinished"/> + <translation>Command-line setări</translation> </message> <message> <location line="+7"/> @@ -1236,7 +1235,7 @@ Address: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1254,7 +1253,7 @@ Address: %4 <message> <location line="+3"/> <source>&Add Recipient</source> - <translation type="unfinished"/> + <translation>&Adaugă destinatar</translation> </message> <message> <location line="+20"/> @@ -1264,7 +1263,7 @@ Address: %4 <message> <location line="+3"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>Şterge &tot</translation> </message> <message> <location line="+22"/> @@ -1309,7 +1308,7 @@ Address: %4 <message> <location line="+23"/> <source>The recipient address is not valid, please recheck.</source> - <translation type="unfinished"/> + <translation>Adresa destinatarului nu este validă, vă rugăm să o verificaţi.</translation> </message> <message> <location line="+5"/> @@ -1319,27 +1318,27 @@ Address: %4 <message> <location line="+5"/> <source>The amount exceeds your balance.</source> - <translation type="unfinished"/> + <translation>Suma depăşeşte soldul contului.</translation> </message> <message> <location line="+5"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation type="unfinished"/> + <translation>Total depăşeşte soldul contului in cazul plăţii comisionului de %1.</translation> </message> <message> <location line="+6"/> <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation type="unfinished"/> + <translation>S-a descoperit o adresă care figurează de două ori. Expedierea se poate realiza către fiecare adresă doar o singură dată pe operaţiune.</translation> </message> <message> <location line="+5"/> <source>Error: Transaction creation failed.</source> - <translation type="unfinished"/> + <translation>Eroare: Tranyacţia nu a putut fi iniţiată.</translation> </message> <message> <location line="+5"/> <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>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> </context> <context> @@ -1378,7 +1377,7 @@ Address: %4 <message> <location line="+10"/> <source>Choose address from address book</source> - <translation type="unfinished"/> + <translation>Alegeţi adresa din Listă</translation> </message> <message> <location line="+10"/> @@ -1427,19 +1426,19 @@ Address: %4 <message> <location line="+18"/> <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Introduceţi o adresă Bitcoin (de exemplu: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+10"/> <location line="+203"/> <source>Choose an address from the address book</source> - <translation type="unfinished"/> + <translation>Alegeţi adresa din Listă</translation> </message> <message> <location line="-193"/> <location line="+203"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location line="-193"/> @@ -1449,7 +1448,7 @@ Address: %4 <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location line="+12"/> @@ -1475,7 +1474,7 @@ Address: %4 <location line="+3"/> <location line="+146"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>Şterge &tot</translation> </message> <message> <location line="-87"/> @@ -1491,7 +1490,7 @@ Address: %4 <message> <location line="+21"/> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Introduceţi o adresă Bitcoin (de exemplu: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+40"/> @@ -1616,7 +1615,7 @@ Address: %4 <message> <location line="+18"/> <source>Status</source> - <translation type="unfinished"/> + <translation>Stare</translation> </message> <message numerus="yes"> <location line="+7"/> @@ -1642,14 +1641,14 @@ Address: %4 <location line="+6"/> <location line="+17"/> <source>From</source> - <translation type="unfinished"/> + <translation>De la</translation> </message> <message> <location line="+1"/> <location line="+22"/> <location line="+58"/> <source>To</source> - <translation type="unfinished"/> + <translation>Către</translation> </message> <message> <location line="-77"/> @@ -1660,7 +1659,7 @@ Address: %4 <message> <location line="-2"/> <source>label</source> - <translation type="unfinished"/> + <translation>etichetă</translation> </message> <message> <location line="+37"/> @@ -1679,7 +1678,7 @@ Address: %4 <message> <location line="+2"/> <source>not accepted</source> - <translation type="unfinished"/> + <translation>nu este acceptat</translation> </message> <message> <location line="+44"/> @@ -1692,22 +1691,22 @@ Address: %4 <message> <location line="-39"/> <source>Transaction fee</source> - <translation type="unfinished"/> + <translation>Comisionul tranzacţiei</translation> </message> <message> <location line="+16"/> <source>Net amount</source> - <translation type="unfinished"/> + <translation>Suma netă</translation> </message> <message> <location line="+6"/> <source>Message</source> - <translation type="unfinished"/> + <translation>Mesaj</translation> </message> <message> <location line="+2"/> <source>Comment</source> - <translation type="unfinished"/> + <translation>Comentarii</translation> </message> <message> <location line="+2"/> @@ -1717,7 +1716,7 @@ Address: %4 <message> <location line="+3"/> <source>Generated coins must mature 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, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> + <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 line="+7"/> @@ -1727,7 +1726,7 @@ Address: %4 <message> <location line="+8"/> <source>Transaction</source> - <translation type="unfinished"/> + <translation>Tranzacţie</translation> </message> <message> <location line="+5"/> @@ -1977,7 +1976,7 @@ Address: %4 <message> <location line="+1"/> <source>Copy amount</source> - <translation type="unfinished"/> + <translation>Copiază sumă</translation> </message> <message> <location line="+1"/> @@ -2071,7 +2070,7 @@ Address: %4 <translation>versiunea Bitcoin</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Uz:</translation> </message> @@ -2086,12 +2085,12 @@ Address: %4 <translation>Listă de comenzi</translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Ajutor pentru o comandă</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Setări:</translation> </message> @@ -2106,7 +2105,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation type="unfinished"/> </message> @@ -2116,7 +2115,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation type="unfinished"/> </message> @@ -2131,12 +2130,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2146,27 +2140,27 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -2181,7 +2175,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> @@ -2191,7 +2185,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -2246,7 +2240,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation type="unfinished"/> </message> @@ -2316,7 +2315,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2356,22 +2360,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> @@ -2386,7 +2390,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2396,7 +2400,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation type="unfinished"/> </message> @@ -2416,17 +2420,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-109"/> + <location line="-110"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"/> </message> <message> - <location line="+121"/> + <location line="+122"/> <source>This help message</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-119"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation type="unfinished"/> </message> @@ -2436,14 +2440,14 @@ Address: %4 <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> - <translation type="unfinished"/> + <translation>Conectează prin proxy SOCKS</translation> </message> <message> <location line="-13"/> @@ -2451,12 +2455,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Încarc adrese...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation type="unfinished"/> </message> @@ -2471,17 +2475,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> @@ -2496,7 +2500,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2506,12 +2510,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"/> </message> @@ -2523,7 +2527,7 @@ Address: %4 <message> <location line="-55"/> <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>Această tranzacţie depăşeşte limita. Puteţi iniţia tranzacţia platind un comision de %1, de care vor beneficia nodurile care procesează tranzacţia şi ajută la menţinerea reţelei. Acceptaţi plata comisionului?</translation> </message> <message> <location line="+54"/> @@ -2531,17 +2535,17 @@ Address: %4 <translation>Eroare: Tranyacţia nu a putut fi iniţiată </translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Transmitere...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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>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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation type="unfinished"/> </message> @@ -2556,7 +2560,7 @@ Address: %4 <translation>Încarc indice bloc...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2576,12 +2580,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Încarc portofel...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -2596,22 +2600,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Rescanez...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Încărcare terminată</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2625,7 +2629,7 @@ If the file does not exist, create it with owner-readable-only file permissions. <message> <location line="+74"/> <source>Error</source> - <translation type="unfinished"/> + <translation>Eroare</translation> </message> <message> <location line="-30"/> diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts index f3c34b56bd..6b6a98726a 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -13,16 +13,19 @@ <translation><b>Bitcoin</b> версия</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation>Все права защищены © 2009-2012 Разработчики Bitcoin</translation> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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>Все права защищены © 2009-2012 Разработчики Bitcoin - + <translation> Это экспериментальная программа. Распространяется на правах лицензии MIT/X11, см. файл license.txt или http://www.opensource.org/licenses/mit-license.php. @@ -290,22 +293,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation>&Подписать сообщение</translation> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>Показать/Скрыть &Bitcoin</translation> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Синхронизация с сетью...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>О&бзор</translation> </message> @@ -380,7 +378,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Оп&ции...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation>&Зашифровать бумажник</translation> </message> @@ -410,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Экспорт...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation>Отправить монеты на указанный адрес Bitcoin</translation> </message> @@ -435,12 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Изменить параметры конфигурации Bitcoin</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>Показать или скрыть окно Bitcoin</translation> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation>Экспортировать данные из вкладки в файл</translation> </message> @@ -470,12 +463,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Открыть консоль отладки и диагностики</translation> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation>&Проверить сообщение...</translation> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Биткоин</translation> </message> @@ -485,12 +478,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Бумажник</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> <translation>&О Bitcoin</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>&Показать / Скрыть</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>&Файл</translation> </message> @@ -647,7 +645,7 @@ Address: %4 <translation>При попытке сохранения данных бумажника в новое место произошла ошибка.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Произошла неисправимая ошибка. Bitcoin не может безопасно продолжать работу и будет закрыт.</translation> </message> @@ -655,7 +653,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation>Сетевая Тревога</translation> </message> @@ -731,7 +729,7 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation>Bitcoin-Qt</translation> @@ -950,7 +948,7 @@ Address: %4 <translation>по умолчанию</translation> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation>Внимание</translation> @@ -1112,7 +1110,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation>Н/Д</translation> </message> @@ -1246,7 +1244,7 @@ Address: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -2081,7 +2079,7 @@ Address: %4 <translation>Версия</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Использование:</translation> </message> @@ -2097,12 +2095,12 @@ Address: %4 </translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Получить помощь по команде</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Опции:</translation> </message> @@ -2117,7 +2115,7 @@ Address: %4 <translation>Указать pid-файл (по умолчанию: bitcoin.pid)</translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Генерировать монеты</translation> </message> @@ -2127,7 +2125,7 @@ Address: %4 <translation>Не генерировать монеты</translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Укажите каталог данных</translation> </message> @@ -2142,12 +2140,7 @@ Address: %4 <translation>Установить размер лога базы данных в мегабайтах (по умолчанию: 100)</translation> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Укажите таймаут соединения (в миллисекундах)</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Принимать входящие подключения на <port> (по умолчанию: 8333 или 18333 в тестовой сети)</translation> </message> @@ -2157,27 +2150,27 @@ Address: %4 <translation>Поддерживать не более <n> подключений к узлам (по умолчанию: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Подключиться к узлу, чтобы получить список адресов других участников и отключиться</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation>Укажите ваш собственный публичный адрес</translation> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation>Привязаться (bind) к указанному адресу. Используйте запись вида [хост]:порт для IPv6</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Порог для отключения неправильно ведущих себя узлов (по умолчанию: 100)</translation> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Число секунд блокирования неправильно ведущих себя узлов (по умолчанию: 86400)</translation> </message> @@ -2192,7 +2185,7 @@ Address: %4 <translation>Принимать командную строку и команды JSON-RPC</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation>Запускаться в фоне как демон и принимать команды</translation> </message> @@ -2202,7 +2195,7 @@ Address: %4 <translation>Использовать тестовую сеть</translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Принимать подключения извне (по умолчанию: 1, если не используется -proxy или -connect)</translation> </message> @@ -2257,7 +2250,12 @@ Address: %4 <translation>Искать узлы с помощью DNS (по умолчанию: 1, если не указан -connect)</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation>Импортирование блоков...</translation> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation>Неверный адрес -tor: '%s'</translation> </message> @@ -2328,7 +2326,12 @@ Address: %4 <translation>Сжимать файл debug.log при запуске клиента (по умолчанию: 1, если нет -debug)</translation> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>Таймаут соединения в миллисекундах (по умолчанию: 5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Использовать UPnP для проброса порта (по умолчанию: 0)</translation> </message> @@ -2368,22 +2371,22 @@ Address: %4 <translation>Ожидать подключения JSON-RPC на <порт> (по умолчанию: 8332)</translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Разрешить подключения JSON-RPC с указанного IP</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Посылать команды узлу, запущенному на <ip> (по умолчанию: 127.0.0.1)</translation> </message> <message> - <location line="-89"/> + <location 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 line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>Обновить бумажник до последнего формата</translation> </message> @@ -2398,7 +2401,7 @@ Address: %4 <translation>Перепроверить цепь блоков на предмет отсутствующих в бумажнике транзакций</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation>Сколько блоков проверять при запуске (по умолчанию: 2500, 0 = все)</translation> </message> @@ -2408,7 +2411,7 @@ Address: %4 <translation>Насколько тщательно проверять блоки (0-6, по умолчанию: 1)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation>Импортировать блоки из внешнего файла blk000?.dat</translation> </message> @@ -2428,17 +2431,17 @@ Address: %4 <translation>Приватный ключ сервера (по умолчанию: server.pem)</translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Эта справка</translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation>Невозможно установить блокировку на рабочую директорию %s. Возможно, бумажник уже запущен.</translation> </message> @@ -2448,12 +2451,12 @@ Address: %4 <translation>Биткоин</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Невозможно привязаться к %s на этом компьютере (bind вернул ошибку %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation>Подключаться через socks прокси</translation> </message> @@ -2463,12 +2466,12 @@ Address: %4 <translation>Разрешить поиск в DNS для -addnode, -seednode и -connect</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Загрузка адресов...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>Ошибка чтения blkindex.dat</translation> </message> @@ -2483,17 +2486,17 @@ Address: %4 <translation>Ошибка загрузки wallet.dat: бумажник требует более новую версию Bitcoin</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Необходимо перезаписать бумажник, перезапустите Bitcoin для завершения операции.</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>Ошибка при загрузке wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation>Неверный адрес -proxy: '%s'</translation> </message> @@ -2508,7 +2511,7 @@ Address: %4 <translation>В параметре -socks запрошена неизвестная версия: %i</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Не удаётся разрешить адрес в параметре -bind: '%s'</translation> </message> @@ -2518,12 +2521,12 @@ Address: %4 <translation>Не удаётся разрешить адрес в параметре -externalip: '%s'</translation> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Неверное количество в параметре -paytxfee=<кол-во>: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation>Ошибка: не удалось запустить узел</translation> </message> @@ -2543,17 +2546,17 @@ Address: %4 <translation>Ошибка: Создание транзакции не удалось </translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Отправка...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation>Неверное количество</translation> </message> @@ -2568,7 +2571,7 @@ Address: %4 <translation>Загрузка индекса блоков...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Добавить узел для подключения и пытаться поддерживать соединение открытым</translation> </message> @@ -2588,12 +2591,12 @@ Address: %4 <translation>Комиссия на килобайт, добавляемая к вашим транзакциям</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Загрузка бумажника...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation>Не удаётся понизить версию бумажника</translation> </message> @@ -2608,22 +2611,22 @@ Address: %4 <translation>Не удаётся записать адрес по умолчанию</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Сканирование...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Загрузка завершена</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation>Чтобы использовать опцию %s</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts index d958cceb9e..9c62a91354 100644 --- a/src/qt/locale/bitcoin_sk.ts +++ b/src/qt/locale/bitcoin_sk.ts @@ -13,9 +13,13 @@ <translation><b>Bitcoin</b> verzia</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -49,17 +53,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-11"/> <source>&New Address</source> - <translation type="unfinished"/> + <translation>&Nová adresa</translation> </message> <message> <location line="-46"/> <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> - <translation type="unfinished"/> + <translation>Toto sú Vaše Bitcoin adresy pre prijímanie platieb. Môžete dať každému odosielateľovi inú rôznu adresu a tak udržiavať prehľad o platbách.</translation> </message> <message> <location line="+60"/> <source>&Copy Address</source> - <translation type="unfinished"/> + <translation>&Kopírovať adresu</translation> </message> <message> <location line="+11"/> @@ -69,7 +73,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+11"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Podpísať správu a dokázať že vlastníte túto adresu</translation> </message> <message> <location line="+3"/> @@ -99,12 +103,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../addressbookpage.cpp" line="+65"/> <source>Copy &Label</source> - <translation type="unfinished"/> + <translation>Kopírovať &popis</translation> </message> <message> <location line="+2"/> <source>&Edit</source> - <translation type="unfinished"/> + <translation>&Upraviť</translation> </message> <message> <location line="+250"/> @@ -215,18 +219,18 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"/> + <translation>Varovanie: Ak zašifrujete peňaženku a stratíte heslo, <b>STRATÍTE VŠETKY VAŠE BITCOINY</b>!⏎</translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> + <translation>Ste si istí, že si želáte zašifrovať peňaženku?</translation> </message> <message> <location line="+106"/> <location line="+24"/> <source>Warning: The Caps Lock key is on!</source> - <translation type="unfinished"/> + <translation>Varovanie: Caps Lock je zapnutý</translation> </message> <message> <location line="-121"/> @@ -278,28 +282,23 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"/> + <translation>Heslo k peňaženke bolo úspešne zmenené.</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation type="unfinished"/> + <translation>Podpísať &správu...</translation> </message> <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Synchronizácia so sieťou...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Prehľad</translation> </message> @@ -374,19 +373,19 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Možnosti...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> - <translation type="unfinished"/> + <translation>&Zašifrovať Peňaženku...</translation> </message> <message> <location line="+3"/> <source>&Backup Wallet...</source> - <translation type="unfinished"/> + <translation>&Backup peňaženku...</translation> </message> <message> <location line="+2"/> <source>&Change Passphrase...</source> - <translation type="unfinished"/> + <translation>&Zmena Hesla...</translation> </message> <message numerus="yes"> <location line="+241"/> @@ -396,7 +395,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+6"/> <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> - <translation type="unfinished"/> + <translation>Stiahnutých %1 (of %2) blokov transakčnej histórie (%3% done).</translation> </message> <message> <location line="-254"/> @@ -404,14 +403,14 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Export...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Poslať bitcoins na adresu</translation> </message> <message> <location line="+6"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Podpísať správu a dokázať že vlastníte túto adresu</translation> </message> <message> <location line="+4"/> @@ -426,15 +425,10 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+37"/> <source>Modify configuration options for Bitcoin</source> - <translation type="unfinished"/> + <translation>Upraviť možnosti nastavenia pre bitcoin</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation>Exportovať tento náhľad do súboru</translation> </message> @@ -464,27 +458,32 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>Peňaženka</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> + <translation>&O Bitcoin</translation> + </message> + <message> + <location line="+9"/> + <source>&Show / Hide</source> <translation type="unfinished"/> </message> <message> - <location line="+44"/> + <location line="+34"/> <source>&File</source> <translation>&Súbor</translation> </message> @@ -640,7 +639,7 @@ Adresa: %4</translation> <translation>Nastala chyba pri pokuse uložiť peňaženku na nové miesto.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -648,7 +647,7 @@ Adresa: %4</translation> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -708,7 +707,7 @@ Adresa: %4</translation> <message> <location line="+5"/> <source>The entered address "%1" is not a valid Bitcoin address.</source> - <translation type="unfinished"/> + <translation>Vložená adresa "%1" nieje platnou adresou bitcoin.</translation> </message> <message> <location line="+5"/> @@ -724,7 +723,7 @@ Adresa: %4</translation> <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation type="unfinished"/> @@ -732,7 +731,7 @@ Adresa: %4</translation> <message> <location line="-12"/> <source>version</source> - <translation type="unfinished"/> + <translation>verzia</translation> </message> <message> <location line="+2"/> @@ -747,7 +746,7 @@ Adresa: %4</translation> <message> <location line="+4"/> <source>UI options</source> - <translation type="unfinished"/> + <translation>UI možnosti</translation> </message> <message> <location line="+1"/> @@ -775,7 +774,7 @@ Adresa: %4</translation> <message> <location line="+16"/> <source>&Main</source> - <translation type="unfinished"/> + <translation>&Hlavné</translation> </message> <message> <location line="+6"/> @@ -790,12 +789,12 @@ Adresa: %4</translation> <message> <location line="+31"/> <source>Automatically start Bitcoin after logging in to the system.</source> - <translation type="unfinished"/> + <translation>Automaticky spustiť Bitcoin po zapnutí počítača</translation> </message> <message> <location line="+3"/> <source>&Start Bitcoin on system login</source> - <translation type="unfinished"/> + <translation>&Spustiť Bitcoin pri spustení systému správy okien</translation> </message> <message> <location line="+7"/> @@ -825,12 +824,12 @@ Adresa: %4</translation> <message> <location line="+7"/> <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source> - <translation type="unfinished"/> + <translation>Pripojiť do siete Bitcoin cez SOCKS proxy (napr. keď sa pripájate cez Tor)</translation> </message> <message> <location line="+3"/> <source>&Connect through SOCKS proxy:</source> - <translation type="unfinished"/> + <translation>&Pripojiť cez SOCKS proxy:</translation> </message> <message> <location line="+9"/> @@ -850,7 +849,7 @@ Adresa: %4</translation> <message> <location line="+19"/> <source>Port of the proxy (e.g. 9050)</source> - <translation type="unfinished"/> + <translation>Port proxy (napr. 9050)</translation> </message> <message> <location line="+7"/> @@ -870,7 +869,7 @@ Adresa: %4</translation> <message> <location line="+6"/> <source>Show only a tray icon after minimizing the window.</source> - <translation type="unfinished"/> + <translation>Zobraziť len ikonu na lište po minimalizovaní okna.</translation> </message> <message> <location line="+3"/> @@ -885,12 +884,12 @@ Adresa: %4</translation> <message> <location line="+3"/> <source>M&inimize on close</source> - <translation type="unfinished"/> + <translation>M&inimalizovať pri zavretí</translation> </message> <message> <location line="+21"/> <source>&Display</source> - <translation type="unfinished"/> + <translation>&Displej</translation> </message> <message> <location line="+8"/> @@ -905,7 +904,7 @@ Adresa: %4</translation> <message> <location line="+11"/> <source>&Unit to show amounts in:</source> - <translation type="unfinished"/> + <translation>&Zobrazovať hodnoty v jednotkách:</translation> </message> <message> <location line="+13"/> @@ -920,7 +919,7 @@ Adresa: %4</translation> <message> <location line="+3"/> <source>&Display addresses in transaction list</source> - <translation type="unfinished"/> + <translation>&Zobraziť adresy zo zoznamu transakcií</translation> </message> <message> <location line="+71"/> @@ -943,10 +942,10 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> - <translation type="unfinished"/> + <translation>Varovanie</translation> </message> <message> <location line="-9"/> @@ -991,7 +990,7 @@ Adresa: %4</translation> <message> <location line="-78"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>Peňaženka</translation> </message> <message> <location line="+124"/> @@ -1105,7 +1104,7 @@ Adresa: %4</translation> <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1239,7 +1238,7 @@ Adresa: %4</translation> <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1257,7 +1256,7 @@ Adresa: %4</translation> <message> <location line="+3"/> <source>&Add Recipient</source> - <translation type="unfinished"/> + <translation>&Pridať príjemcu</translation> </message> <message> <location line="+20"/> @@ -1267,7 +1266,7 @@ Adresa: %4</translation> <message> <location line="+3"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>Zmazať &všetko</translation> </message> <message> <location line="+22"/> @@ -1312,7 +1311,7 @@ Adresa: %4</translation> <message> <location line="+23"/> <source>The recipient address is not valid, please recheck.</source> - <translation type="unfinished"/> + <translation>Adresa príjemcu je neplatná, prosím, overte ju.</translation> </message> <message> <location line="+5"/> @@ -1322,27 +1321,27 @@ Adresa: %4</translation> <message> <location line="+5"/> <source>The amount exceeds your balance.</source> - <translation type="unfinished"/> + <translation>Suma je vyššia ako Váš zostatok.</translation> </message> <message> <location line="+5"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation type="unfinished"/> + <translation>Suma celkom prevyšuje Váš zostatok ak sú započítané %1 transakčné poplatky.</translation> </message> <message> <location line="+6"/> <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation type="unfinished"/> + <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 line="+5"/> <source>Error: Transaction creation failed.</source> - <translation type="unfinished"/> + <translation>Chyba: Zlyhalo vytvorenie transakcie.</translation> </message> <message> <location line="+5"/> <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>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> </context> <context> @@ -1430,19 +1429,19 @@ Adresa: %4</translation> <message> <location line="+18"/> <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Zadajte Bitcoin adresu (napr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+10"/> <location line="+203"/> <source>Choose an address from the address book</source> - <translation type="unfinished"/> + <translation>Zvoľte adresu z adresára</translation> </message> <message> <location line="-193"/> <location line="+203"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location line="-193"/> @@ -1452,7 +1451,7 @@ Adresa: %4</translation> <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location line="+12"/> @@ -1467,7 +1466,7 @@ Adresa: %4</translation> <message> <location line="+21"/> <source>Sign the message to prove you own this Bitcoin address</source> - <translation type="unfinished"/> + <translation>Podpíšte správu aby ste dokázali že vlastníte túto adresu</translation> </message> <message> <location line="+17"/> @@ -1478,7 +1477,7 @@ Adresa: %4</translation> <location line="+3"/> <location line="+146"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>Zmazať &všetko</translation> </message> <message> <location line="-87"/> @@ -1494,7 +1493,7 @@ Adresa: %4</translation> <message> <location line="+21"/> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Zadajte Bitcoin adresu (napr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+40"/> @@ -1515,7 +1514,7 @@ Adresa: %4</translation> <message> <location line="-2"/> <source>Click "Sign Message" to generate signature</source> - <translation type="unfinished"/> + <translation>Kliknite "Podpísať Správu" na získanie podpisu</translation> </message> <message> <location line="+3"/> @@ -1619,7 +1618,7 @@ Adresa: %4</translation> <message> <location line="+18"/> <source>Status</source> - <translation type="unfinished"/> + <translation>Stav</translation> </message> <message numerus="yes"> <location line="+7"/> @@ -1645,7 +1644,7 @@ Adresa: %4</translation> <location line="+6"/> <location line="+17"/> <source>From</source> - <translation type="unfinished"/> + <translation>od</translation> </message> <message> <location line="+1"/> @@ -1663,7 +1662,7 @@ Adresa: %4</translation> <message> <location line="-2"/> <source>label</source> - <translation type="unfinished"/> + <translation>popis</translation> </message> <message> <location line="+37"/> @@ -1672,7 +1671,7 @@ Adresa: %4</translation> <location line="+17"/> <location line="+30"/> <source>Credit</source> - <translation type="unfinished"/> + <translation>Kredit</translation> </message> <message numerus="yes"> <location line="-102"/> @@ -1682,7 +1681,7 @@ Adresa: %4</translation> <message> <location line="+2"/> <source>not accepted</source> - <translation type="unfinished"/> + <translation>neprijaté</translation> </message> <message> <location line="+44"/> @@ -1690,17 +1689,17 @@ Adresa: %4</translation> <location line="+15"/> <location line="+30"/> <source>Debit</source> - <translation type="unfinished"/> + <translation>Debet</translation> </message> <message> <location line="-39"/> <source>Transaction fee</source> - <translation type="unfinished"/> + <translation>Transakčný poplatok</translation> </message> <message> <location line="+16"/> <source>Net amount</source> - <translation type="unfinished"/> + <translation>Suma netto</translation> </message> <message> <location line="+6"/> @@ -1710,12 +1709,12 @@ Adresa: %4</translation> <message> <location line="+2"/> <source>Comment</source> - <translation type="unfinished"/> + <translation>Komentár</translation> </message> <message> <location line="+2"/> <source>Transaction ID</source> - <translation type="unfinished"/> + <translation>ID transakcie</translation> </message> <message> <location line="+3"/> @@ -1730,7 +1729,7 @@ Adresa: %4</translation> <message> <location line="+8"/> <source>Transaction</source> - <translation type="unfinished"/> + <translation>Transakcie</translation> </message> <message> <location line="+5"/> @@ -1811,7 +1810,7 @@ Adresa: %4</translation> <message> <location line="+3"/> <source>Offline (%1 confirmations)</source> - <translation type="unfinished"/> + <translation>Offline (%1 potvrdení)</translation> </message> <message> <location line="+3"/> @@ -2074,7 +2073,7 @@ Adresa: %4</translation> <translation>Bitcoin verzia</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Použitie:</translation> </message> @@ -2089,12 +2088,12 @@ Adresa: %4</translation> <translation>Zoznam príkazov</translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Dostať pomoc pre príkaz</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Možnosti:</translation> </message> @@ -2109,7 +2108,7 @@ Adresa: %4</translation> <translation>Určiť súbor pid (predvolené: bitcoind.pid)</translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Počítaj bitcoins</translation> </message> @@ -2119,7 +2118,7 @@ Adresa: %4</translation> <translation>Nepočítaj bitcoins</translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Určiť priečinok s dátami</translation> </message> @@ -2134,12 +2133,7 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Určiť aut spojenia (v milisekundách)</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <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> @@ -2149,27 +2143,27 @@ Adresa: %4</translation> <translation>Udržiavať maximálne <n> spojení (predvolené: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -2184,7 +2178,7 @@ Adresa: %4</translation> <translation>Prijímať príkazy z príkazového riadku a JSON-RPC</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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> @@ -2194,7 +2188,7 @@ Adresa: %4</translation> <translation>Použiť testovaciu sieť</translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -2206,7 +2200,7 @@ Adresa: %4</translation> <message> <location line="+5"/> <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>Varovanie: -paytxfee je nastavené veľmi vysoko. Toto sú transakčné poplatky ktoré zaplatíte ak odošlete transakciu.</translation> </message> <message> <location line="+3"/> @@ -2231,7 +2225,7 @@ Adresa: %4</translation> <message> <location line="+6"/> <source>Connect only to the specified node(s)</source> - <translation type="unfinished"/> + <translation>Pripojiť sa len k určenej nóde</translation> </message> <message> <location line="+3"/> @@ -2249,11 +2243,16 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>Invalid -tor address: '%s'</source> + <location line="+6"/> + <source>Importing blocks...</source> <translation type="unfinished"/> </message> <message> + <location line="+4"/> + <source>Invalid -tor address: '%s'</source> + <translation>Neplatná adresa tor: '%s'</translation> + </message> + <message> <location line="+10"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> <translation type="unfinished"/> @@ -2271,7 +2270,7 @@ Adresa: %4</translation> <message> <location line="+2"/> <source>Output extra debugging information. Implies all other -debug* options</source> - <translation type="unfinished"/> + <translation>Produkovať extra ladiace informácie. Implies all other -debug* options</translation> </message> <message> <location line="+1"/> @@ -2286,7 +2285,7 @@ Adresa: %4</translation> <message> <location line="+4"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation type="unfinished"/> + <translation>SSL možnosť: (pozrite Bitcoin Wiki pre návod na nastavenie SSL)</translation> </message> <message> <location line="+1"/> @@ -2319,14 +2318,19 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>Určiť aut spojenia v milisekundách (predvolené: 5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> - <translation type="unfinished"/> + <translation>Skúsiť použiť UPnP pre mapovanie počúvajúceho portu (default: 0)</translation> </message> <message> <location line="+1"/> <source>Use UPnP to map the listening port (default: 1 when listening)</source> - <translation type="unfinished"/> + <translation>Skúsiť použiť UPnP pre mapovanie počúvajúceho portu (default: 1 when listening)</translation> </message> <message> <location line="+1"/> @@ -2341,7 +2345,7 @@ Adresa: %4</translation> <message> <location line="+2"/> <source>Warning: Disk space is low!</source> - <translation type="unfinished"/> + <translation>Varovanie: Málo voľného miesta na disku</translation> </message> <message> <location line="+1"/> @@ -2359,22 +2363,22 @@ Adresa: %4</translation> <translation>Počúvať JSON-RPC spojeniam na <port> (predvolené: 8332)</translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Povoliť JSON-RPC spojenia z určenej IP adresy.</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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 line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> @@ -2389,7 +2393,7 @@ Adresa: %4</translation> <translation>Znovu skenovať reťaz blokov pre chýbajúce transakcie</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2399,7 +2403,7 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation type="unfinished"/> </message> @@ -2419,17 +2423,17 @@ Adresa: %4</translation> <translation>Súkromný kľúč servra (predvolené: server.pem)</translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Táto pomocná správa</translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation type="unfinished"/> </message> @@ -2439,27 +2443,27 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> - <translation type="unfinished"/> + <translation>Pripojenie cez socks proxy</translation> </message> <message> <location line="-13"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation type="unfinished"/> + <translation>Povoliť vyhľadávanie DNS pre pridanie nódy a spojenie</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Načítavanie adries...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>Chyba načítania blkindex.dat</translation> </message> @@ -2474,19 +2478,19 @@ Adresa: %4</translation> <translation>Chyba načítania wallet.dat: Peňaženka vyžaduje novšiu verziu Bitcoin</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <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 line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>Chyba načítania wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> - <translation type="unfinished"/> + <translation>Neplatná adresa proxy: '%s'</translation> </message> <message> <location line="+47"/> @@ -2499,7 +2503,7 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2509,12 +2513,12 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> - <translation type="unfinished"/> + <translation>Neplatná suma pre -paytxfee=<amount>: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"/> </message> @@ -2526,7 +2530,7 @@ Adresa: %4</translation> <message> <location line="-55"/> <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>Veľkosť tejto transakcie prekračuje limit. Stále ju však môžete odoslať za poplatok %1 ktorý bude pripísaný uzlu spracúvajúcemu vašu transakciu. Chcete zaplatiť poplatok?</translation> </message> <message> <location line="+54"/> @@ -2534,19 +2538,19 @@ Adresa: %4</translation> <translation>Chyba: Zlyhalo vytvorenie transakcie</translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Odosielanie...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> - <translation type="unfinished"/> + <translation>Neplatná suma</translation> </message> <message> <location line="-4"/> @@ -2559,9 +2563,9 @@ Adresa: %4</translation> <translation>Načítavanie zoznamu blokov...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> - <translation type="unfinished"/> + <translation>Pridať nódu a pripojiť sa and attempt to keep the connection open</translation> </message> <message> <location line="-18"/> @@ -2576,15 +2580,15 @@ Adresa: %4</translation> <message> <location line="-2"/> <source>Fee per KB to add to transactions you send</source> - <translation type="unfinished"/> + <translation>Poplatok za kB ktorý treba pridať k odoslanej transakcii</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Načítavam peňaženku...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -2599,22 +2603,22 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Dokončené načítavanie</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2628,7 +2632,7 @@ If the file does not exist, create it with owner-readable-only file permissions. <message> <location line="+74"/> <source>Error</source> - <translation type="unfinished"/> + <translation>Chyba</translation> </message> <message> <location line="-30"/> diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/bitcoin_sr.ts index 4dce563632..f2e3e4da4c 100644 --- a/src/qt/locale/bitcoin_sr.ts +++ b/src/qt/locale/bitcoin_sr.ts @@ -13,9 +13,13 @@ <translation><b>Bitcoin</b> верзија</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -49,12 +53,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-11"/> <source>&New Address</source> - <translation type="unfinished"/> + <translation>&Нова адреса</translation> </message> <message> <location line="-46"/> <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> - <translation type="unfinished"/> + <translation>Ово су Ваше Bitcoin адресе за примање уплата. Можете да сваком пошиљаоцу дате другачију адресу да би пратили ко је вршио уплате.</translation> </message> <message> <location line="+60"/> @@ -215,12 +219,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"/> + <translation>Упозорење: Ако се ваш новчаник шифрује а потом изгубите лозинкзу, ви ћете <b>ИЗГУБИТИ СВЕ BITCOIN-Е</b>!</translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> + <translation>Да ли сте сигурни да желите да се новчаник шифује?</translation> </message> <message> <location line="+106"/> @@ -278,28 +282,23 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"/> + <translation>Лозинка за приступ новчанику је успешно промењена.</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation type="unfinished"/> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Синхронизација са мрежом у току...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Општи преглед</translation> </message> @@ -361,12 +360,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+2"/> <source>About &Qt</source> - <translation type="unfinished"/> + <translation>О &Qt-у</translation> </message> <message> <location line="+1"/> <source>Show information about Qt</source> - <translation type="unfinished"/> + <translation>Прегледајте информације о Qt-у</translation> </message> <message> <location line="+2"/> @@ -374,19 +373,19 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>П&оставке...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> - <translation type="unfinished"/> + <translation>&Шифровање новчаника...</translation> </message> <message> <location line="+3"/> <source>&Backup Wallet...</source> - <translation type="unfinished"/> + <translation>&Backup новчаника</translation> </message> <message> <location line="+2"/> <source>&Change Passphrase...</source> - <translation type="unfinished"/> + <translation>Промени &лозинку...</translation> </message> <message numerus="yes"> <location line="+241"/> @@ -396,7 +395,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+6"/> <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> - <translation type="unfinished"/> + <translation>Преузето је %1 од укупно %2 блокова историјата трансакција (%3% done).</translation> </message> <message> <location line="-254"/> @@ -404,9 +403,9 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Извоз...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Пошаљите новац на bitcoin адресу</translation> </message> <message> <location line="+6"/> @@ -426,15 +425,10 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+37"/> <source>Modify configuration options for Bitcoin</source> - <translation type="unfinished"/> + <translation>Изаберите могућности bitcoin-а</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation type="unfinished"/> </message> @@ -464,27 +458,32 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> <location line="+0"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>новчаник</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> + <translation>&О Bitcoin-у</translation> + </message> + <message> + <location line="+9"/> + <source>&Show / Hide</source> <translation type="unfinished"/> </message> <message> - <location line="+44"/> + <location line="+34"/> <source>&File</source> <translation>&Фајл</translation> </message> @@ -619,7 +618,7 @@ Address: %4 <message> <location line="+23"/> <source>Backup Wallet</source> - <translation type="unfinished"/> + <translation>Backup новчаника</translation> </message> <message> <location line="+0"/> @@ -637,7 +636,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -645,7 +644,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -660,7 +659,7 @@ Address: %4 <message> <location line="+11"/> <source>&Label</source> - <translation type="unfinished"/> + <translation>&Етикета</translation> </message> <message> <location line="+10"/> @@ -670,7 +669,7 @@ Address: %4 <message> <location line="+7"/> <source>&Address</source> - <translation type="unfinished"/> + <translation>&Адреса</translation> </message> <message> <location line="+10"/> @@ -721,7 +720,7 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation type="unfinished"/> @@ -729,7 +728,7 @@ Address: %4 <message> <location line="-12"/> <source>version</source> - <translation type="unfinished"/> + <translation>верзија</translation> </message> <message> <location line="+2"/> @@ -767,7 +766,7 @@ Address: %4 <message> <location filename="../forms/optionsdialog.ui" line="+14"/> <source>Options</source> - <translation type="unfinished"/> + <translation>Поставке</translation> </message> <message> <location line="+16"/> @@ -902,7 +901,7 @@ Address: %4 <message> <location line="+11"/> <source>&Unit to show amounts in:</source> - <translation type="unfinished"/> + <translation>&Јединица за приказивање износа:</translation> </message> <message> <location line="+13"/> @@ -940,7 +939,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation type="unfinished"/> @@ -988,7 +987,7 @@ Address: %4 <message> <location line="-78"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>новчаник</translation> </message> <message> <location line="+124"/> @@ -1047,7 +1046,7 @@ Address: %4 <message> <location line="-44"/> <source>Label:</source> - <translation type="unfinished"/> + <translation>&Етикета</translation> </message> <message> <location line="+19"/> @@ -1102,7 +1101,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1236,7 +1235,7 @@ Address: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1244,7 +1243,7 @@ Address: %4 <location line="+5"/> <location line="+5"/> <source>Send Coins</source> - <translation type="unfinished"/> + <translation>Слање новца</translation> </message> <message> <location line="+50"/> @@ -1368,7 +1367,7 @@ Address: %4 <message> <location line="+9"/> <source>&Label:</source> - <translation type="unfinished"/> + <translation>&Етикета</translation> </message> <message> <location line="+18"/> @@ -1660,7 +1659,7 @@ Address: %4 <message> <location line="-2"/> <source>label</source> - <translation type="unfinished"/> + <translation>етикета</translation> </message> <message> <location line="+37"/> @@ -2068,10 +2067,10 @@ Address: %4 <message> <location filename="../bitcoinstrings.cpp" line="+65"/> <source>Bitcoin version</source> - <translation type="unfinished"/> + <translation>Bitcoin верзија</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation type="unfinished"/> </message> @@ -2086,14 +2085,14 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation type="unfinished"/> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> - <translation type="unfinished"/> + <translation>Поставке</translation> </message> <message> <location line="+23"/> @@ -2106,7 +2105,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation type="unfinished"/> </message> @@ -2116,7 +2115,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation type="unfinished"/> </message> @@ -2131,12 +2130,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> @@ -2146,27 +2140,27 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> @@ -2181,7 +2175,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> @@ -2191,7 +2185,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -2246,7 +2240,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation type="unfinished"/> </message> @@ -2316,7 +2315,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"/> </message> @@ -2356,22 +2360,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> @@ -2386,7 +2390,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2396,7 +2400,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation type="unfinished"/> </message> @@ -2416,17 +2420,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-109"/> + <location line="-110"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"/> </message> <message> - <location line="+121"/> + <location line="+122"/> <source>This help message</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-119"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation type="unfinished"/> </message> @@ -2436,12 +2440,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"/> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation type="unfinished"/> </message> @@ -2451,12 +2455,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation type="unfinished"/> </message> @@ -2471,17 +2475,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> @@ -2496,7 +2500,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2506,12 +2510,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"/> </message> @@ -2531,17 +2535,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Слање у току...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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"/> </message> <message> - <location line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation type="unfinished"/> </message> @@ -2556,7 +2560,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> @@ -2576,12 +2580,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Новчаник се учитава...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -2596,22 +2600,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts index bbcabb1aa6..891777c2d4 100644 --- a/src/qt/locale/bitcoin_sv.ts +++ b/src/qt/locale/bitcoin_sv.ts @@ -13,18 +13,22 @@ <translation><b>Bitcoin</b>-version</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation>Copyright © 2009-2012 Bitcoin-utvecklarna</translation> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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-utvecklarna - + <translation> Detta är experimentell mjukvara. + Distribuerad under mjukvarulicensen MIT/X11, se den medföljande filen COPYING eller http://www.opensource.org/licenses/mit-license.php. Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användning i OpenSSL Toolkit (http://www.openssl.org/) och kryptografisk mjukvara utvecklad av Eric Young (eay@cryptsoft.com) samt UPnP-mjukvara skriven av Thomas Bernard.</translation> @@ -290,22 +294,17 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation>Signera &meddelande...</translation> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>Visa/Göm &Bitcoin</translation> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Synkroniserar med nätverk...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Översikt</translation> </message> @@ -380,7 +379,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation>&Alternativ...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation>&Kryptera plånbok...</translation> </message> @@ -410,7 +409,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation>&Exportera...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation>Skicka mynt till en Bitcoin-adress</translation> </message> @@ -435,12 +434,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation>Ändra konfigurationsalternativ för Bitcoin</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>Visa eller göm Bitcoin-fönstret</translation> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation>Exportera informationen i den nuvarande fliken till en fil</translation> </message> @@ -470,12 +464,12 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation>Öppna debug- och diagnostikkonsolen</translation> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation>&Verifiera meddelande...</translation> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -485,12 +479,17 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni <translation>Plånbok</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> <translation>&Om Bitcoin</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>&Visa / Göm</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>&Arkiv</translation> </message> @@ -647,7 +646,7 @@ Adress: %4 <translation>Det inträffade ett fel när plånboken skulle sparas till den nya platsen.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <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> @@ -655,7 +654,7 @@ Adress: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation>Nätverkslarm</translation> </message> @@ -731,7 +730,7 @@ Adress: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation>Bitcoin-Qt</translation> @@ -950,7 +949,7 @@ Adress: %4 <translation>standard</translation> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation>Varning</translation> @@ -1112,7 +1111,7 @@ Adress: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation>ej tillgänglig</translation> </message> @@ -1246,7 +1245,7 @@ Adress: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -2081,7 +2080,7 @@ Adress: %4 <translation>Bitcoin version</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Användning:</translation> </message> @@ -2096,12 +2095,12 @@ Adress: %4 <translation>Lista kommandon</translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Få hjälp med ett kommando</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Inställningar:</translation> </message> @@ -2116,7 +2115,7 @@ Adress: %4 <translation>Ange pid fil (standard: bitcoind.pid)</translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Generera mynt</translation> </message> @@ -2126,7 +2125,7 @@ Adress: %4 <translation>Generera inte mynt</translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Ange katalog för data</translation> </message> @@ -2141,12 +2140,7 @@ Adress: %4 <translation>Sätt databasens loggfil storlek i megabyte (standard: 100)</translation> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Ange timeout för uppkoppling (i millisekunder)</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <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> @@ -2156,27 +2150,27 @@ Adress: %4 <translation>Ha som mest <n> anslutningar till andra klienter (förval: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Anslut till en nod för att hämta klientadresser, och koppla från</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation>Ange din egen publika adress</translation> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation>Bind till given adress. Använd [värd]:port notation för IPv6</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <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 line="-104"/> + <location line="-105"/> <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> @@ -2191,7 +2185,7 @@ Adress: %4 <translation>Tillåt kommandon från kommandotolken och JSON-RPC-kommandon</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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> @@ -2201,7 +2195,7 @@ Adress: %4 <translation>Använd testnätverket</translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Acceptera anslutningar utifrån (standard: 1 om ingen -proxy eller -connect)</translation> </message> @@ -2256,7 +2250,12 @@ Adress: %4 <translation>Söl efter klienter med DNS sökningen (standard: 1 om inte -connect)</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation>Importerar block...</translation> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation>Ogiltig -tor adress: '%s'</translation> </message> @@ -2326,7 +2325,12 @@ Adress: %4 <translation>Krymp debug.log filen vid klient start (standard: 1 vid ingen -debug)</translation> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>Ange timeout för uppkoppling i millisekunder (standard: 5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Använd UPnP för att mappa den lyssnande porten (standard: 0)</translation> </message> @@ -2366,22 +2370,22 @@ Adress: %4 <translation>Lyssna på JSON-RPC-anslutningar på <port> (förval: 8332)</translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <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 line="+60"/> + <location line="+61"/> <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 line="-89"/> + <location 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 line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>Uppgradera plånboken till senaste formatet</translation> </message> @@ -2396,7 +2400,7 @@ Adress: %4 <translation>Sök i block-kedjan efter saknade wallet transaktioner</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <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> @@ -2406,7 +2410,7 @@ Adress: %4 <translation>Hur grundlig blockverifikationen är (0-6, standardvärde: 1)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation>Inporterar block från extern blk000?.dat fil</translation> </message> @@ -2426,17 +2430,17 @@ Adress: %4 <translation>Serverns privata nyckel (förval: server.pem)</translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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> <message> - <location line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Det här hjälp medelandet</translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <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> @@ -2446,12 +2450,12 @@ Adress: %4 <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Det går inte att binda till %s på den här datorn (bind returnerade felmeddelande %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation>Anslut genom socks-proxy</translation> </message> @@ -2461,12 +2465,12 @@ Adress: %4 <translation>Tillåt DNS-sökningar för -addnode, -seednode och -connect</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Laddar adresser...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>Fel vid inläsning av blkindex.dat</translation> </message> @@ -2481,17 +2485,17 @@ Adress: %4 <translation>Fel vid inläsningen av wallet.dat: Plånboken kräver en senare version av Bitcoin</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <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 line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>Fel vid inläsning av plånboksfilen wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation>Ogiltig -proxy adress: '%s'</translation> </message> @@ -2506,7 +2510,7 @@ Adress: %4 <translation>Okänd -socks proxy version begärd: %i</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Kan inte matcha -bind adress: '%s'</translation> </message> @@ -2516,12 +2520,12 @@ Adress: %4 <translation>Kan inte matcha -externalip adress: '%s'</translation> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Ogiltigt belopp för -paytxfee=<belopp>:'%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation>Fel: kunde inte starta nod</translation> </message> @@ -2541,17 +2545,17 @@ Adress: %4 <translation>Fel: Transaktionen gick inte att skapa </translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Skickar...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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>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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation>Ogiltig mängd</translation> </message> @@ -2566,7 +2570,7 @@ Adress: %4 <translation>Laddar blockindex...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <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> @@ -2586,12 +2590,12 @@ Adress: %4 <translation>Avgift per KB att lägga till på transaktioner du skickar</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Laddar plånbok...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation>Kan inte nedgradera plånboken</translation> </message> @@ -2606,22 +2610,22 @@ Adress: %4 <translation>Kan inte skriva standardadress</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Söker igen...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Klar med laddning</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation>Att använda %s alternativet</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts index a32b999c3b..de9d4ea9ad 100644 --- a/src/qt/locale/bitcoin_tr.ts +++ b/src/qt/locale/bitcoin_tr.ts @@ -13,21 +13,24 @@ <translation><b>Bitcoin</b> sürüm</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation>Telif hakkı © 2009-2012 Bitcoin geliştiricileri</translation> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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>Telif hakkı © 2009-2012 Bitcoin geliştiricileri + <translation> + Bu yazılım deneme safhasındadır. -Bu yazılım deneme safhasındadır. + MIT/X11 yazılım lisansı kapsamında yayınlanmıştır, COPYING dosyasına ya da http://www.opensource.org/licenses/mit-license.php sayfasına bakınız. -MIT/X11 yazılım lisansı kapsamında yayınlanmıştır, COPYING dosyasına ya da http://www.opensource.org/licenses/mit-license.php sayfasına bakınız. - -Bu ürün OpenSSL projesi tarafından OpenSSL araç takımı (http://www.openssl.org/) için geliştirilen yazılımlar, Eric Young (eay@cryptsoft.com) tarafından hazırlanmış şifreleme yazılımları ve Thomas Bernard tarafından programlanmış UPnP yazılımı içerir.</translation> + Bu ürün OpenSSL projesi tarafından OpenSSL araç takımı (http://www.openssl.org/) için geliştirilen yazılımlar, Eric Young (eay@cryptsoft.com) tarafından hazırlanmış şifreleme yazılımları ve Thomas Bernard tarafından programlanmış UPnP yazılımı içerir.</translation> </message> </context> <context> @@ -290,22 +293,17 @@ Bu ürün OpenSSL projesi tarafından OpenSSL araç takımı (http://www.openssl <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation>&Mesaj imzala...</translation> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>&Bitcoin'i Göster/Sakla</translation> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Şebeke ile senkronizasyon...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Genel bakış</translation> </message> @@ -380,7 +378,7 @@ Bu ürün OpenSSL projesi tarafından OpenSSL araç takımı (http://www.openssl <translation>&Seçenekler...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation>Cüzdanı &şifrele...</translation> </message> @@ -410,7 +408,7 @@ Bu ürün OpenSSL projesi tarafından OpenSSL araç takımı (http://www.openssl <translation>&Dışa aktar...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation>Bir Bitcoin adresine Bitcoin yolla</translation> </message> @@ -435,12 +433,7 @@ Bu ürün OpenSSL projesi tarafından OpenSSL araç takımı (http://www.openssl <translation>Bitcoin seçeneklerinin yapılandırmasını değiştir</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>Bitcoin penceresini göster ya da sakla</translation> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation>Güncel sekmedeki verileri bir dosyaya aktar</translation> </message> @@ -470,12 +463,12 @@ Bu ürün OpenSSL projesi tarafından OpenSSL araç takımı (http://www.openssl <translation>Hata ayıklama ve teşhis penceresini aç</translation> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> - <translation>&Mesaj kontrol et...</translation> + <translation>Mesaj &kontrol et...</translation> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -485,12 +478,17 @@ Bu ürün OpenSSL projesi tarafından OpenSSL araç takımı (http://www.openssl <translation>Cüzdan</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> - <translation>Bitcoin _Hakında</translation> + <translation>Bitcoin &Hakkında</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>&Göster / Sakla</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>&Dosya</translation> </message> @@ -647,7 +645,7 @@ Adres: %4 <translation>Cüzdan verilerinin başka bir konumda kaydedilmesi sırasında bir hata meydana geldi.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <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> @@ -655,7 +653,7 @@ Adres: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation>Şebeke hakkında uyarı</translation> </message> @@ -731,7 +729,7 @@ Adres: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation>Bitcoin-Qt</translation> @@ -950,7 +948,7 @@ Adres: %4 <translation>varsayılan</translation> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation>Uyarı</translation> @@ -1112,7 +1110,7 @@ Adres: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation>Mevcut değil</translation> </message> @@ -1246,7 +1244,7 @@ Adres: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1349,7 +1347,7 @@ Adres: %4 <message> <location line="+5"/> <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> + <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> </context> <context> @@ -2081,7 +2079,7 @@ Adres: %4 <translation>Bitcoin sürümü</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Kullanım:</translation> </message> @@ -2096,12 +2094,12 @@ Adres: %4 <translation>Komutları listele</translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Bir komut için yardım al</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Seçenekler:</translation> </message> @@ -2116,7 +2114,7 @@ Adres: %4 <translation>Pid dosyası belirt (varsayılan: bitcoind.pid)</translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Madenî para (Bitcoin) oluştur</translation> </message> @@ -2126,7 +2124,7 @@ Adres: %4 <translation>Bitcoin oluşturmasını devre dışı bırak</translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Veri dizinini belirt</translation> </message> @@ -2141,12 +2139,7 @@ Adres: %4 <translation>Diskteki veritabanı kütüğü boyutunu megabayt olarak belirt (varsayılan: 100)</translation> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Bağlantı zaman aşım süresini milisaniye olarak belirt</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <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> @@ -2156,27 +2149,27 @@ Adres: %4 <translation>Eşler ile en çok <n> adet bağlantı kur (varsayılan: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Eş adresleri elde etmek için bir düğüme bağlan ve ardından bağlantıyı kes</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation>Kendi genel adresinizi tanımlayın</translation> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation>Belirtilen adresle ilişiklendir. IPv6 için [makine]:port simgelemini kullanınız</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <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 line="-104"/> + <location line="-105"/> <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> @@ -2191,7 +2184,7 @@ Adres: %4 <translation>Konut satırı ve JSON-RPC komutlarını kabul et</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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> @@ -2201,7 +2194,7 @@ Adres: %4 <translation>Deneme şebekesini kullan</translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Dışarıdan gelen bağlantıları kabul et (varsayılan: -proxy veya -connect yoksa 1)</translation> </message> @@ -2256,7 +2249,12 @@ Adres: %4 <translation>Eşleri DNS araması vasıtasıyla bul (varsayılan: 1, eğer -connect kullanılmadıysa)</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation>Bloklar içe aktarılıyor...</translation> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation>Geçersiz -tor adresi: '%s'</translation> </message> @@ -2326,7 +2324,12 @@ Adres: %4 <translation>İstemci başlatıldığında debug.log dosyasını küçült (varsayılan: -debug bulunmadığında 1)</translation> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>Bağlantı zaman aşım süresini milisaniye olarak belirt (varsayılan: 5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>Dinlenecek portu haritalamak için UPnP kullan (varsayılan: 0)</translation> </message> @@ -2366,22 +2369,22 @@ Adres: %4 <translation>JSON-RPC bağlantıları için dinlenecek <port> (varsayılan: 8332)</translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <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 line="+60"/> + <location line="+61"/> <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 line="-89"/> + <location 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 line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>Cüzdanı en yeni biçime güncelle</translation> </message> @@ -2396,7 +2399,7 @@ Adres: %4 <translation>Blok zincirini eksik cüzdan muameleleri için tekrar tara</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <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> @@ -2406,7 +2409,7 @@ Adres: %4 <translation>Blok kontrolünün derinliği (0 ilâ 6, varsayılan: 1)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation>Harici blk000?.dat dosyasından blokları içe aktarır</translation> </message> @@ -2426,17 +2429,17 @@ Adres: %4 <translation>Sunucu özel anahtarı (varsayılan: server.pem)</translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Bu yardım mesajı</translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <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> @@ -2446,12 +2449,12 @@ Adres: %4 <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>Bu bilgisayarda %s unsuruna bağlanılamadı. (bind şu hatayı iletti: %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation>Socks vekil sunucusu vasıtasıyla bağlan</translation> </message> @@ -2461,12 +2464,12 @@ Adres: %4 <translation>-addnode, -seednode ve -connect için DNS aramalarına izin ver</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Adresler yükleniyor...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>blkindex.dat dosyasının yüklenmesinde hata oluştu</translation> </message> @@ -2481,17 +2484,17 @@ Adres: %4 <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 line="+71"/> + <location line="+72"/> <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 line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>wallet.dat dosyasının yüklenmesinde hata oluştu</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation>Geçersiz -proxy adresi: '%s'</translation> </message> @@ -2506,7 +2509,7 @@ Adres: %4 <translation>Bilinmeyen bir -socks vekil sürümü talep edildi: %i</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation>-bind adresi çözümlenemedi: '%s'</translation> </message> @@ -2516,12 +2519,12 @@ Adres: %4 <translation>-externalip adresi çözümlenemedi: '%s'</translation> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>-paytxfee=<miktar> için geçersiz miktar: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation>Hata: düğüm başlatılamadı</translation> </message> @@ -2541,17 +2544,17 @@ Adres: %4 <translation>Hata: Muamele oluşturması başarısız oldu </translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Gönderiliyor...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation>Geçersiz miktar</translation> </message> @@ -2566,7 +2569,7 @@ Adres: %4 <translation>Blok indeksi yükleniyor...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <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> @@ -2586,12 +2589,12 @@ Adres: %4 <translation>Yolladığınız muameleler için eklenecek KB başı ücret</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Cüzdan yükleniyor...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation>Cüzdan eski biçime geri alınamaz</translation> </message> @@ -2606,22 +2609,22 @@ Adres: %4 <translation>Varsayılan adres yazılamadı</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Yeniden tarama...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Yükleme tamamlandı</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation>%s seçeneğini kullanmak için</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts index ef3ef12ea9..4c03feb605 100644 --- a/src/qt/locale/bitcoin_uk.ts +++ b/src/qt/locale/bitcoin_uk.ts @@ -13,15 +13,24 @@ <translation>Версія <b>Bitcoin'a<b></translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation>Авторське право © 2009-2012 Розробники Bitcoin</translation> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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 type="unfinished"/> + <translation> +Це програмне забезпечення є експериментальним. + +Поширюється за ліцензією MIT/X11, додаткова інформація міститься у файлі COPYING, а також за адресою http://www.opensource.org/licenses/mit-license.php. + +Цей продукт включає в себе програмне забезпечення, розроблене в рамках проекту OpenSSL (http://www.openssl.org/), криптографічне програмне забезпечення, написане Еріком Янгом (eay@cryptsoft.com), та функції для роботи з UPnP, написані Томасом Бернардом.</translation> </message> </context> <context> @@ -49,17 +58,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-11"/> <source>&New Address</source> - <translation type="unfinished"/> + <translation>&Створити адресу</translation> </message> <message> <location line="-46"/> <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> - <translation type="unfinished"/> + <translation>Це ваші адреси для отримання платежів. Ви можете давати різні адреси різним людям, таким чином маючи можливість відслідкувати хто конкретно і скільки вам заплатив. </translation> </message> <message> <location line="+60"/> <source>&Copy Address</source> - <translation type="unfinished"/> + <translation>&Скопіювати адресу</translation> </message> <message> <location line="+11"/> @@ -69,7 +78,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+11"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Підпишіть повідомлення щоб довести, що ви є власником цієї адреси</translation> </message> <message> <location line="+3"/> @@ -99,12 +108,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location filename="../addressbookpage.cpp" line="+65"/> <source>Copy &Label</source> - <translation type="unfinished"/> + <translation>Скопіювати &мітку</translation> </message> <message> <location line="+2"/> <source>&Edit</source> - <translation type="unfinished"/> + <translation>&Редагувати</translation> </message> <message> <location line="+250"/> @@ -215,18 +224,18 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"/> + <translation>УВАГА: Якщо ви зашифруєте гаманець і забудете пароль, ви <b>ВТРАТИТЕ ВСІ СВОЇ БІТКОІНИ</b>!</translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> + <translation>Ви дійсно хочете зашифрувати свій гаманець?</translation> </message> <message> <location line="+106"/> <location line="+24"/> <source>Warning: The Caps Lock key is on!</source> - <translation type="unfinished"/> + <translation>Увага: Ввімкнено Caps Lock</translation> </message> <message> <location line="-121"/> @@ -278,28 +287,23 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"/> + <translation>Пароль було успішно змінено.</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation type="unfinished"/> + <translation>&Підписати повідомлення...</translation> </message> <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>Синхронізація з мережею...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&Огляд</translation> </message> @@ -374,19 +378,19 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Параметри...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> - <translation type="unfinished"/> + <translation>&Шифрування гаманця...</translation> </message> <message> <location line="+3"/> <source>&Backup Wallet...</source> - <translation type="unfinished"/> + <translation>&Резервне копіювання гаманця...</translation> </message> <message> <location line="+2"/> <source>&Change Passphrase...</source> - <translation type="unfinished"/> + <translation>Змінити парол&ь...</translation> </message> <message numerus="yes"> <location line="+241"/> @@ -396,7 +400,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+6"/> <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> - <translation type="unfinished"/> + <translation>Завантажено %1 з %2 блоків історії переказів (%3% done).</translation> </message> <message> <location line="-254"/> @@ -404,14 +408,14 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Експорт...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Відправити монети на вказану адресу</translation> </message> <message> <location line="+6"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"/> + <translation>Підпишіть повідомлення щоб довести, що ви є власником цієї адреси</translation> </message> <message> <location line="+4"/> @@ -426,15 +430,10 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+37"/> <source>Modify configuration options for Bitcoin</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation type="unfinished"/> + <translation>Редагувати параметри</translation> </message> <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation>Експортувати дані з поточної вкладки в файл</translation> </message> @@ -464,27 +463,32 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation type="unfinished"/> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> <location line="+0"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>Гаманець</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> + <translation>&Про Bitcoin</translation> + </message> + <message> + <location line="+9"/> + <source>&Show / Hide</source> <translation type="unfinished"/> </message> <message> - <location line="+44"/> + <location line="+34"/> <source>&File</source> <translation>&Файл</translation> </message> @@ -641,7 +645,7 @@ Address: %4 <translation>Виникла помилка при спробі зберегти гаманець в новому місці</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -649,7 +653,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -709,7 +713,7 @@ Address: %4 <message> <location line="+5"/> <source>The entered address "%1" is not a valid Bitcoin address.</source> - <translation type="unfinished"/> + <translation>Введена адреса «%1» не є коректною адресою в мережі Bitcoin.</translation> </message> <message> <location line="+5"/> @@ -725,7 +729,7 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation type="unfinished"/> @@ -777,7 +781,7 @@ Address: %4 <message> <location line="+16"/> <source>&Main</source> - <translation type="unfinished"/> + <translation>&Головні</translation> </message> <message> <location line="+6"/> @@ -792,12 +796,12 @@ Address: %4 <message> <location line="+31"/> <source>Automatically start Bitcoin after logging in to the system.</source> - <translation type="unfinished"/> + <translation>Автоматично запускати гаманець при вмиканні комп’ютера</translation> </message> <message> <location line="+3"/> <source>&Start Bitcoin on system login</source> - <translation type="unfinished"/> + <translation>&Запускати гаманець при вході в систему</translation> </message> <message> <location line="+7"/> @@ -827,17 +831,17 @@ Address: %4 <message> <location line="+7"/> <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source> - <translation type="unfinished"/> + <translation>Підключатись до мережі Bitcoin через SOCKS-проксі (наприклад при використанні Tor)</translation> </message> <message> <location line="+3"/> <source>&Connect through SOCKS proxy:</source> - <translation type="unfinished"/> + <translation>Підключатись через &SOCKS-проксі:</translation> </message> <message> <location line="+9"/> <source>Proxy &IP:</source> - <translation type="unfinished"/> + <translation>&IP проксі:</translation> </message> <message> <location line="+19"/> @@ -847,12 +851,12 @@ Address: %4 <message> <location line="+7"/> <source>&Port:</source> - <translation type="unfinished"/> + <translation>&Порт:</translation> </message> <message> <location line="+19"/> <source>Port of the proxy (e.g. 9050)</source> - <translation type="unfinished"/> + <translation>Порт проксі-сервера (наприклад 9050)</translation> </message> <message> <location line="+7"/> @@ -872,7 +876,7 @@ Address: %4 <message> <location line="+6"/> <source>Show only a tray icon after minimizing the window.</source> - <translation type="unfinished"/> + <translation>Показувати лише іконку в треї після згортання вікна</translation> </message> <message> <location line="+3"/> @@ -887,12 +891,12 @@ Address: %4 <message> <location line="+3"/> <source>M&inimize on close</source> - <translation type="unfinished"/> + <translation>Згортати замість закритт&я</translation> </message> <message> <location line="+21"/> <source>&Display</source> - <translation type="unfinished"/> + <translation>&Відображення</translation> </message> <message> <location line="+8"/> @@ -907,12 +911,12 @@ Address: %4 <message> <location line="+11"/> <source>&Unit to show amounts in:</source> - <translation type="unfinished"/> + <translation>В&имірювати монети в:</translation> </message> <message> <location line="+13"/> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation type="unfinished"/> + <translation>Виберіть одиницю вимірювання монет, яка буде відображатись в гаманці та при відправленні.</translation> </message> <message> <location line="+9"/> @@ -922,7 +926,7 @@ Address: %4 <message> <location line="+3"/> <source>&Display addresses in transaction list</source> - <translation type="unfinished"/> + <translation>&Відображати адресу в списку переказів</translation> </message> <message> <location line="+71"/> @@ -945,10 +949,10 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> - <translation type="unfinished"/> + <translation>Увага</translation> </message> <message> <location line="-9"/> @@ -993,7 +997,7 @@ Address: %4 <message> <location line="-78"/> <source>Wallet</source> - <translation type="unfinished"/> + <translation>Гаманець</translation> </message> <message> <location line="+124"/> @@ -1107,7 +1111,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1241,7 +1245,7 @@ Address: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1259,7 +1263,7 @@ Address: %4 <message> <location line="+3"/> <source>&Add Recipient</source> - <translation type="unfinished"/> + <translation>Дод&ати одержувача</translation> </message> <message> <location line="+20"/> @@ -1269,7 +1273,7 @@ Address: %4 <message> <location line="+3"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>Очистити &все</translation> </message> <message> <location line="+22"/> @@ -1314,7 +1318,7 @@ Address: %4 <message> <location line="+23"/> <source>The recipient address is not valid, please recheck.</source> - <translation type="unfinished"/> + <translation>Адреса отримувача невірна, будьласка перепровірте.</translation> </message> <message> <location line="+5"/> @@ -1324,27 +1328,27 @@ Address: %4 <message> <location line="+5"/> <source>The amount exceeds your balance.</source> - <translation type="unfinished"/> + <translation>Кількість монет для відправлення перевищує ваш баланс.</translation> </message> <message> <location line="+5"/> <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation type="unfinished"/> + <translation>Сума перевищить ваш баланс, якщо комісія %1 буде додана до вашого переказу.</translation> </message> <message> <location line="+6"/> <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation type="unfinished"/> + <translation>Знайдено адресу що дублюється. Відправлення на кожну адресу дозволяється лише один раз на кожну операцію переказу.</translation> </message> <message> <location line="+5"/> <source>Error: Transaction creation failed.</source> - <translation type="unfinished"/> + <translation>Помилка: не вдалося створити переказ.</translation> </message> <message> <location line="+5"/> <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>Помилка: переказ було відхилено. Це може статись, якщо декілька монет з вашого гаманця вже використані, наприклад, якщо ви використовуєте одну копію гаманця (wallet.dat), а монети були використані з іншої копії, але не позначені як використані в цій.</translation> </message> </context> <context> @@ -1432,19 +1436,19 @@ Address: %4 <message> <location line="+18"/> <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Введіть адресу Bitcoin (наприклад 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+10"/> <location line="+203"/> <source>Choose an address from the address book</source> - <translation type="unfinished"/> + <translation>Вибрати адресу з адресної книги</translation> </message> <message> <location line="-193"/> <location line="+203"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location line="-193"/> @@ -1454,7 +1458,7 @@ Address: %4 <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location line="+12"/> @@ -1469,7 +1473,7 @@ Address: %4 <message> <location line="+21"/> <source>Sign the message to prove you own this Bitcoin address</source> - <translation type="unfinished"/> + <translation>Підпишіть повідомлення щоб довести, що ви є власником цієї адреси</translation> </message> <message> <location line="+17"/> @@ -1480,7 +1484,7 @@ Address: %4 <location line="+3"/> <location line="+146"/> <source>Clear &All</source> - <translation type="unfinished"/> + <translation>Очистити &все</translation> </message> <message> <location line="-87"/> @@ -1496,7 +1500,7 @@ Address: %4 <message> <location line="+21"/> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>Введіть адресу Bitcoin (наприклад 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+40"/> @@ -1517,7 +1521,7 @@ Address: %4 <message> <location line="-2"/> <source>Click "Sign Message" to generate signature</source> - <translation type="unfinished"/> + <translation>Натисніть кнопку "Підписати повідомлення", для отриманя підпису</translation> </message> <message> <location line="+3"/> @@ -1606,7 +1610,7 @@ Address: %4 <message> <location line="+8"/> <source>%1/offline</source> - <translation type="unfinished"/> + <translation>%1/поза інтернетом</translation> </message> <message> <location line="+2"/> @@ -1647,7 +1651,7 @@ Address: %4 <location line="+6"/> <location line="+17"/> <source>From</source> - <translation type="unfinished"/> + <translation>Відправник</translation> </message> <message> <location line="+1"/> @@ -1665,7 +1669,7 @@ Address: %4 <message> <location line="-2"/> <source>label</source> - <translation type="unfinished"/> + <translation>Мітка</translation> </message> <message> <location line="+37"/> @@ -1684,7 +1688,7 @@ Address: %4 <message> <location line="+2"/> <source>not accepted</source> - <translation type="unfinished"/> + <translation>не прийнято</translation> </message> <message> <location line="+44"/> @@ -1697,12 +1701,12 @@ Address: %4 <message> <location line="-39"/> <source>Transaction fee</source> - <translation type="unfinished"/> + <translation>Комісія за переказ</translation> </message> <message> <location line="+16"/> <source>Net amount</source> - <translation type="unfinished"/> + <translation>Загальна сума</translation> </message> <message> <location line="+6"/> @@ -1712,17 +1716,17 @@ Address: %4 <message> <location line="+2"/> <source>Comment</source> - <translation type="unfinished"/> + <translation>Коментар</translation> </message> <message> <location line="+2"/> <source>Transaction ID</source> - <translation type="unfinished"/> + <translation>ID транзакції</translation> </message> <message> <location line="+3"/> <source>Generated coins must mature 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, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> + <translation>Після генерації монет, потрібно зачекати 120 блоків, перш ніж їх можна буде використати. Коли ви згенерували цей блок, його було відправлено в мережу для того, щоб він був доданий до ланцюжка блоків. Якщо ця процедура не вдасться, статус буде змінено на «не підтверджено» і ви не зможете потратити згенеровані монету. Таке може статись, якщо хтось інший згенерував блок на декілька секунд раніше.</translation> </message> <message> <location line="+7"/> @@ -2076,7 +2080,7 @@ Address: %4 <translation>Версія</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>Вкористання:</translation> </message> @@ -2093,13 +2097,13 @@ Address: %4 </translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>Отримати довідку по команді </translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>Параметри: </translation> @@ -2117,7 +2121,7 @@ Address: %4 </translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>Генерувати монети </translation> @@ -2129,7 +2133,7 @@ Address: %4 </translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>Вкажіть робочий каталог </translation> @@ -2145,13 +2149,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>Вкажіть таймаут з’єднання (в мілісекундах) -</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Чекати на з'єднання на порту (по замовченню 8333 або тестова мережа 18333)</translation> </message> @@ -2161,27 +2159,27 @@ Address: %4 <translation>Підтримувати не більше <n> зв'язків з колегами (за замовчуванням: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"/> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Поріг відключення неправильно підєднаних пірів (за замовчуванням: 100)</translation> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Максимальній розмір вхідного буферу на одне з'єднання (за замовчуванням 86400)</translation> </message> @@ -2197,7 +2195,7 @@ Address: %4 </translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation>Запустити в фоновому режимі (як демон) та приймати команди </translation> @@ -2209,7 +2207,7 @@ Address: %4 </translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> @@ -2221,7 +2219,7 @@ Address: %4 <message> <location line="+5"/> <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>Увага: встановлено занадто велику комісію (-paytxfee). Комісія зніматиметься кожен раз коли ви проводитимете перекази.</translation> </message> <message> <location line="+3"/> @@ -2231,7 +2229,7 @@ Address: %4 <message> <location line="+3"/> <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>Увага: будь ласка, перевірте дату і час на свому комп’ютері. Якщо ваш годинник йде неправильно, Bitcoin може працювати некоректно.</translation> </message> <message> <location line="+13"/> @@ -2246,7 +2244,7 @@ Address: %4 <message> <location line="+6"/> <source>Connect only to the specified node(s)</source> - <translation type="unfinished"/> + <translation>Підключитись лише до вказаного вузла</translation> </message> <message> <location line="+3"/> @@ -2264,19 +2262,24 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation type="unfinished"/> </message> <message> <location line="+10"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> - <translation type="unfinished"/> + <translation>Максимальоий буфер , <n> * 1000 байт (за умовчанням: 5000)</translation> </message> <message> <location line="+1"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</source> - <translation type="unfinished"/> + <translation>Максимальній розмір виіхідного буферу на одне з'єднання (за замовчуванням 1000)</translation> </message> <message> <location line="+1"/> @@ -2286,7 +2289,7 @@ Address: %4 <message> <location line="+2"/> <source>Output extra debugging information. Implies all other -debug* options</source> - <translation type="unfinished"/> + <translation>Виводити більше налагоджувальної інформації. Implies all other -debug* options</translation> </message> <message> <location line="+1"/> @@ -2301,7 +2304,7 @@ Address: %4 <message> <location line="+4"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation type="unfinished"/> + <translation>Параметри SSL: (див. Bitcoin Wiki)</translation> </message> <message> <location line="+1"/> @@ -2334,14 +2337,19 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>Odredi vremenski prozor za spajanje na mrežu u milisekundama (ugrađeni izbor: 5000)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> - <translation type="unfinished"/> + <translation>Намагатись використовувати UPnP для відображення порту що прослуховується на роутері (default: 0)</translation> </message> <message> <location line="+1"/> <source>Use UPnP to map the listening port (default: 1 when listening)</source> - <translation type="unfinished"/> + <translation>Намагатись використовувати UPnP для відображення порту що прослуховується на роутері (default: 1 when listening)</translation> </message> <message> <location line="+1"/> @@ -2357,7 +2365,7 @@ Address: %4 <message> <location line="+2"/> <source>Warning: Disk space is low!</source> - <translation type="unfinished"/> + <translation>Увага: На диску мало вільного місця</translation> </message> <message> <location line="+1"/> @@ -2377,24 +2385,24 @@ Address: %4 </translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Дозволити JSON-RPC-з’єднання з вказаної IP-адреси </translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Відправляти команди на вузол, запущений на <ip> (за промовчуванням: 127.0.0.1) </translation> </message> <message> - <location line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> @@ -2411,7 +2419,7 @@ Address: %4 </translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation type="unfinished"/> </message> @@ -2421,7 +2429,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation type="unfinished"/> </message> @@ -2444,19 +2452,19 @@ Address: %4 </translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>Дана довідка </translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation>Неможливо встановити блокування на робочий каталог %s. Можливо, гаманець вже запущено.</translation> </message> @@ -2466,27 +2474,28 @@ Address: %4 <translation>Bitcoin</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> - <translation type="unfinished"/> + <translation>Неможливо прив’язати до порту %s на цьому комп’ютері (bind returned error %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> - <translation type="unfinished"/> + <translation>Підключитись через SOCKS-проксі</translation> </message> <message> <location line="-13"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation type="unfinished"/> + <translation>Дозволити пошук в DNS для команд «addnode» і «connect» +</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>Завантаження адрес...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>Помилка при завантаженні blkindex.dat </translation> </message> @@ -2501,19 +2510,19 @@ Address: %4 <translation>Помилка при завантаженні wallet.dat: Гаманець потребує новішої версії Біткоін-клієнта</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Потрібно перезаписати гаманець: перезапустіть Біткоін-клієнт для завершення</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>Помилка при завантаженні wallet.dat</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> - <translation type="unfinished"/> + <translation>Помилка в адресі проксі-сервера: '%s'</translation> </message> <message> <location line="+47"/> @@ -2526,7 +2535,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -2536,12 +2545,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> - <translation type="unfinished"/> + <translation>Помилка у величині комісії: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation type="unfinished"/> </message> @@ -2553,7 +2562,7 @@ Address: %4 <message> <location line="-55"/> <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>Цей переказ перевищує максимально допустимий розмір. Проте ви можете здійснити її, додавши комісію в %1, яка відправиться тим вузлам що оброблять ваш переказ, та допоможе підтримати мережу. Ви хочете додати комісію?</translation> </message> <message> <location line="+54"/> @@ -2561,17 +2570,17 @@ Address: %4 <translation>Помилка: не вдалося створити переказ </translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>Відправлення...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation type="unfinished"/> </message> @@ -2586,14 +2595,14 @@ Address: %4 <translation>Завантаження індексу блоків...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> - <translation type="unfinished"/> + <translation>Додати вузол для підключення and attempt to keep the connection open</translation> </message> <message> <location line="-18"/> <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"/> + <translation>Неможливо прив’язати до порту %s на цьому комп’ютері. Молживо гаманець вже запущено.</translation> </message> <message> <location line="+48"/> @@ -2607,12 +2616,12 @@ Address: %4 </translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>Завантаження гаманця...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -2627,22 +2636,22 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>Сканування...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>Завантаження завершене</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts index ad82a724ad..cd26e9ffeb 100644 --- a/src/qt/locale/bitcoin_zh_CN.ts +++ b/src/qt/locale/bitcoin_zh_CN.ts @@ -13,15 +13,24 @@ <translation><b>比特币</b>版本</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation>版权所有 © 2009-2012 比特币开发团队</translation> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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 type="unfinished"/> + <translation> +This is experimental software. + +Distributed under the MIT/X11 software license, see the accompanying file COPYING 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.</translation> </message> </context> <context> @@ -54,7 +63,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="-46"/> <source>These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</source> - <translation type="unfinished"/> + <translation>这是您用来收款的比特币地址。为了标记不同的资金来源，建议为每个付款人保留不同的收款地址。</translation> </message> <message> <location line="+60"/> @@ -69,17 +78,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+11"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"/> + <translation>签名消息，证明这个地址属于您。</translation> </message> <message> <location line="+3"/> <source>&Sign Message</source> - <translation>&发送签名消息</translation> + <translation>&签名消息</translation> </message> <message> <location line="+11"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> - <translation type="unfinished"/> + <translation>验证消息，确保消息是由指定的比特币地址签名过的。</translation> </message> <message> <location line="+3"/> @@ -215,18 +224,18 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"/> + <translation>警告：如果您加密了您的钱包，但是忘记了密码，你将会<b>丢失所有的比特币</b>！</translation> </message> <message> <location line="+0"/> <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> + <translation>您确定需要为钱包加密吗？</translation> </message> <message> <location line="+106"/> <location line="+24"/> <source>Warning: The Caps Lock key is on!</source> - <translation type="unfinished"/> + <translation>警告：大写锁定键处于打开状态！</translation> </message> <message> <location line="-121"/> @@ -278,28 +287,23 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+14"/> <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"/> + <translation>修改钱包密码成功。</translation> </message> </context> <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation>对&消息签名...</translation> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>显示/隐藏 比特币客户端</translation> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>正在与网络同步...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>&概况</translation> </message> @@ -374,7 +378,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&选项...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation>&加密钱包...</translation> </message> @@ -391,12 +395,12 @@ This product includes software developed by the OpenSSL Project for use in the O <message numerus="yes"> <location line="+241"/> <source>~%n block(s) remaining</source> - <translation><numerusform>~还剩 %n 个区块</numerusform></translation> + <translation><numerusform>~还剩 %n 个数据块</numerusform></translation> </message> <message> <location line="+6"/> <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> - <translation>已下载 %2 个交易历史区块中的 %1 个 (完成率 %3% ).</translation> + <translation>已下载 %2 个交易历史数据块中的 %1 个 (完成率 %3% ).</translation> </message> <message> <location line="-254"/> @@ -404,24 +408,24 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&导出...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation>向一个比特币地址发送比特币</translation> </message> <message> <location line="+6"/> <source>Sign a message to prove you own a Bitcoin address</source> - <translation type="unfinished"/> + <translation>签名消息，证明这个地址属于您。</translation> </message> <message> <location line="+4"/> <source>Verify a message to ensure it was signed with a specified Bitcoin address</source> - <translation type="unfinished"/> + <translation>验证消息，确保消息是由指定的比特币地址签名过的。</translation> </message> <message> <location line="+4"/> <source>S&ignatures</source> - <translation type="unfinished"/> + <translation>&签名</translation> </message> <message> <location line="+37"/> @@ -429,12 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>设置选项</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>显示或隐藏比特币客户端窗口</translation> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation>导出当前数据到文件</translation> </message> @@ -464,12 +463,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>在诊断控制台调试</translation> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation>&验证消息...</translation> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>比特币</translation> </message> @@ -479,12 +478,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>钱包</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> - <translation type="unfinished"/> + <translation>&关于比特币</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>&显示 / 隐藏</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>&文件</translation> </message> @@ -528,7 +532,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+40"/> <source>Downloaded %1 blocks of transaction history.</source> - <translation>%1 个交易历史数据区块已下载</translation> + <translation>%1 个交易历史数据块已下载</translation> </message> <message numerus="yes"> <location line="+22"/> @@ -563,7 +567,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+10"/> <source>Last received block was generated %1.</source> - <translation>最新收到的区块产生于 %1。</translation> + <translation>最新收到的数据块产生于 %1。</translation> </message> <message> <location line="+59"/> @@ -602,13 +606,13 @@ Address: %4 <location line="+120"/> <location line="+15"/> <source>URI handling</source> - <translation type="unfinished"/> + <translation>URI 处理</translation> </message> <message> <location line="-15"/> <location line="+15"/> <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation type="unfinished"/> + <translation>URI无法解析！原因可能是比特币地址不正确，或者URI参数错误。</translation> </message> <message> <location line="+16"/> @@ -641,15 +645,15 @@ Address: %4 <translation>备份钱包到其它文件夹失败.</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> - <translation type="unfinished"/> + <translation>发生严重错误。</translation> </message> </context> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation>网络警报</translation> </message> @@ -725,7 +729,7 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation>Bitcoin-Qt</translation> @@ -802,7 +806,7 @@ Address: %4 <message> <location line="+7"/> <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> + <translation>关闭时分开数据块数据库和地址数据库. 这意味着您可以将数据库文件移动至其他文件夹. 钱包文件始终是分开的.</translation> </message> <message> <location line="+3"/> @@ -827,7 +831,7 @@ Address: %4 <message> <location line="+7"/> <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source> - <translation type="unfinished"/> + <translation>通过代理服务器连接比特币网络(例如：通过Tor连接)</translation> </message> <message> <location line="+3"/> @@ -945,7 +949,7 @@ Address: %4 <translation>缺省</translation> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation>警告</translation> @@ -1029,7 +1033,7 @@ Address: %4 <location filename="../overviewpage.cpp" line="+112"/> <location line="+1"/> <source>out of sync</source> - <translation>来自同步过程</translation> + <translation>数据同步中</translation> </message> </context> <context> @@ -1072,7 +1076,7 @@ Address: %4 <message> <location line="+40"/> <source>The entered amount is invalid, please check.</source> - <translation type="unfinished"/> + <translation>输入的金额非法，请检查。</translation> </message> <message> <location line="+23"/> @@ -1107,7 +1111,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation>不可用</translation> </message> @@ -1124,7 +1128,7 @@ Address: %4 <message> <location line="+68"/> <source>Using OpenSSL version</source> - <translation type="unfinished"/> + <translation>使用OpenSSL版本</translation> </message> <message> <location line="+49"/> @@ -1149,22 +1153,22 @@ Address: %4 <message> <location line="+23"/> <source>Block chain</source> - <translation>区块链</translation> + <translation>数据链</translation> </message> <message> <location line="+7"/> <source>Current number of blocks</source> - <translation>当前区块数</translation> + <translation>当前数据块数量</translation> </message> <message> <location line="+23"/> <source>Estimated total blocks</source> - <translation>预计区块数</translation> + <translation>预计数据块数量</translation> </message> <message> <location line="+23"/> <source>Last block time</source> - <translation>上一区块时间</translation> + <translation>上一数据块时间</translation> </message> <message> <location line="+52"/> @@ -1199,22 +1203,22 @@ Address: %4 <message> <location line="-104"/> <source>Bitcoin - Debug window</source> - <translation type="unfinished"/> + <translation>比特币 - 调试窗口</translation> </message> <message> <location line="+25"/> <source>Bitcoin Core</source> - <translation type="unfinished"/> + <translation>比特币核心</translation> </message> <message> <location line="+279"/> <source>Debug log file</source> - <translation type="unfinished"/> + <translation>调试日志文件</translation> </message> <message> <location line="+7"/> <source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source> - <translation type="unfinished"/> + <translation>打开当前目录中的调试日志文件。日志文件大的话可能要等上几秒钟。</translation> </message> <message> <location line="+102"/> @@ -1241,7 +1245,7 @@ Address: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1314,7 +1318,7 @@ Address: %4 <message> <location line="+23"/> <source>The recipient address is not valid, please recheck.</source> - <translation type="unfinished"/> + <translation>收款人地址不合法，请检查。</translation> </message> <message> <location line="+5"/> @@ -1416,13 +1420,13 @@ Address: %4 <message> <location filename="../forms/signverifymessagedialog.ui" line="+14"/> <source>Signatures - Sign / Verify a Message</source> - <translation type="unfinished"/> + <translation>签名 - 为消息签名/验证签名消息</translation> </message> <message> <location line="+13"/> <location line="+124"/> <source>&Sign Message</source> - <translation>&发送签名消息</translation> + <translation>&签名消息</translation> </message> <message> <location line="-118"/> @@ -1432,19 +1436,19 @@ Address: %4 <message> <location line="+18"/> <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>用于签名消息的地址(例如: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+10"/> <location line="+203"/> <source>Choose an address from the address book</source> - <translation type="unfinished"/> + <translation>从地址簿选择地址</translation> </message> <message> <location line="-193"/> <location line="+203"/> <source>Alt+A</source> - <translation type="unfinished"/> + <translation>Alt+A</translation> </message> <message> <location line="-193"/> @@ -1454,7 +1458,7 @@ Address: %4 <message> <location line="+10"/> <source>Alt+P</source> - <translation type="unfinished"/> + <translation>Alt+P</translation> </message> <message> <location line="+12"/> @@ -1469,7 +1473,7 @@ Address: %4 <message> <location line="+21"/> <source>Sign the message to prove you own this Bitcoin address</source> - <translation type="unfinished"/> + <translation>签名消息，证明这个地址属于您。</translation> </message> <message> <location line="+17"/> @@ -1491,17 +1495,17 @@ Address: %4 <message> <location line="-64"/> <source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source> - <translation type="unfinished"/> + <translation>在下面输入签名地址，消息（请确保换行符、空格符、制表符等等一个不漏）和签名以验证消息。请确保签名信息准确，提防中间人攻击。</translation> </message> <message> <location line="+21"/> <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> + <translation>用于签名消息的地址(例如: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="+40"/> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> - <translation type="unfinished"/> + <translation>验证消息，确保消息是由指定的比特币地址签名过的。</translation> </message> <message> <location line="+17"/> @@ -1517,7 +1521,7 @@ Address: %4 <message> <location line="-2"/> <source>Click "Sign Message" to generate signature</source> - <translation type="unfinished"/> + <translation>单击“签名消息“产生签名。</translation> </message> <message> <location line="+3"/> @@ -1528,7 +1532,7 @@ Address: %4 <location line="+82"/> <location line="+81"/> <source>The entered address is invalid.</source> - <translation type="unfinished"/> + <translation>输入的地址非法。</translation> </message> <message> <location line="-81"/> @@ -1542,27 +1546,27 @@ Address: %4 <location line="-81"/> <location line="+81"/> <source>The entered address does not refer to a key.</source> - <translation type="unfinished"/> + <translation>输入的地址没有关联的公私钥对。</translation> </message> <message> <location line="-73"/> <source>Wallet unlock was cancelled.</source> - <translation type="unfinished"/> + <translation>钱包解锁动作取消。</translation> </message> <message> <location line="+8"/> <source>Private key for the entered address is not available.</source> - <translation type="unfinished"/> + <translation>找不到输入地址关联的私钥。</translation> </message> <message> <location line="+12"/> <source>Message signing failed.</source> - <translation type="unfinished"/> + <translation>消息签名失败。</translation> </message> <message> <location line="+5"/> <source>Message signed.</source> - <translation type="unfinished"/> + <translation>消息已签名。</translation> </message> <message> <location line="+59"/> @@ -1601,12 +1605,12 @@ Address: %4 <message numerus="yes"> <location line="-2"/> <source>Open for %n block(s)</source> - <translation type="unfinished"><numerusform></numerusform></translation> + <translation><numerusform>开放%n个数据块</numerusform></translation> </message> <message> <location line="+8"/> <source>%1/offline</source> - <translation type="unfinished"/> + <translation>%1 / 离线</translation> </message> <message> <location line="+2"/> @@ -1626,7 +1630,7 @@ Address: %4 <message numerus="yes"> <location line="+7"/> <source>, broadcast through %n node(s)</source> - <translation type="unfinished"><numerusform></numerusform></translation> + <translation><numerusform>通过 %n 个节点广播</numerusform></translation> </message> <message> <location line="+4"/> @@ -1636,7 +1640,7 @@ Address: %4 <message> <location line="+7"/> <source>Source</source> - <translation type="unfinished"/> + <translation>源</translation> </message> <message> <location line="+0"/> @@ -1647,25 +1651,25 @@ Address: %4 <location line="+6"/> <location line="+17"/> <source>From</source> - <translation type="unfinished"/> + <translation>来自</translation> </message> <message> <location line="+1"/> <location line="+22"/> <location line="+58"/> <source>To</source> - <translation type="unfinished"/> + <translation>到</translation> </message> <message> <location line="-77"/> <location line="+2"/> <source>own address</source> - <translation type="unfinished"/> + <translation>自己的地址</translation> </message> <message> <location line="-2"/> <source>label</source> - <translation type="unfinished"/> + <translation>标签</translation> </message> <message> <location line="+37"/> @@ -1679,12 +1683,12 @@ Address: %4 <message numerus="yes"> <location line="-102"/> <source>matures in %n more block(s)</source> - <translation type="unfinished"><numerusform></numerusform></translation> + <translation><numerusform>将在 %n 个数据块后成熟</numerusform></translation> </message> <message> <location line="+2"/> <source>not accepted</source> - <translation type="unfinished"/> + <translation>未被接受</translation> </message> <message> <location line="+44"/> @@ -1697,12 +1701,12 @@ Address: %4 <message> <location line="-39"/> <source>Transaction fee</source> - <translation type="unfinished"/> + <translation>交易费</translation> </message> <message> <location line="+16"/> <source>Net amount</source> - <translation type="unfinished"/> + <translation>净额</translation> </message> <message> <location line="+6"/> @@ -1712,32 +1716,32 @@ Address: %4 <message> <location line="+2"/> <source>Comment</source> - <translation type="unfinished"/> + <translation>备注</translation> </message> <message> <location line="+2"/> <source>Transaction ID</source> - <translation type="unfinished"/> + <translation>交易ID</translation> </message> <message> <location line="+3"/> <source>Generated coins must mature 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, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> + <translation>新挖出的比特币必须等确120个确认才能使用。您生产出的数据块，将被广播到全网并添加到数据块链。如果入链失败，状态将变为“未被接受”，意味着您的数据块竞争失败，挖出的比特币将不能使用。当某个节点先于你几秒生产出新的数据块，这种情况会偶尔发生。</translation> </message> <message> <location line="+7"/> <source>Debug information</source> - <translation type="unfinished"/> + <translation>调试信息</translation> </message> <message> <location line="+8"/> <source>Transaction</source> - <translation type="unfinished"/> + <translation>交易</translation> </message> <message> <location line="+5"/> <source>Inputs</source> - <translation type="unfinished"/> + <translation>输入</translation> </message> <message> <location line="+23"/> @@ -1747,12 +1751,12 @@ Address: %4 <message> <location line="+1"/> <source>true</source> - <translation type="unfinished"/> + <translation>正确</translation> </message> <message> <location line="+0"/> <source>false</source> - <translation type="unfinished"/> + <translation>错误</translation> </message> <message> <location line="-212"/> @@ -1828,12 +1832,12 @@ Address: %4 <message numerus="yes"> <location line="+8"/> <source>Mined balance will be available when it matures in %n more block(s)</source> - <translation><numerusform>挖矿收入余额将在 %n 个区块后可用</numerusform></translation> + <translation><numerusform>挖矿收入余额将在 %n 个数据块后可用</numerusform></translation> </message> <message> <location line="+5"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>此区块未被其他节点接收，并可能不被接受！</translation> + <translation>此数据块未被其他节点接收，并可能不被接受！</translation> </message> <message> <location line="+3"/> @@ -2076,7 +2080,7 @@ Address: %4 <translation>比特币版本</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>使用：</translation> </message> @@ -2093,13 +2097,13 @@ Address: %4 </translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>获得某条命令的帮助 </translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>选项： </translation> @@ -2117,7 +2121,7 @@ Address: %4 </translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>生成货币 </translation> @@ -2129,7 +2133,7 @@ Address: %4 </translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>指定数据目录 </translation> @@ -2145,13 +2149,7 @@ Address: %4 <translation>设置数据库磁盘日志大小 (缺省: 100MB)</translation> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>指定连接超时时间 (微秒) -</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>监听端口连接 <port> (缺省: 8333 or testnet: 18333)</translation> </message> @@ -2161,34 +2159,34 @@ Address: %4 <translation>最大连接数 <n> (缺省: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>连接一个节点并获取对端地址, 然后断开连接</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation>指定您的公共地址</translation> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation>绑定指定地址. IPv6 使用 [host]:port </translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Threshold for disconnecting misbehaving peers (缺省: 100)</translation> </message> <message> - <location line="-104"/> + <location line="-105"/> <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 line="-12"/> <source>Detach block and address databases. Increases shutdown time (default: 0)</source> - <translation>分离区块数据库和地址数据库. 会延升关闭时间 (缺省: 0)</translation> + <translation>分离数据块数据库和地址数据库. 会延长关闭时间 (缺省: 0)</translation> </message> <message> <location line="+34"/> @@ -2197,7 +2195,7 @@ Address: %4 </translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation>在后台运行并接受命令 @@ -2210,39 +2208,39 @@ Address: %4 </translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>接受来自外部的连接 (缺省: 如果不带 -proxy or -connect 参数设置为1)</translation> </message> <message> <location line="-20"/> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> - <translation type="unfinished"/> + <translation>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</translation> </message> <message> <location line="+5"/> <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>警告：-paytxfee 交易费设置得太高了！每笔交易都将支付交易费。</translation> </message> <message> <location line="+3"/> <source>Warning: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation type="unfinished"/> + <translation>警告：显示的交易可能不正确！您需要升级客户端软件，或者网络上的其他节点需要升级。</translation> </message> <message> <location line="+3"/> <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>警告：请检查电脑的日期时间设置是否正确！时间错误可能会导致比特币客户端运行异常。</translation> </message> <message> <location line="+13"/> <source>An error occurred while setting up the RPC port %i for listening: %s</source> - <translation type="unfinished"/> + <translation>设置RPC监听端口%i时发生错误: %s</translation> </message> <message> <location line="+4"/> <source>Block creation options:</source> - <translation type="unfinished"/> + <translation>数据块创建选项：</translation> </message> <message> <location line="+6"/> @@ -2262,37 +2260,42 @@ Address: %4 <message> <location line="+2"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> - <translation type="unfinished"/> + <translation>通过DNS查找节点(缺省：1 除非使用 -connect 选项)</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation>数据块导入中...</translation> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> - <translation type="unfinished"/> + <translation>非法的 -tor 地址：'%s' </translation> </message> <message> <location line="+10"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> - <translation type="unfinished"/> + <translation>每个连接的最大接收缓存，<n>*1000 字节(缺省：5000)</translation> </message> <message> <location line="+1"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</source> - <translation type="unfinished"/> + <translation>每个连接的最大发送缓存，<n>*1000 字节(缺省：1000)</translation> </message> <message> <location line="+1"/> <source>Only connect to nodes in network <net> (IPv4, IPv6 or Tor)</source> - <translation type="unfinished"/> + <translation>仅连接至指定网络的节点<net>(IPv4, IPv6 或者 Tor)</translation> </message> <message> <location line="+2"/> <source>Output extra debugging information. Implies all other -debug* options</source> - <translation type="unfinished"/> + <translation>输出额外的调试信息。打开所有 -debug* 开关</translation> </message> <message> <location line="+1"/> <source>Output extra network debugging information</source> - <translation type="unfinished"/> + <translation>输出额外的网络调试信息</translation> </message> <message> <location line="+2"/> @@ -2302,7 +2305,7 @@ Address: %4 <message> <location line="+4"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation type="unfinished"/> + <translation>SSL选项：(参见Bitcoin Wiki关于SSL设置栏目)</translation> </message> <message> <location line="+1"/> @@ -2322,20 +2325,25 @@ Address: %4 <message> <location line="+7"/> <source>Set maximum block size in bytes (default: 250000)</source> - <translation type="unfinished"/> + <translation>设置最大数据块大小(缺省：250000)</translation> </message> <message> <location line="+1"/> <source>Set minimum block size in bytes (default: 0)</source> - <translation type="unfinished"/> + <translation>设置最小数据块大小(缺省:0)</translation> </message> <message> <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation type="unfinished"/> + <translation>客户端启动时压缩debug.log文件(缺省：no-debug模式时为1)</translation> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation>设置连接超时时间(缺省：5000毫秒)</translation> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>使用UPnp映射监听端口(缺省: 0)</translation> </message> @@ -2347,7 +2355,7 @@ Address: %4 <message> <location line="+1"/> <source>Use proxy to reach tor hidden services (default: same as -proxy)</source> - <translation type="unfinished"/> + <translation>使用代理服务器访问隐藏服务(缺省：同 -proxy)</translation> </message> <message> <location line="+2"/> @@ -2358,12 +2366,12 @@ Address: %4 <message> <location line="+2"/> <source>Warning: Disk space is low!</source> - <translation type="unfinished"/> + <translation>警告：磁盘空间不足！</translation> </message> <message> <location line="+1"/> <source>Warning: This version is obsolete, upgrade required!</source> - <translation type="unfinished"/> + <translation>警告：该软件版本已过时，请升级！</translation> </message> <message> <location line="-41"/> @@ -2378,24 +2386,24 @@ Address: %4 </translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>允许从指定IP接受到的JSON-RPC连接 </translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <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 line="-89"/> + <location line="-90"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>当最佳区块变化时执行命令 (命令行中的 %s 会被替换成区块哈希值)</translation> + <translation>当最佳数据块变化时执行命令 (命令行中的 %s 会被替换成数据块哈希值)</translation> </message> <message> - <location line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>将钱包升级到最新的格式</translation> </message> @@ -2412,9 +2420,9 @@ Address: %4 </translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> - <translation>启动时需检查的区块数量 (缺省: 2500, 设置0为检查所有区块)</translation> + <translation>启动时需检查的数据块数量 (缺省: 2500, 设置0为检查所有数据块)</translation> </message> <message> <location line="+1"/> @@ -2422,9 +2430,9 @@ Address: %4 <translation>需要几个确认 (0-6个, 缺省: 1个)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> - <translation>从外来文件 blk000?.dat 导入区块数据</translation> + <translation>从外来文件 blk000?.dat 导入数据块</translation> </message> <message> <location line="+52"/> @@ -2444,19 +2452,19 @@ Address: %4 </translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>该帮助信息 </translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation>无法给数据目录 %s 加锁。比特币进程可能已在运行。</translation> </message> @@ -2466,12 +2474,12 @@ Address: %4 <translation>比特币</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>无法绑定本机端口 %s (返回错误消息 %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation>通过 socks 代理连接</translation> </message> @@ -2481,12 +2489,12 @@ Address: %4 <translation>使用 -addnode, -seednode 和 -connect选项时允许DNS查找</translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>正在加载地址...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>blkindex.dat文件加载错误</translation> </message> @@ -2501,17 +2509,17 @@ Address: %4 <translation>wallet.dat钱包文件加载错误：请升级到最新Bitcoin客户端</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>钱包文件需要重写：请退出并重新启动Bitcoin客户端</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>wallet.dat钱包文件加载错误</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation>非法的代理地址: '%s'</translation> </message> @@ -2526,7 +2534,7 @@ Address: %4 <translation>被指定的是未知socks代理版本: %i</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation>无法解析 -bind 端口地址: '%s'</translation> </message> @@ -2536,12 +2544,12 @@ Address: %4 <translation>无法解析 -externalip 地址: '%s'</translation> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>非法金额 -paytxfee=<amount>: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation>错误: 无法启动节点</translation> </message> @@ -2561,17 +2569,17 @@ Address: %4 <translation>错误：交易创建失败。</translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>发送中</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation>金额不对</translation> </message> @@ -2583,10 +2591,10 @@ Address: %4 <message> <location line="+9"/> <source>Loading block index...</source> - <translation>加载区块索引...</translation> + <translation>加载数据块索引...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>添加节点并与其保持连接</translation> </message> @@ -2606,12 +2614,12 @@ Address: %4 <translation>每发送1KB交易所需的费用</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>正在加载钱包...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation>无法降级钱包格式</translation> </message> @@ -2626,22 +2634,22 @@ Address: %4 <translation>无法写入缺省地址</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>正在重新扫描...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>加载完成</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation>使用 %s 选项</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts index d378753db6..bf911a84b2 100644 --- a/src/qt/locale/bitcoin_zh_TW.ts +++ b/src/qt/locale/bitcoin_zh_TW.ts @@ -13,19 +13,22 @@ <translation><b>位元幣</b>版本</translation> </message> <message> - <location line="+44"/> - <source>Copyright © 2009-2012 Bitcoin Developers - + <location line="+41"/> + <source>Copyright © 2009-2012 The Bitcoin developers</source> + <translation>版權為 Bitcoin 開發人員自西元 2009 至 2012 年起所有</translation> + </message> + <message> + <location line="+13"/> + <source> This is experimental software. Distributed under the MIT/X11 software license, see the accompanying file COPYING 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>版權為 Bitcoin 開發人員自西元 2009 至 2012 年起所有 + <translation> +這是一套實驗性的軟體. -這是套實驗性的軟體. - -此軟體依據 MIX/X11 軟體授權條款散布, 詳情請見附帶的 COPYING 檔案, 或是以下網站: http://www.opensource.org/licenses/mit-license.php. +此軟體是依據 MIT/X11 軟體授權條款散布, 詳情請見附帶的 COPYING 檔案, 或是以下網站: http://www.opensource.org/licenses/mit-license.php. 此產品也包含了由 OpenSSL Project 所開發的 OpenSSL Toolkit (http://www.openssl.org/) 軟體, 由 Eric Young (eay@cryptsoft.com) 撰寫的加解密軟體, 以及由 Thomas Bernard 所撰寫的 UPnP 軟體.</translation> </message> @@ -290,22 +293,17 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+218"/> + <location filename="../bitcoingui.cpp" line="+228"/> <source>Sign &message...</source> <translation>訊息簽署...</translation> </message> <message> - <location line="+48"/> - <source>Show/Hide &Bitcoin</source> - <translation>顯示/隱藏位元幣</translation> - </message> - <message> - <location line="+248"/> + <location line="+295"/> <source>Synchronizing with network...</source> <translation>網路同步中...</translation> </message> <message> - <location line="-326"/> + <location line="-325"/> <source>&Overview</source> <translation>總覽</translation> </message> @@ -332,7 +330,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>Edit the list of stored addresses and labels</source> - <translation>編輯儲存位址與標記的列表</translation> + <translation>編輯位址與標記的儲存列表</translation> </message> <message> <location line="+5"/> @@ -380,7 +378,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>選項...</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> <source>&Encrypt Wallet...</source> <translation>錢包加密...</translation> </message> @@ -410,7 +408,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>匯出...</translation> </message> <message> - <location line="-55"/> + <location line="-54"/> <source>Send coins to a Bitcoin address</source> <translation>付錢到一個位元幣位址</translation> </message> @@ -435,12 +433,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>修改位元幣的設定選項</translation> </message> <message> - <location line="+3"/> - <source>Show or hide the Bitcoin window</source> - <translation>顯示或隱藏位元幣的視窗</translation> - </message> - <message> - <location line="+2"/> + <location line="+4"/> <source>Export the data in the current tab to a file</source> <translation>將目前分頁的資料匯出存成檔案</translation> </message> @@ -470,12 +463,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>開啓除錯與診斷主控台</translation> </message> <message> - <location line="-56"/> + <location line="-55"/> <source>&Verify message...</source> <translation>訊息驗證...</translation> </message> <message> - <location line="-151"/> + <location line="-160"/> <source>Bitcoin</source> <translation>位元幣</translation> </message> @@ -485,12 +478,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>錢包</translation> </message> <message> - <location line="+186"/> + <location line="+195"/> <source>&About Bitcoin</source> <translation>關於位元幣</translation> </message> <message> - <location line="+44"/> + <location line="+9"/> + <source>&Show / Hide</source> + <translation>顯示或隱藏</translation> + </message> + <message> + <location line="+34"/> <source>&File</source> <translation>檔案</translation> </message> @@ -646,7 +644,7 @@ Address: %4 <translation>儲存錢包資料到新的地方時發生錯誤</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+112"/> + <location filename="../bitcoin.cpp" line="+109"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>發生了致命的錯誤. 位元幣程式無法再繼續安全執行, 只好結束.</translation> </message> @@ -654,7 +652,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+86"/> + <location filename="../clientmodel.cpp" line="+87"/> <source>Network Alert</source> <translation>網路警報</translation> </message> @@ -730,7 +728,7 @@ Address: %4 <context> <name>GUIUtil::HelpMessageBox</name> <message> - <location filename="../guiutil.cpp" line="+425"/> + <location filename="../guiutil.cpp" line="+419"/> <location line="+12"/> <source>Bitcoin-Qt</source> <translation>位元幣-Qt</translation> @@ -950,7 +948,7 @@ Address: %4 <translation>預設</translation> </message> <message> - <location line="+134"/> + <location line="+147"/> <location line="+9"/> <source>Warning</source> <translation>警告</translation> @@ -1112,7 +1110,7 @@ Address: %4 <location line="+53"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+246"/> + <location filename="../rpcconsole.cpp" line="+328"/> <source>N/A</source> <translation>無</translation> </message> @@ -1246,7 +1244,7 @@ Address: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+123"/> + <location filename="../sendcoinsdialog.cpp" line="+124"/> <location line="+5"/> <location line="+5"/> <location line="+5"/> @@ -1373,7 +1371,7 @@ Address: %4 <location line="+24"/> <location filename="../sendcoinsentry.cpp" line="+25"/> <source>Enter a label for this address to add it to your address book</source> - <translation>給這個位址輸入一個標記, 並加到位址簿中</translation> + <translation>輸入一個標記給這個位址, 並加到位址簿中</translation> </message> <message> <location line="+9"/> @@ -1646,7 +1644,7 @@ Address: %4 <message> <location line="+0"/> <source>Generated</source> - <translation>已產出</translation> + <translation>生產出</translation> </message> <message> <location line="+6"/> @@ -1843,7 +1841,7 @@ Address: %4 <message> <location line="+3"/> <source>Generated but not accepted</source> - <translation>產出但不被接受</translation> + <translation>生產出但不被接受</translation> </message> <message> <location line="+43"/> @@ -2081,7 +2079,7 @@ Address: %4 <translation>位元幣版本</translation> </message> <message> - <location line="+81"/> + <location line="+82"/> <source>Usage:</source> <translation>用法:</translation> </message> @@ -2098,13 +2096,13 @@ Address: %4 </translation> </message> <message> - <location line="-9"/> + <location line="-10"/> <source>Get help for a command</source> <translation>取得指令說明 </translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Options:</source> <translation>選項: </translation> @@ -2122,7 +2120,7 @@ Address: %4 </translation> </message> <message> - <location line="-46"/> + <location line="-47"/> <source>Generate coins</source> <translation>生產位元幣 </translation> @@ -2134,7 +2132,7 @@ Address: %4 </translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Specify data directory</source> <translation>指定資料目錄 </translation> @@ -2150,13 +2148,7 @@ Address: %4 <translation>設定資料庫的磁碟紀錄大小為多少百萬位元組(MB, 預設: 100)</translation> </message> <message> - <location line="+6"/> - <source>Specify connection timeout (in milliseconds)</source> - <translation>指定連線逾時時間 (毫秒) -</translation> - </message> - <message> - <location line="-32"/> + <location line="-26"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>在通訊埠 <port> 聽候連線 (預設: 8333, 或若為測試網路: 18333)</translation> </message> @@ -2166,27 +2158,27 @@ Address: %4 <translation>維持與節點連線數的上限為 <n> 個 (預設: 125)</translation> </message> <message> - <location line="-32"/> + <location line="-33"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>連線到某個節點以取得其它節點的位址, 然後斷線</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Specify your own public address</source> <translation>指定自己公開的位址</translation> </message> <message> - <location line="-74"/> + <location line="-75"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation>與指定的位址繫結. IPv6 要使用 [主機]:通訊埠 的格式</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>與亂搞的節點斷線的臨界值 (預設: 100)</translation> </message> <message> - <location line="-104"/> + <location line="-105"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>避免與亂搞的節點連線的秒數 (預設: 86400)</translation> </message> @@ -2202,7 +2194,7 @@ Address: %4 </translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Run in the background as a daemon and accept commands</source> <translation>以背景程式執行並接受指令</translation> </message> @@ -2213,7 +2205,7 @@ Address: %4 </translation> </message> <message> - <location line="-92"/> + <location line="-93"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>是否接受外來連線 (預設: 當沒有 -proxy 或 -connect 時預設為 1)</translation> </message> @@ -2268,7 +2260,12 @@ Address: %4 <translation>是否允許在找節點時使用域名查詢 (預設: 當沒用 -connect 時為 1)</translation> </message> <message> - <location line="+9"/> + <location line="+6"/> + <source>Importing blocks...</source> + <translation>匯入區塊</translation> + </message> + <message> + <location line="+4"/> <source>Invalid -tor address: '%s'</source> <translation>無效的 -tor 位址: '%s'</translation> </message> @@ -2338,7 +2335,12 @@ Address: %4 <translation>客戶端軟體啓動時將 debug.log 檔縮小 (預設: 當沒有 -debug 時為 1)</translation> </message> <message> - <location line="+15"/> + <location line="+2"/> + <source>Specify connection timeout in milliseconds (default: 5000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+13"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation>是否使用通用即插即用(UPnP)協定來設定聽候連線的通訊埠 (預設: 0)</translation> </message> @@ -2378,23 +2380,23 @@ Address: %4 <translation>在通訊埠 <port> 聽候 JSON-RPC 連線 (預設: 8332)</translation> </message> <message> - <location line="-40"/> + <location line="-41"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>只允許從指定網路位址來的 JSON-RPC 連線</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>送指令給在 <ip> 的節點 (預設: 127.0.0.1) </translation> </message> <message> - <location line="-89"/> + <location 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 line="+112"/> + <location line="+113"/> <source>Upgrade wallet to latest format</source> <translation>將錢包升級成最新的格式</translation> </message> @@ -2410,7 +2412,7 @@ Address: %4 <translation>重新掃描區塊鎖鏈, 以尋找錢包所遺漏的交易.</translation> </message> <message> - <location line="-23"/> + <location line="-24"/> <source>How many blocks to check at startup (default: 2500, 0 = all)</source> <translation>啓動時檢查多少區塊 (預設: 2500, 0 表示全部)</translation> </message> @@ -2420,14 +2422,14 @@ Address: %4 <translation>區塊檢查的仔細程度 (0 至 6, 預設: 1)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Imports blocks from external blk000?.dat file</source> <translation>從外來的區塊檔 blk000?.dat 匯入區塊</translation> </message> <message> <location line="+52"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>使用 OpenSSL (https) 於JSON-RPC 連線 + <translation>於 JSON-RPC 連線使用 OpenSSL (https) </translation> </message> <message> @@ -2443,19 +2445,19 @@ Address: %4 </translation> </message> <message> - <location line="-109"/> + <location line="-110"/> <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 line="+121"/> + <location line="+122"/> <source>This help message</source> <translation>此協助訊息 </translation> </message> <message> - <location line="-118"/> + <location line="-119"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation>無法鎖定資料目錄 %s. 也許位元幣已經在執行了.</translation> </message> @@ -2465,12 +2467,12 @@ Address: %4 <translation>位元幣</translation> </message> <message> - <location line="+76"/> + <location line="+77"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation>無法和這台電腦上的 %s 繫結 (繫結回傳錯誤 %d, %s)</translation> </message> <message> - <location line="-68"/> + <location line="-69"/> <source>Connect through socks proxy</source> <translation>透過 SOCKS 代理伺服器連線</translation> </message> @@ -2480,12 +2482,12 @@ Address: %4 <translation>允許對 -addnode, -seednode, -connect 的參數使用域名查詢 </translation> </message> <message> - <location line="+43"/> + <location line="+44"/> <source>Loading addresses...</source> <translation>載入位址中...</translation> </message> <message> - <location line="-25"/> + <location line="-26"/> <source>Error loading blkindex.dat</source> <translation>載入 blkindex.dat 失敗</translation> </message> @@ -2500,17 +2502,17 @@ Address: %4 <translation>載入檔案 wallet.dat 失敗: 此錢包需要新版的 Bitcoin</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>錢包需要重寫: 請重啟位元幣來完成</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Error loading wallet.dat</source> <translation>載入檔案 wallet.dat 失敗</translation> </message> <message> - <location line="+17"/> + <location line="+18"/> <source>Invalid -proxy address: '%s'</source> <translation>無效的 -proxy 位址: '%s'</translation> </message> @@ -2525,7 +2527,7 @@ Address: %4 <translation>在 -socks 指定了不明的代理協定版本: %i</translation> </message> <message> - <location line="-73"/> + <location line="-74"/> <source>Cannot resolve -bind address: '%s'</source> <translation>無法解析 -bind 位址: '%s'</translation> </message> @@ -2535,12 +2537,12 @@ Address: %4 <translation>無法解析 -externalip 位址: '%s'</translation> </message> <message> - <location line="+28"/> + <location line="+29"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>設定 -paytxfee=<金額> 的金額無效: '%s'</translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Error: could not start node</source> <translation>錯誤: 無法啓動節點</translation> </message> @@ -2560,17 +2562,17 @@ Address: %4 <translation>錯誤: 交易產生失敗</translation> </message> <message> - <location line="+41"/> + <location line="+42"/> <source>Sending...</source> <translation>付出中...</translation> </message> <message> - <location line="-99"/> + <location line="-100"/> <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 line="+74"/> + <location line="+75"/> <source>Invalid amount</source> <translation>無效的金額</translation> </message> @@ -2585,7 +2587,7 @@ Address: %4 <translation>載入區塊索引中...</translation> </message> <message> - <location line="-45"/> + <location line="-46"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>加入一個要連線的節線, 並試著保持對它的連線暢通</translation> </message> @@ -2605,12 +2607,12 @@ Address: %4 <translation>交易付款時每 KB 的交易手續費</translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Loading wallet...</source> <translation>載入錢包中...</translation> </message> <message> - <location line="-38"/> + <location line="-39"/> <source>Cannot downgrade wallet</source> <translation>無法將錢包格式降級</translation> </message> @@ -2625,22 +2627,22 @@ Address: %4 <translation>無法寫入預設位址</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Rescanning...</source> <translation>重新掃描中...</translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Done loading</source> <translation>載入完成</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>To use the %s option</source> <translation>為了要使用 %s 選項</translation> </message> <message> - <location line="-132"/> + <location line="-133"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: diff --git a/src/qt/qtipcserver.cpp b/src/qt/qtipcserver.cpp index ccdfc66bad..ec2d56b9e3 100644 --- a/src/qt/qtipcserver.cpp +++ b/src/qt/qtipcserver.cpp @@ -2,11 +2,18 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include <boost/version.hpp> +#if defined(WIN32) && BOOST_VERSION == 104900 +#define BOOST_INTERPROCESS_HAS_WINDOWS_KERNEL_BOOTTIME +#define BOOST_INTERPROCESS_HAS_KERNEL_BOOTTIME +#endif + #include "qtipcserver.h" #include "guiconstants.h" #include "ui_interface.h" #include "util.h" +#include <boost/algorithm/string/predicate.hpp> #include <boost/date_time/posix_time/posix_time.hpp> #include <boost/interprocess/ipc/message_queue.hpp> #include <boost/version.hpp> @@ -19,15 +26,52 @@ using namespace boost; using namespace boost::interprocess; using namespace boost::posix_time; -static void ipcThread2(void* pArg); - #ifdef MAC_OSX // URI handling not implemented on OSX yet -void ipcInit() { } +void ipcScanRelay(int argc, char *argv[]) { } +void ipcInit(int argc, char *argv[]) { } #else +static void ipcThread2(void* pArg); + +static bool ipcScanCmd(int argc, char *argv[], bool fRelay) +{ + // Check for URI in argv + bool fSent = false; + for (int i = 1; i < argc; i++) + { + if (boost::algorithm::istarts_with(argv[i], "bitcoin:")) + { + const char *strURI = argv[i]; + try { + boost::interprocess::message_queue mq(boost::interprocess::open_only, BITCOINURI_QUEUE_NAME); + if (mq.try_send(strURI, strlen(strURI), 0)) + fSent = true; + else if (fRelay) + break; + } + catch (boost::interprocess::interprocess_exception &ex) { + // don't log the "file not found" exception, because that's normal for + // the first start of the first instance + if (ex.get_error_code() != boost::interprocess::not_found_error || !fRelay) + { + printf("main() - boost interprocess exception #%d: %s\n", ex.get_error_code(), ex.what()); + break; + } + } + } + } + return fSent; +} + +void ipcScanRelay(int argc, char *argv[]) +{ + if (ipcScanCmd(argc, argv, true)) + exit(0); +} + static void ipcThread(void* pArg) { IMPLEMENT_RANDOMIZE_STACK(ipcThread(pArg)); @@ -75,7 +119,7 @@ static void ipcThread2(void* pArg) delete mq; } -void ipcInit() +void ipcInit(int argc, char *argv[]) { message_queue* mq = NULL; char buffer[MAX_URI_LENGTH + 1] = ""; @@ -108,11 +152,13 @@ void ipcInit() return; } - if (!CreateThread(ipcThread, mq)) + if (!NewThread(ipcThread, mq)) { delete mq; return; } + + ipcScanCmd(argc, argv, false); } #endif diff --git a/src/qt/qtipcserver.h b/src/qt/qtipcserver.h index 484b6222eb..cccf200b2d 100644 --- a/src/qt/qtipcserver.h +++ b/src/qt/qtipcserver.h @@ -4,6 +4,7 @@ // Define Bitcoin-Qt message queue name #define BITCOINURI_QUEUE_NAME "BitcoinURI" -void ipcInit(); +void ipcScanRelay(int argc, char *argv[]); +void ipcInit(int argc, char *argv[]); #endif // QTIPCSERVER_H diff --git a/src/qt/res/bitcoin-qt.rc b/src/qt/res/bitcoin-qt.rc index bce87d782b..834001c0c6 100644 --- a/src/qt/res/bitcoin-qt.rc +++ b/src/qt/res/bitcoin-qt.rc @@ -1,10 +1,18 @@ IDI_ICON1 ICON DISCARDABLE "icons/bitcoin.ico" -#include <windows.h> // needed for VERSIONINFO +#include <windows.h> // needed for VERSIONINFO +#include "../../clientversion.h" // holds the needed client version information + +#define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION,CLIENT_VERSION_BUILD +#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD) +#define VER_FILEVERSION VER_PRODUCTVERSION +#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR VS_VERSION_INFO VERSIONINFO -FILEOS VOS_NT_WINDOWS32 -FILETYPE VFT_APP +FILEVERSION VER_FILEVERSION +PRODUCTVERSION VER_PRODUCTVERSION +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_APP BEGIN BLOCK "StringFileInfo" BEGIN @@ -12,11 +20,13 @@ BEGIN BEGIN VALUE "CompanyName", "Bitcoin" VALUE "FileDescription", "Bitcoin-Qt (OSS GUI client for Bitcoin)" + VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "bitcoin-qt" VALUE "LegalCopyright", "2009-2012 The Bitcoin developers" VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." VALUE "OriginalFilename", "bitcoin-qt.exe" VALUE "ProductName", "Bitcoin-Qt" + VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index 08f936e719..7d5b6fed53 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -13,7 +13,6 @@ #include <QUrl> #include <QScrollBar> -#include <boost/tokenizer.hpp> #include <openssl/crypto.h> // TODO: make it possible to filter out categories (esp debug messages when implemented) @@ -54,34 +53,108 @@ void RPCExecutor::start() // Nothing to do } -void RPCExecutor::request(const QString &command) +/** + * Split shell command line into a list of arguments. Aims to emulate \c bash and friends. + * + * - Arguments are delimited with whitespace + * - Extra whitespace at the beginning and end and between arguments will be ignored + * - Text can be "double" or 'single' quoted + * - The backslash \c \ is used as escape character + * - Outside quotes, any character can be escaped + * - Within double quotes, only escape \c " and backslashes before a \c " or another backslash + * - Within single quotes, no escaping is possible and no special interpretation takes place + * + * @param[out] args Parsed arguments will be appended to this list + * @param[in] strCommand Command line to split + */ +bool parseCommandLine(std::vector<std::string> &args, const std::string &strCommand) { - // Parse shell-like command line into separate arguments - std::string strMethod; - std::vector<std::string> strParams; - try { - boost::escaped_list_separator<char> els('\\',' ','\"'); - std::string strCommand = command.toStdString(); - boost::tokenizer<boost::escaped_list_separator<char> > tok(strCommand, els); - - int n = 0; - for(boost::tokenizer<boost::escaped_list_separator<char> >::iterator beg=tok.begin(); beg!=tok.end();++beg,++n) + enum CmdParseState + { + STATE_EATING_SPACES, + STATE_ARGUMENT, + STATE_SINGLEQUOTED, + STATE_DOUBLEQUOTED, + STATE_ESCAPE_OUTER, + STATE_ESCAPE_DOUBLEQUOTED + } state = STATE_EATING_SPACES; + std::string curarg; + foreach(char ch, strCommand) + { + switch(state) { - if(n == 0) // First parameter is the command - strMethod = *beg; - else - strParams.push_back(*beg); + case STATE_ARGUMENT: // In or after argument + case STATE_EATING_SPACES: // Handle runs of whitespace + switch(ch) + { + case '"': state = STATE_DOUBLEQUOTED; break; + case '\'': state = STATE_SINGLEQUOTED; break; + case '\\': state = STATE_ESCAPE_OUTER; break; + case ' ': case '\n': case '\t': + if(state == STATE_ARGUMENT) // Space ends argument + { + args.push_back(curarg); + curarg.clear(); + } + state = STATE_EATING_SPACES; + break; + default: curarg += ch; state = STATE_ARGUMENT; + } + break; + case STATE_SINGLEQUOTED: // Single-quoted string + switch(ch) + { + case '\'': state = STATE_ARGUMENT; break; + default: curarg += ch; + } + break; + case STATE_DOUBLEQUOTED: // Double-quoted string + switch(ch) + { + case '"': state = STATE_ARGUMENT; break; + case '\\': state = STATE_ESCAPE_DOUBLEQUOTED; break; + default: curarg += ch; + } + break; + case STATE_ESCAPE_OUTER: // '\' outside quotes + curarg += ch; state = STATE_ARGUMENT; + break; + case STATE_ESCAPE_DOUBLEQUOTED: // '\' in double-quoted text + if(ch != '"' && ch != '\\') curarg += '\\'; // keep '\' for everything but the quote and '\' itself + curarg += ch; state = STATE_DOUBLEQUOTED; + break; } } - catch(boost::escaped_list_error &e) + switch(state) // final state { - emit reply(RPCConsole::CMD_ERROR, QString("Parse error")); - return; + case STATE_EATING_SPACES: + return true; + case STATE_ARGUMENT: + args.push_back(curarg); + return true; + default: // ERROR to end in one of the other states + return false; } +} - try { +void RPCExecutor::request(const QString &command) +{ + std::vector<std::string> args; + if(!parseCommandLine(args, command.toStdString())) + { + emit reply(RPCConsole::CMD_ERROR, QString("Parse error: unbalanced ' or \"")); + return; + } + if(args.empty()) + return; // Nothing to do + try + { std::string strPrint; - json_spirit::Value result = tableRPC.execute(strMethod, RPCConvertValues(strMethod, strParams)); + // Convert argument list to JSON objects in method-dependent way, + // and pass it along with the method name to the dispatcher. + json_spirit::Value result = tableRPC.execute( + args[0], + RPCConvertValues(args[0], std::vector<std::string>(args.begin() + 1, args.end()))); // Format result reply if (result.type() == json_spirit::null_type) @@ -95,7 +168,16 @@ void RPCExecutor::request(const QString &command) } catch (json_spirit::Object& objError) { - emit reply(RPCConsole::CMD_ERROR, QString::fromStdString(write_string(json_spirit::Value(objError), false))); + try // Nice formatting for standard-format error + { + int code = find_value(objError, "code").get_int(); + std::string message = find_value(objError, "message").get_str(); + emit reply(RPCConsole::CMD_ERROR, QString::fromStdString(message) + " (code " + QString::number(code) + ")"); + } + catch(std::runtime_error &) // raised when converting to invalid type, i.e. missing code or message + { // Show raw JSON object + emit reply(RPCConsole::CMD_ERROR, QString::fromStdString(write_string(json_spirit::Value(objError), false))); + } } catch (std::exception& e) { diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index d2cb31f51d..2954b9ee57 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -225,6 +225,10 @@ Value getblocktemplate(const Array& params, bool fHelp) const Value& modeval = find_value(oparam, "mode"); if (modeval.type() == str_type) strMode = modeval.get_str(); + else if (modeval.type() == null_type) + { + /* Do nothing */ + } else throw JSONRPCError(-8, "Invalid mode"); } diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp index f0038dea9f..491297eb1d 100644 --- a/src/rpcnet.cpp +++ b/src/rpcnet.cpp @@ -61,7 +61,7 @@ Value getpeerinfo(const Array& params, bool fHelp) ret.push_back(obj); } - + return ret; } diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index fefefc7d62..08b0049b08 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -18,8 +18,7 @@ using namespace boost; using namespace boost::assign; using namespace json_spirit; -void -ScriptPubKeyToJSON(const CScript& scriptPubKey, Object& out) +void ScriptPubKeyToJSON(const CScript& scriptPubKey, Object& out) { txnouttype type; vector<CTxDestination> addresses; @@ -43,8 +42,7 @@ ScriptPubKeyToJSON(const CScript& scriptPubKey, Object& out) out.push_back(Pair("addresses", a)); } -void -TxToJSON(const CTransaction& tx, const uint256 hashBlock, Object& entry) +void TxToJSON(const CTransaction& tx, const uint256 hashBlock, Object& entry) { entry.push_back(Pair("txid", tx.GetHash().GetHex())); entry.push_back(Pair("version", tx.nVersion)); @@ -138,24 +136,40 @@ Value getrawtransaction(const Array& params, bool fHelp) Value listunspent(const Array& params, bool fHelp) { - if (fHelp || params.size() > 2) + if (fHelp || params.size() > 3) throw runtime_error( - "listunspent [minconf=1] [maxconf=999999]\n" + "listunspent [minconf=1] [maxconf=9999999] [\"address\",...]\n" "Returns array of unspent transaction outputs\n" "with between minconf and maxconf (inclusive) confirmations.\n" + "Optionally filtered to only include txouts paid to specified addresses.\n" "Results are an array of Objects, each of which has:\n" "{txid, vout, scriptPubKey, amount, confirmations}"); - RPCTypeCheck(params, list_of(int_type)(int_type)); + RPCTypeCheck(params, list_of(int_type)(int_type)(array_type)); int nMinDepth = 1; if (params.size() > 0) nMinDepth = params[0].get_int(); - int nMaxDepth = 999999; + int nMaxDepth = 9999999; if (params.size() > 1) nMaxDepth = params[1].get_int(); + set<CBitcoinAddress> setAddress; + if (params.size() > 2) + { + Array inputs = params[2].get_array(); + BOOST_FOREACH(Value& input, inputs) + { + CBitcoinAddress address(input.get_str()); + if (!address.IsValid()) + throw JSONRPCError(-5, string("Invalid Bitcoin address: ")+input.get_str()); + if (setAddress.count(address)) + throw JSONRPCError(-8, string("Invalid parameter, duplicated address: ")+input.get_str()); + setAddress.insert(address); + } + } + Array results; vector<COutput> vecOutputs; pwalletMain->AvailableCoins(vecOutputs, false); @@ -164,6 +178,16 @@ Value listunspent(const Array& params, bool fHelp) if (out.nDepth < nMinDepth || out.nDepth > nMaxDepth) continue; + if(setAddress.size()) + { + CTxDestination address; + if(!ExtractDestination(out.tx->vout[out.i].scriptPubKey, address)) + continue; + + if (!setAddress.count(address)) + continue; + } + int64 nValue = out.tx->vout[out.i].nValue; const CScript& pk = out.tx->vout[out.i].scriptPubKey; Object entry; @@ -224,7 +248,7 @@ Value createrawtransaction(const Array& params, bool fHelp) { CBitcoinAddress address(s.name_); if (!address.IsValid()) - throw JSONRPCError(-5, string("Invalid Bitcoin address:")+s.name_); + throw JSONRPCError(-5, string("Invalid Bitcoin address: ")+s.name_); if (setAddress.count(address)) throw JSONRPCError(-8, string("Invalid parameter, duplicated address: ")+s.name_); diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index 95fa6718d9..3d0d05de84 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -15,16 +15,14 @@ using namespace std; int64 nWalletUnlockTime; static CCriticalSection cs_nWalletUnlockTime; -std::string -HelpRequiringPassphrase() +std::string HelpRequiringPassphrase() { return pwalletMain->IsCrypted() ? "\nrequires wallet passphrase to be set with walletpassphrase first" : ""; } -void -EnsureWalletIsUnlocked() +void EnsureWalletIsUnlocked() { if (pwalletMain->IsLocked()) throw JSONRPCError(-13, "Error: Please enter the wallet passphrase with walletpassphrase first."); @@ -276,6 +274,37 @@ Value sendtoaddress(const Array& params, bool fHelp) return wtx.GetHash().GetHex(); } +Value listaddressgroupings(const Array& params, bool fHelp) +{ + if (fHelp) + throw runtime_error( + "listaddressgroupings\n" + "Lists groups of addresses which have had their common ownership\n" + "made public by common use as inputs or as the resulting change\n" + "in past transactions"); + + Array jsonGroupings; + map<CTxDestination, int64> balances = pwalletMain->GetAddressBalances(); + BOOST_FOREACH(set<CTxDestination> grouping, pwalletMain->GetAddressGroupings()) + { + Array jsonGrouping; + BOOST_FOREACH(CTxDestination address, grouping) + { + Array addressInfo; + addressInfo.push_back(CBitcoinAddress(address).ToString()); + addressInfo.push_back(ValueFromAmount(balances[address])); + { + LOCK(pwalletMain->cs_wallet); + if (pwalletMain->mapAddressBook.find(CBitcoinAddress(address).Get()) != pwalletMain->mapAddressBook.end()) + addressInfo.push_back(pwalletMain->mapAddressBook.find(CBitcoinAddress(address).Get())->second); + } + jsonGrouping.push_back(addressInfo); + } + jsonGroupings.push_back(jsonGrouping); + } + return jsonGroupings; +} + Value signmessage(const Array& params, bool fHelp) { if (fHelp || params.size() != 2) @@ -544,7 +573,7 @@ Value movecmd(const Array& params, bool fHelp) // Debit CAccountingEntry debit; - debit.nOrderPos = pwalletMain->nOrderPosNext++; + debit.nOrderPos = pwalletMain->IncOrderPosNext(); debit.strAccount = strFrom; debit.nCreditDebit = -nAmount; debit.nTime = nNow; @@ -554,7 +583,7 @@ Value movecmd(const Array& params, bool fHelp) // Credit CAccountingEntry credit; - credit.nOrderPos = pwalletMain->nOrderPosNext++; + credit.nOrderPos = pwalletMain->IncOrderPosNext(); credit.strAccount = strTo; credit.nCreditDebit = nAmount; credit.nTime = nNow; @@ -977,7 +1006,8 @@ Value listtransactions(const Array& params, bool fHelp) Array ret; - CWallet::TxItems txOrdered = pwalletMain->OrderedTxItems(strAccount); + std::list<CAccountingEntry> acentries; + CWallet::TxItems txOrdered = pwalletMain->OrderedTxItems(acentries, strAccount); // iterate backwards until we have nCount items to return: for (CWallet::TxItems::reverse_iterator it = txOrdered.rbegin(); it != txOrdered.rend(); ++it) @@ -1273,9 +1303,9 @@ Value walletpassphrase(const Array& params, bool fHelp) "walletpassphrase <passphrase> <timeout>\n" "Stores the wallet decryption key in memory for <timeout> seconds."); - CreateThread(ThreadTopUpKeyPool, NULL); + NewThread(ThreadTopUpKeyPool, NULL); int64* pnSleepTime = new int64(params[1].get_int64()); - CreateThread(ThreadCleanWalletPassphrase, pnSleepTime); + NewThread(ThreadCleanWalletPassphrase, pnSleepTime); return Value::null; } diff --git a/src/script.cpp b/src/script.cpp index 8c35f0eed5..c34fbec82d 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -1127,8 +1127,7 @@ public: return false; } - void - Set(uint256 hash, const std::vector<unsigned char>& vchSig, const std::vector<unsigned char>& pubKey) + 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) diff --git a/src/serialize.h b/src/serialize.h index abc4f04a0d..63df3160a6 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -243,7 +243,6 @@ uint64 ReadCompactSize(Stream& is) #define FLATDATA(obj) REF(CFlatData((char*)&(obj), (char*)&(obj) + sizeof(obj))) /** Wrapper for serializing arrays and POD. - * There's a clever template way to make arrays serialize normally, but MSVC6 doesn't support it. */ class CFlatData { @@ -1010,57 +1009,6 @@ public: } }; -#ifdef TESTCDATASTREAM -// VC6sp6 -// CDataStream: -// n=1000 0 seconds -// n=2000 0 seconds -// n=4000 0 seconds -// n=8000 0 seconds -// n=16000 0 seconds -// n=32000 0 seconds -// n=64000 1 seconds -// n=128000 1 seconds -// n=256000 2 seconds -// n=512000 4 seconds -// n=1024000 8 seconds -// n=2048000 16 seconds -// n=4096000 32 seconds -// stringstream: -// n=1000 1 seconds -// n=2000 1 seconds -// n=4000 13 seconds -// n=8000 87 seconds -// n=16000 400 seconds -// n=32000 1660 seconds -// n=64000 6749 seconds -// n=128000 27241 seconds -// n=256000 109804 seconds -#include <iostream> -int main(int argc, char *argv[]) -{ - vector<unsigned char> vch(0xcc, 250); - printf("CDataStream:\n"); - for (int n = 1000; n <= 4500000; n *= 2) - { - CDataStream ss; - time_t nStart = time(NULL); - for (int i = 0; i < n; i++) - ss.write((char*)&vch[0], vch.size()); - printf("n=%-10d %d seconds\n", n, time(NULL) - nStart); - } - printf("stringstream:\n"); - for (int n = 1000; n <= 4500000; n *= 2) - { - stringstream ss; - time_t nStart = time(NULL); - for (int i = 0; i < n; i++) - ss.write((char*)&vch[0], vch.size()); - printf("n=%-10d %d seconds\n", n, time(NULL) - nStart); - } -} -#endif - diff --git a/src/sync.cpp b/src/sync.cpp index 54ad7de4e6..1ac4403beb 100644 --- a/src/sync.cpp +++ b/src/sync.cpp @@ -105,7 +105,7 @@ static void push_lock(void* c, const CLockLocation& locklocation, bool fTry) static void pop_lock() { - if (fDebug) + if (fDebug) { const CLockLocation& locklocation = (*lockstack).rbegin()->second; printf("Unlocked: %s\n", locklocation.ToString().c_str()); diff --git a/src/test/accounting_tests.cpp b/src/test/accounting_tests.cpp index c474fd65c1..8ac657288b 100644 --- a/src/test/accounting_tests.cpp +++ b/src/test/accounting_tests.cpp @@ -60,7 +60,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade) ae.nTime = 1333333330; ae.strOtherAccount = "d"; - ae.nOrderPos = pwalletMain->nOrderPosNext++; + ae.nOrderPos = pwalletMain->IncOrderPosNext(); walletdb.WriteAccountingEntry(ae); GetResults(walletdb, results); diff --git a/src/test/allocator_tests.cpp b/src/test/allocator_tests.cpp new file mode 100644 index 0000000000..d5cb8e8101 --- /dev/null +++ b/src/test/allocator_tests.cpp @@ -0,0 +1,115 @@ +#include <boost/test/unit_test.hpp> + +#include "init.h" +#include "main.h" +#include "util.h" + +BOOST_AUTO_TEST_SUITE(allocator_tests) + +// Dummy memory page locker for platform independent tests +static const void *last_lock_addr, *last_unlock_addr; +static size_t last_lock_len, last_unlock_len; +class TestLocker +{ +public: + bool Lock(const void *addr, size_t len) + { + last_lock_addr = addr; + last_lock_len = len; + return true; + } + bool Unlock(const void *addr, size_t len) + { + last_unlock_addr = addr; + last_unlock_len = len; + return true; + } +}; + +BOOST_AUTO_TEST_CASE(test_LockedPageManagerBase) +{ + const size_t test_page_size = 4096; + LockedPageManagerBase<TestLocker> lpm(test_page_size); + size_t addr; + last_lock_addr = last_unlock_addr = 0; + last_lock_len = last_unlock_len = 0; + + /* Try large number of small objects */ + addr = 0; + for(int i=0; i<1000; ++i) + { + lpm.LockRange(reinterpret_cast<void*>(addr), 33); + addr += 33; + } + /* Try small number of page-sized objects, straddling two pages */ + addr = test_page_size*100 + 53; + for(int i=0; i<100; ++i) + { + lpm.LockRange(reinterpret_cast<void*>(addr), test_page_size); + addr += test_page_size; + } + /* Try small number of page-sized objects aligned to exactly one page */ + addr = test_page_size*300; + for(int i=0; i<100; ++i) + { + lpm.LockRange(reinterpret_cast<void*>(addr), test_page_size); + addr += test_page_size; + } + /* one very large object, straddling pages */ + lpm.LockRange(reinterpret_cast<void*>(test_page_size*600+1), test_page_size*500); + BOOST_CHECK(last_lock_addr == reinterpret_cast<void*>(test_page_size*(600+500))); + /* one very large object, page aligned */ + lpm.LockRange(reinterpret_cast<void*>(test_page_size*1200), test_page_size*500-1); + BOOST_CHECK(last_lock_addr == reinterpret_cast<void*>(test_page_size*(1200+500-1))); + + BOOST_CHECK(lpm.GetLockedPageCount() == ( + (1000*33+test_page_size-1)/test_page_size + // small objects + 101 + 100 + // page-sized objects + 501 + 500)); // large objects + BOOST_CHECK((last_lock_len & (test_page_size-1)) == 0); // always lock entire pages + BOOST_CHECK(last_unlock_len == 0); // nothing unlocked yet + + /* And unlock again */ + addr = 0; + for(int i=0; i<1000; ++i) + { + lpm.UnlockRange(reinterpret_cast<void*>(addr), 33); + addr += 33; + } + addr = test_page_size*100 + 53; + for(int i=0; i<100; ++i) + { + lpm.UnlockRange(reinterpret_cast<void*>(addr), test_page_size); + addr += test_page_size; + } + addr = test_page_size*300; + for(int i=0; i<100; ++i) + { + lpm.UnlockRange(reinterpret_cast<void*>(addr), test_page_size); + addr += test_page_size; + } + lpm.UnlockRange(reinterpret_cast<void*>(test_page_size*600+1), test_page_size*500); + lpm.UnlockRange(reinterpret_cast<void*>(test_page_size*1200), test_page_size*500-1); + + /* Check that everything is released */ + BOOST_CHECK(lpm.GetLockedPageCount() == 0); + + /* A few and unlocks of size zero (should have no effect) */ + addr = 0; + for(int i=0; i<1000; ++i) + { + lpm.LockRange(reinterpret_cast<void*>(addr), 0); + addr += 1; + } + BOOST_CHECK(lpm.GetLockedPageCount() == 0); + addr = 0; + for(int i=0; i<1000; ++i) + { + lpm.UnlockRange(reinterpret_cast<void*>(addr), 0); + addr += 1; + } + BOOST_CHECK(lpm.GetLockedPageCount() == 0); + BOOST_CHECK((last_unlock_len & (test_page_size-1)) == 0); // always unlock entire pages +} + +BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/data/tx_invalid.json b/src/test/data/tx_invalid.json index 432dd3f496..f01ee06cfa 100644 --- a/src/test/data/tx_invalid.json +++ b/src/test/data/tx_invalid.json @@ -21,6 +21,44 @@ ["An invalid P2SH Transaction"], [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "HASH160 0x14 0x7a052c840ba73af26755de42cf01cc9e0a49fef0 EQUAL"]], -"010000000100010000000000000000000000000000000000000000000000000000000000000000000009085768617420697320ffffffff010000000000000000015100000000", true] +"010000000100010000000000000000000000000000000000000000000000000000000000000000000009085768617420697320ffffffff010000000000000000015100000000", true], +["Tests for CTransaction::CheckTransaction()"], +["No inputs"], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "HASH160 0x14 0x7a052c840ba73af26755de42cf01cc9e0a49fef0 EQUAL"]], +"0100000000010000000000000000015100000000", true], + +["No outputs"], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "HASH160 0x14 0x05ab9e14d983742513f0f451e105ffb4198d1dd4 EQUAL"]], +"01000000010001000000000000000000000000000000000000000000000000000000000000000000006d483045022100f16703104aab4e4088317c862daec83440242411b039d14280e03dd33b487ab802201318a7be236672c5c56083eb7a5a195bc57a40af7923ff8545016cd3b571e2a601232103c40e5d339df3f30bf753e7e04450ae4ef76c9e45587d1d993bdc4cd06f0651c7acffffffff0000000000", true], + +["Negative output"], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "HASH160 0x14 0xae609aca8061d77c5e111f6bb62501a6bbe2bfdb EQUAL"]], +"01000000010001000000000000000000000000000000000000000000000000000000000000000000006d4830450220063222cbb128731fc09de0d7323746539166544d6c1df84d867ccea84bcc8903022100bf568e8552844de664cd41648a031554327aa8844af34b4f27397c65b92c04de0123210243ec37dee0e2e053a9c976f43147e79bc7d9dc606ea51010af1ac80db6b069e1acffffffff01ffffffffffffffff015100000000", true], + +["MAX_MONEY + 1 output"], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "HASH160 0x14 0x32afac281462b822adbec5094b8d4d337dd5bd6a EQUAL"]], +"01000000010001000000000000000000000000000000000000000000000000000000000000000000006e493046022100e1eadba00d9296c743cb6ecc703fd9ddc9b3cd12906176a226ae4c18d6b00796022100a71aef7d2874deff681ba6080f1b278bac7bb99c61b08a85f4311970ffe7f63f012321030c0588dc44d92bdcbf8e72093466766fdc265ead8db64517b0c542275b70fffbacffffffff010140075af0750700015100000000", true], + +["MAX_MONEY output + 1 output"], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "HASH160 0x14 0xb558cbf4930954aa6a344363a15668d7477ae716 EQUAL"]], +"01000000010001000000000000000000000000000000000000000000000000000000000000000000006d483045022027deccc14aa6668e78a8c9da3484fbcd4f9dcc9bb7d1b85146314b21b9ae4d86022100d0b43dece8cfb07348de0ca8bc5b86276fa88f7f2138381128b7c36ab2e42264012321029bb13463ddd5d2cc05da6e84e37536cb9525703cfd8f43afdb414988987a92f6acffffffff020040075af075070001510001000000000000015100000000", true], + +["Duplicate inputs"], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "HASH160 0x14 0x236d0639db62b0773fd8ac34dc85ae19e9aba80a EQUAL"]], +"01000000020001000000000000000000000000000000000000000000000000000000000000000000006c47304402204bb1197053d0d7799bf1b30cd503c44b58d6240cccbdc85b6fe76d087980208f02204beeed78200178ffc6c74237bb74b3f276bbb4098b5605d814304fe128bf1431012321039e8815e15952a7c3fada1905f8cf55419837133bd7756c0ef14fc8dfe50c0deaacffffffff0001000000000000000000000000000000000000000000000000000000000000000000006c47304402202306489afef52a6f62e90bf750bbcdf40c06f5c6b138286e6b6b86176bb9341802200dba98486ea68380f47ebb19a7df173b99e6bc9c681d6ccf3bde31465d1f16b3012321039e8815e15952a7c3fada1905f8cf55419837133bd7756c0ef14fc8dfe50c0deaacffffffff010000000000000000015100000000", true], + +["Coinbase of size 1"], +["Note the input is just required to make the tester happy"], +[[["0000000000000000000000000000000000000000000000000000000000000000", -1, "1"]], +"01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0151ffffffff010000000000000000015100000000", true], + +["Coinbase of size 101"], +["Note the input is just required to make the tester happy"], +[[["0000000000000000000000000000000000000000000000000000000000000000", -1, "1"]], +"01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff655151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151ffffffff010000000000000000015100000000", true], + +["Null txin"], +[[["0000000000000000000000000000000000000000000000000000000000000000", -1, "HASH160 0x14 0x02dae7dbbda56097959cba59b1989dd3e47937bf EQUAL"]], +"01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff6e49304602210086f39e028e46dafa8e1e3be63906465f4cf038fbe5ed6403dc3e74ae876e6431022100c4625c675cfc5c7e3a0e0d7eaec92ac24da20c73a88eb40d09253e51ac6def5201232103a183ddc41e84753aca47723c965d1b5c8b0e2b537963518355e6dd6cf8415e50acffffffff010000000000000000015100000000", true] ] diff --git a/src/test/data/tx_valid.json b/src/test/data/tx_valid.json index cc4b28f6b4..5528ae7243 100644 --- a/src/test/data/tx_valid.json +++ b/src/test/data/tx_valid.json @@ -48,5 +48,24 @@ ["A valid P2SH Transaction using the standard transaction type put forth in BIP 16"], [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "HASH160 0x14 0x8febbed40483661de6958d957412f82deed8e2f7 EQUAL"]], -"01000000010001000000000000000000000000000000000000000000000000000000000000000000006e493046022100c66c9cdf4c43609586d15424c54707156e316d88b0a1534c9e6b0d4f311406310221009c0fe51dbc9c4ab7cc25d3fdbeccf6679fe6827f08edf2b4a9f16ee3eb0e438a0123210338e8034509af564c62644c07691942e0c056752008a173c89f60ab2a88ac2ebfacffffffff010000000000000000015100000000", true] +"01000000010001000000000000000000000000000000000000000000000000000000000000000000006e493046022100c66c9cdf4c43609586d15424c54707156e316d88b0a1534c9e6b0d4f311406310221009c0fe51dbc9c4ab7cc25d3fdbeccf6679fe6827f08edf2b4a9f16ee3eb0e438a0123210338e8034509af564c62644c07691942e0c056752008a173c89f60ab2a88ac2ebfacffffffff010000000000000000015100000000", true], + +["Tests for CTransaction::CheckTransaction()"], +["MAX_MONEY output"], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "HASH160 0x14 0x32afac281462b822adbec5094b8d4d337dd5bd6a EQUAL"]], +"01000000010001000000000000000000000000000000000000000000000000000000000000000000006e493046022100e1eadba00d9296c743cb6ecc703fd9ddc9b3cd12906176a226ae4c18d6b00796022100a71aef7d2874deff681ba6080f1b278bac7bb99c61b08a85f4311970ffe7f63f012321030c0588dc44d92bdcbf8e72093466766fdc265ead8db64517b0c542275b70fffbacffffffff010040075af0750700015100000000", true], + +["MAX_MONEY output + 0 output"], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "HASH160 0x14 0xb558cbf4930954aa6a344363a15668d7477ae716 EQUAL"]], +"01000000010001000000000000000000000000000000000000000000000000000000000000000000006d483045022027deccc14aa6668e78a8c9da3484fbcd4f9dcc9bb7d1b85146314b21b9ae4d86022100d0b43dece8cfb07348de0ca8bc5b86276fa88f7f2138381128b7c36ab2e42264012321029bb13463ddd5d2cc05da6e84e37536cb9525703cfd8f43afdb414988987a92f6acffffffff020040075af075070001510000000000000000015100000000", true], + +["Coinbase of size 2"], +["Note the input is just required to make the tester happy"], +[[["0000000000000000000000000000000000000000000000000000000000000000", -1, "1"]], +"01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff025151ffffffff010000000000000000015100000000", true], + +["Coinbase of size 100"], +["Note the input is just required to make the tester happy"], +[[["0000000000000000000000000000000000000000000000000000000000000000", -1, "1"]], +"01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff6451515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151ffffffff010000000000000000015100000000", true] ] diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp index e6c00e39d8..eb820ade6d 100644 --- a/src/test/rpc_tests.cpp +++ b/src/test/rpc_tests.cpp @@ -17,7 +17,7 @@ createArgs(int nRequired, const char* address1=NULL, const char* address2=NULL) result.push_back(nRequired); Array addresses; if (address1) addresses.push_back(address1); - if (address2) addresses.push_back(address1); + if (address2) addresses.push_back(address2); result.push_back(addresses); return result; } diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index de6e18f14d..c230458866 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -66,6 +66,8 @@ BOOST_AUTO_TEST_CASE(tx_valid) CTransaction tx; stream >> tx; + BOOST_CHECK_MESSAGE(tx.CheckTransaction(), strTest); + for (unsigned int i = 0; i < tx.vin.size(); i++) { if (!mapprevOutScriptPubKeys.count(tx.vin[i].prevout)) @@ -131,7 +133,9 @@ BOOST_AUTO_TEST_CASE(tx_invalid) CTransaction tx; stream >> tx; - for (unsigned int i = 0; i < tx.vin.size(); i++) + fValid = tx.CheckTransaction(); + + for (unsigned int i = 0; i < tx.vin.size() && fValid; i++) { if (!mapprevOutScriptPubKeys.count(tx.vin[i].prevout)) { @@ -139,8 +143,10 @@ BOOST_AUTO_TEST_CASE(tx_invalid) break; } - BOOST_CHECK_MESSAGE(!VerifyScript(tx.vin[i].scriptSig, mapprevOutScriptPubKeys[tx.vin[i].prevout], tx, i, test[2].get_bool(), 0), strTest); + fValid = VerifyScript(tx.vin[i].scriptSig, mapprevOutScriptPubKeys[tx.vin[i].prevout], tx, i, test[2].get_bool(), 0); } + + BOOST_CHECK_MESSAGE(!fValid, strTest); } } } diff --git a/src/util.cpp b/src/util.cpp index d6d9a368f0..d1270348e0 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -86,6 +86,8 @@ void locking_callback(int mode, int i, const char* file, int line) } } +LockedPageManager LockedPageManager::instance; + // Init class CInit { @@ -1297,3 +1299,15 @@ void RenameThread(const char* name) (void)name; #endif } + +bool NewThread(void(*pfn)(void*), void* parg) +{ + try + { + boost::thread(pfn, parg); // thread detaches when out of scope + } catch(boost::thread_resource_error &e) { + printf("Error creating thread: %s\n", e.what()); + return false; + } + return true; +} diff --git a/src/util.h b/src/util.h index 709b0e05bd..2409ccb79c 100644 --- a/src/util.h +++ b/src/util.h @@ -483,7 +483,7 @@ inline uint160 Hash160(const std::vector<unsigned char>& vch) } -/** Median filter over a stream of values. +/** Median filter over a stream of values. * Returns the median of the last N numbers */ template <typename T> class CMedianFilter @@ -500,7 +500,7 @@ public: vValues.push_back(initial_value); vSorted = vValues; } - + void input(T value) { if(vValues.size() == nSize) @@ -539,65 +539,14 @@ public: } }; +bool NewThread(void(*pfn)(void*), void* parg); - - - - - - - - -// Note: It turns out we might have been able to use boost::thread -// by using TerminateThread(boost::thread.native_handle(), 0); #ifdef WIN32 -typedef HANDLE pthread_t; - -inline pthread_t CreateThread(void(*pfn)(void*), void* parg, bool fWantHandle=false) -{ - DWORD nUnused = 0; - HANDLE hthread = - CreateThread( - NULL, // default security - 0, // inherit stack size from parent - (LPTHREAD_START_ROUTINE)pfn, // function pointer - parg, // argument - 0, // creation option, start immediately - &nUnused); // thread identifier - if (hthread == NULL) - { - printf("Error: CreateThread() returned %d\n", GetLastError()); - return (pthread_t)0; - } - if (!fWantHandle) - { - CloseHandle(hthread); - return (pthread_t)-1; - } - return hthread; -} - inline void SetThreadPriority(int nPriority) { SetThreadPriority(GetCurrentThread(), nPriority); } #else -inline pthread_t CreateThread(void(*pfn)(void*), void* parg, bool fWantHandle=false) -{ - pthread_t hthread = 0; - int ret = pthread_create(&hthread, NULL, (void*(*)(void*))pfn, parg); - if (ret != 0) - { - printf("Error: pthread_create() returned %d\n", ret); - return (pthread_t)0; - } - if (!fWantHandle) - { - pthread_detach(hthread); - return (pthread_t)-1; - } - return hthread; -} #define THREAD_PRIORITY_LOWEST PRIO_MAX #define THREAD_PRIORITY_BELOW_NORMAL 2 diff --git a/src/version.cpp b/src/version.cpp index 60b7aae2e5..8af406feab 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -39,13 +39,11 @@ const std::string CLIENT_NAME("Satoshi"); # 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 + "v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(rev) "." DO_STRINGIZE(build) "-g" commit #define BUILD_DESC_FROM_UNKNOWN(maj,min,rev,build) \ - "v" STRINGIFY(maj) "." STRINGIFY(min) "." STRINGIFY(rev) "." STRINGIFY(build) "-unk" + "v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(rev) "." DO_STRINGIZE(build) "-unk" #ifndef BUILD_DESC # ifdef GIT_COMMIT_ID diff --git a/src/version.h b/src/version.h index 8546ab85b6..b66d056928 100644 --- a/src/version.h +++ b/src/version.h @@ -4,21 +4,16 @@ #ifndef BITCOIN_VERSION_H #define BITCOIN_VERSION_H +#include "clientversion.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 99 -#define CLIENT_VERSION_BUILD 0 - static const int CLIENT_VERSION = 1000000 * CLIENT_VERSION_MAJOR - + 10000 * CLIENT_VERSION_MINOR + + 10000 * CLIENT_VERSION_MINOR + 100 * CLIENT_VERSION_REVISION + 1 * CLIENT_VERSION_BUILD; diff --git a/src/wallet.cpp b/src/wallet.cpp index 9b472cd78f..a10f187309 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -291,8 +291,14 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase) return true; } -CWallet::TxItems -CWallet::OrderedTxItems(std::string strAccount) +int64 CWallet::IncOrderPosNext() +{ + int64 nRet = nOrderPosNext; + CWalletDB(strWalletFile).WriteOrderPosNext(++nOrderPosNext); + return nRet; +} + +CWallet::TxItems CWallet::OrderedTxItems(std::list<CAccountingEntry>& acentries, std::string strAccount) { CWalletDB walletdb(strWalletFile); @@ -306,7 +312,7 @@ CWallet::OrderedTxItems(std::string strAccount) CWalletTx* wtx = &((*it).second); txOrdered.insert(make_pair(wtx->nOrderPos, TxPair(wtx, (CAccountingEntry*)0))); } - list<CAccountingEntry> acentries; + acentries.clear(); walletdb.ListAccountCreditDebit(strAccount, acentries); BOOST_FOREACH(CAccountingEntry& entry, acentries) { @@ -363,7 +369,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn) if (fInsertedNew) { wtx.nTimeReceived = GetAdjustedTime(); - wtx.nOrderPos = nOrderPosNext++; + wtx.nOrderPos = IncOrderPosNext(); wtx.nTimeSmart = wtx.nTimeReceived; if (wtxIn.hashBlock != 0) @@ -375,7 +381,8 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn) { // Tolerate times up to the last timestamp in the wallet not more than 5 minutes into the future int64 latestTolerated = latestNow + 300; - TxItems txOrdered = OrderedTxItems(); + std::list<CAccountingEntry> acentries; + TxItems txOrdered = OrderedTxItems(acentries); for (TxItems::reverse_iterator it = txOrdered.rbegin(); it != txOrdered.rend(); ++it) { CWalletTx *const pwtx = (*it).second.first; @@ -1367,7 +1374,7 @@ string CWallet::SendMoneyToDestination(const CTxDestination& address, int64 nVal int CWallet::LoadWallet(bool& fFirstRunRet) { if (!fFileBacked) - return false; + return DB_LOAD_OK; fFirstRunRet = false; int nLoadWalletRet = CWalletDB(strWalletFile,"cr+").LoadWallet(this); if (nLoadWalletRet == DB_NEED_REWRITE) @@ -1385,7 +1392,7 @@ int CWallet::LoadWallet(bool& fFirstRunRet) return nLoadWalletRet; fFirstRunRet = !vchDefaultKey.IsValid(); - CreateThread(ThreadFlushWalletDB, &strWalletFile); + NewThread(ThreadFlushWalletDB, &strWalletFile); return DB_LOAD_OK; } @@ -1608,6 +1615,129 @@ int64 CWallet::GetOldestKeyPoolTime() return keypool.nTime; } +std::map<CTxDestination, int64> CWallet::GetAddressBalances() +{ + map<CTxDestination, int64> balances; + + { + LOCK(cs_wallet); + BOOST_FOREACH(PAIRTYPE(uint256, CWalletTx) walletEntry, mapWallet) + { + CWalletTx *pcoin = &walletEntry.second; + + if (!pcoin->IsFinal() || !pcoin->IsConfirmed()) + continue; + + if (pcoin->IsCoinBase() && pcoin->GetBlocksToMaturity() > 0) + continue; + + int nDepth = pcoin->GetDepthInMainChain(); + if (nDepth < (pcoin->IsFromMe() ? 0 : 1)) + continue; + + for (unsigned int i = 0; i < pcoin->vout.size(); i++) + { + CTxDestination addr; + if (!IsMine(pcoin->vout[i])) + continue; + if(!ExtractDestination(pcoin->vout[i].scriptPubKey, addr)) + continue; + + int64 n = pcoin->IsSpent(i) ? 0 : pcoin->vout[i].nValue; + + if (!balances.count(addr)) + balances[addr] = 0; + balances[addr] += n; + } + } + } + + return balances; +} + +set< set<CTxDestination> > CWallet::GetAddressGroupings() +{ + set< set<CTxDestination> > groupings; + set<CTxDestination> grouping; + + BOOST_FOREACH(PAIRTYPE(uint256, CWalletTx) walletEntry, mapWallet) + { + CWalletTx *pcoin = &walletEntry.second; + + if (pcoin->vin.size() > 0 && IsMine(pcoin->vin[0])) + { + // group all input addresses with each other + BOOST_FOREACH(CTxIn txin, pcoin->vin) + { + CTxDestination address; + if(!ExtractDestination(mapWallet[txin.prevout.hash].vout[txin.prevout.n].scriptPubKey, address)) + continue; + grouping.insert(address); + } + + // group change with input addresses + BOOST_FOREACH(CTxOut txout, pcoin->vout) + if (IsChange(txout)) + { + CWalletTx tx = mapWallet[pcoin->vin[0].prevout.hash]; + CTxDestination txoutAddr; + if(!ExtractDestination(txout.scriptPubKey, txoutAddr)) + continue; + grouping.insert(txoutAddr); + } + groupings.insert(grouping); + grouping.clear(); + } + + // group lone addrs by themselves + for (unsigned int i = 0; i < pcoin->vout.size(); i++) + if (IsMine(pcoin->vout[i])) + { + CTxDestination address; + if(!ExtractDestination(pcoin->vout[i].scriptPubKey, address)) + continue; + grouping.insert(address); + groupings.insert(grouping); + grouping.clear(); + } + } + + set< set<CTxDestination>* > uniqueGroupings; // a set of pointers to groups of addresses + map< CTxDestination, set<CTxDestination>* > setmap; // map addresses to the unique group containing it + BOOST_FOREACH(set<CTxDestination> grouping, groupings) + { + // make a set of all the groups hit by this new group + set< set<CTxDestination>* > hits; + map< CTxDestination, set<CTxDestination>* >::iterator it; + BOOST_FOREACH(CTxDestination address, grouping) + if ((it = setmap.find(address)) != setmap.end()) + hits.insert((*it).second); + + // merge all hit groups into a new single group and delete old groups + set<CTxDestination>* merged = new set<CTxDestination>(grouping); + BOOST_FOREACH(set<CTxDestination>* hit, hits) + { + merged->insert(hit->begin(), hit->end()); + uniqueGroupings.erase(hit); + delete hit; + } + uniqueGroupings.insert(merged); + + // update setmap + BOOST_FOREACH(CTxDestination element, *merged) + setmap[element] = merged; + } + + set< set<CTxDestination> > ret; + BOOST_FOREACH(set<CTxDestination>* uniqueGrouping, uniqueGroupings) + { + ret.insert(*uniqueGrouping); + delete uniqueGrouping; + } + + return ret; +} + CPubKey CReserveKey::GetReservedKey() { if (nIndex == -1) diff --git a/src/wallet.h b/src/wallet.h index 69badaf10d..22795b75ba 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -98,6 +98,7 @@ public: fFileBacked = false; nMasterKeyMaxID = 0; pwalletdbEncryption = NULL; + nOrderPosNext = 0; } CWallet(std::string strWalletFileIn) { @@ -107,6 +108,7 @@ public: fFileBacked = true; nMasterKeyMaxID = 0; pwalletdbEncryption = NULL; + nOrderPosNext = 0; } std::map<uint256, CWalletTx> mapWallet; @@ -144,9 +146,19 @@ public: bool ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase, const SecureString& strNewWalletPassphrase); bool EncryptWallet(const SecureString& strWalletPassphrase); + /** Increment the next transaction order id + @return next transaction order id + */ + int64 IncOrderPosNext(); + typedef std::pair<CWalletTx*, CAccountingEntry*> TxPair; typedef std::multimap<int64, TxPair > TxItems; - TxItems OrderedTxItems(std::string strAccount = ""); + + /** Get the wallet's activity log + @return multimap of ordered transactions and accounting entries + @warning Returned pointers are *only* valid within the scope of passed acentries + */ + TxItems OrderedTxItems(std::list<CAccountingEntry>& acentries, std::string strAccount = ""); void MarkDirty(); bool AddToWallet(const CWalletTx& wtxIn); @@ -176,6 +188,9 @@ public: int64 GetOldestKeyPoolTime(); void GetAllReserveKeys(std::set<CKeyID>& setAddress); + std::set< std::set<CTxDestination> > GetAddressGroupings(); + std::map<CTxDestination, int64> GetAddressBalances(); + bool IsMine(const CTxIn& txin) const; int64 GetDebit(const CTxIn& txin) const; bool IsMine(const CTxOut& txout) const @@ -319,9 +334,7 @@ public: typedef std::map<std::string, std::string> mapValue_t; -static -void -ReadOrderPos(int64& nOrderPos, mapValue_t& mapValue) +static void ReadOrderPos(int64& nOrderPos, mapValue_t& mapValue) { if (!mapValue.count("n")) { @@ -332,9 +345,7 @@ ReadOrderPos(int64& nOrderPos, mapValue_t& mapValue) } -static -void -WriteOrderPos(const int64& nOrderPos, mapValue_t& mapValue) +static void WriteOrderPos(const int64& nOrderPos, mapValue_t& mapValue) { if (nOrderPos == -1) return; @@ -342,7 +353,7 @@ WriteOrderPos(const int64& nOrderPos, mapValue_t& mapValue) } -/** A transaction with a bunch of additional info that only the owner cares about. +/** A transaction with a bunch of additional info that only the owner cares about. * It includes any unrecorded transactions needed to link it back to the block chain. */ class CWalletTx : public CMerkleTx diff --git a/src/walletdb.cpp b/src/walletdb.cpp index 164b68e11f..0fac0109c8 100644 --- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -392,6 +392,10 @@ int CWalletDB::LoadWallet(CWallet* pwallet) return DB_CORRUPT; } } + else if (strType == "orderposnext") + { + ssValue >> pwallet->nOrderPosNext; + } } pcursor->close(); } diff --git a/src/walletdb.h b/src/walletdb.h index 187be65a97..d339d4c3f1 100644 --- a/src/walletdb.h +++ b/src/walletdb.h @@ -115,6 +115,12 @@ public: return Read(std::string("bestblock"), locator); } + bool WriteOrderPosNext(int64 nOrderPosNext) + { + nWalletDBUpdated++; + return Write(std::string("orderposnext"), nOrderPosNext); + } + bool ReadDefaultKey(std::vector<unsigned char>& vchPubKey) { vchPubKey.clear(); |