diff --git a/.gitignore b/.gitignore index a0870e67a..3ad8af3b4 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,5 @@ qa/cache/* libbitcoinconsensus.pc contrib/devtools/split-debug.sh + +.idea/ diff --git a/.travis.yml b/.travis.yml index 3dda4d82f..13cdea54a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ dist: trusty os: linux -language: generic +language: minimal cache: directories: - depends/built diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d1f01a07f..bbba03b2c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,4 @@ -Contributing to Dogecoin Core -============================ +# Contributing to Dogecoin Core The Dogecoin Core project operates an open contributor model where anyone is welcome to contribute towards development in the form of peer review, testing @@ -15,8 +14,7 @@ merging pull requests as well as a "lead maintainer" who is responsible for the release cycle, overall merging, moderation and appointment of maintainers. -Contributor Workflow --------------------- +## Contributor Workflow The codebase is maintained using the "contributor workflow" where everyone without exception contributes patch proposals using "pull requests". This @@ -94,8 +92,9 @@ At this stage one should expect comments and review from other contributors. You can add more commits to your pull request by committing them locally and pushing to your fork until you have satisfied all feedback. -Squashing Commits ---------------------------- + +## Squashing Commits + If your pull request is accepted for merging, you may be asked by a maintainer to squash and or [rebase](https://git-scm.com/docs/git-rebase) your commits before it will be merged. The basic squashing workflow is shown below. @@ -121,8 +120,7 @@ The length of time required for peer review is unpredictable and will vary from pull request to pull request. -Pull Request Philosophy ------------------------ +## Pull Request Philosophy Patchsets should always be focused. For example, a pull request could add a feature, fix a bug, or refactor code; but not a mixture. Please also avoid super @@ -130,7 +128,7 @@ pull requests which attempt to do too much, are overly large, or overly complex as this makes review difficult. -###Features +### Features When adding a new feature, thought must be given to the long term technical debt and maintenance that feature may require after inclusion. Before proposing a new @@ -139,7 +137,7 @@ maintain it (including bug fixing). If features get orphaned with no maintainer in the future, they may be removed by the Repository Maintainer. -###Refactoring +### Refactoring Refactoring is a necessary part of any software project's evolution. The following guidelines cover refactoring pull requests for the project. @@ -154,8 +152,7 @@ Project maintainers aim for a quick turnaround on refactoring pull requests, so where possible keep them short, uncomplex and easy to verify. -"Decision Making" Process -------------------------- +## "Decision Making" Process The following applies to code changes to the Dogecoin Core project (and related projects such as libsecp256k1), and is not to be confused with overall Dogecoin @@ -187,7 +184,7 @@ other kinds of patches because of increased peer review and consensus building requirements. -###Peer Review +### Peer Review Anyone may participate in peer review which is expressed by comments in the pull request. Typically reviewers will review the code for obvious errors, as well as @@ -226,13 +223,12 @@ discussed BIP and have a generally widely perceived technical consensus of being a worthwhile change based on the judgement of the maintainers. -Release Policy --------------- +## Release Policy The project leader is the release manager for each Dogecoin Core release. -Copyright ---------- + +## Copyright By contributing to this repository, you agree to license your work under the MIT license unless specified otherwise in `contrib/debian/copyright` or at diff --git a/Makefile.am b/Makefile.am index d558d07b9..4d44fc7d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,7 +48,7 @@ DIST_CONTRIB = $(top_srcdir)/contrib/dogecoin-cli.bash-completion \ BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \ $(top_srcdir)/contrib/devtools/security-check.py -WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \ +WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/dogecoin.ico \ $(top_srcdir)/share/pixmaps/nsis-header.bmp \ $(top_srcdir)/share/pixmaps/nsis-wizard.bmp \ $(top_srcdir)/doc/README_windows.txt diff --git a/README.md b/README.md index ce9af86b6..d1206c479 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ not straightforward. ## Very Much Frequently Asked Questions ❓ ### How much doge can exist? – So many puppies! 🐕 -Early 2015 (approximately a year and a half after release) there will be +Early 2015 (approximately a year and a half after release) there were approximately 100,000,000,000 coins. Each subsequent block will grant 10,000 coins to encourage miners to continue to secure the network and make up for lost wallets on hard drives/phones/lost diff --git a/configure.ac b/configure.ac index 845a4d52e..07eeb9349 100644 --- a/configure.ac +++ b/configure.ac @@ -2,9 +2,9 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MINOR, 14) -define(_CLIENT_VERSION_REVISION, 3) +define(_CLIENT_VERSION_REVISION, 4) define(_CLIENT_VERSION_BUILD, 0) -define(_CLIENT_VERSION_IS_RELEASE, true) +define(_CLIENT_VERSION_IS_RELEASE, false) define(_COPYRIGHT_YEAR, 2021) define(_COPYRIGHT_HOLDERS,[The %s developers]) define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core and Dogecoin Core]]) diff --git a/contrib/debian/README.md b/contrib/debian/README.md index 3366ed5d4..a938dc913 100644 --- a/contrib/debian/README.md +++ b/contrib/debian/README.md @@ -15,7 +15,7 @@ To install: If you build yourself, you will either need to modify the paths in the .desktop file or copy or symlink your dogecoin-qt binary to `/usr/bin` -and the `../../share/pixmaps/bitcoin128.png` to `/usr/share/pixmaps` +and the `../../share/pixmaps/dogecoin128.png` to `/usr/share/pixmaps` dogecoin-qt.protocol (KDE) diff --git a/contrib/debian/dogecoin-qt.desktop b/contrib/debian/dogecoin-qt.desktop index 003d025b9..e93fd071f 100644 --- a/contrib/debian/dogecoin-qt.desktop +++ b/contrib/debian/dogecoin-qt.desktop @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Name=Dogecoin Core Comment=Connect to the Dogecoin P2P Network Comment[de]=Verbinde mit dem Dogecoin peer-to-peer Netzwerk diff --git a/contrib/debian/dogecoin-qt.install b/contrib/debian/dogecoin-qt.install index 383d11729..b33910e50 100644 --- a/contrib/debian/dogecoin-qt.install +++ b/contrib/debian/dogecoin-qt.install @@ -1,6 +1,6 @@ usr/local/bin/dogecoin-qt usr/bin -share/pixmaps/bitcoin32.xpm usr/share/pixmaps -share/pixmaps/bitcoin16.xpm usr/share/pixmaps -share/pixmaps/bitcoin128.png usr/share/pixmaps +share/pixmaps/dogecoin32.xpm usr/share/pixmaps +share/pixmaps/dogecoin16.xpm usr/share/pixmaps +share/pixmaps/dogecoin128.png usr/share/pixmaps debian/dogecoin-qt.desktop usr/share/applications -debian/dogecoin-qt.protocol usr/share/kde4/services/ \ No newline at end of file +debian/dogecoin-qt.protocol usr/share/kde4/services/ diff --git a/contrib/rpm/bitcoin.spec b/contrib/rpm/bitcoin.spec index 516f42334..39256bbc2 100644 --- a/contrib/rpm/bitcoin.spec +++ b/contrib/rpm/bitcoin.spec @@ -243,20 +243,20 @@ done %if %{_buildqt} # qt icons -install -D -p share/pixmaps/bitcoin.ico %{buildroot}%{_datadir}/pixmaps/bitcoin.ico +install -D -p share/pixmaps/dogecoin.ico %{buildroot}%{_datadir}/pixmaps/dogecoin.ico install -p share/pixmaps/nsis-header.bmp %{buildroot}%{_datadir}/pixmaps/ install -p share/pixmaps/nsis-wizard.bmp %{buildroot}%{_datadir}/pixmaps/ install -p %{SOURCE100} %{buildroot}%{_datadir}/pixmaps/bitcoin.svg -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin16.png -w16 -h16 -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin32.png -w32 -h32 -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin64.png -w64 -h64 -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin128.png -w128 -h128 -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/bitcoin256.png -w256 -h256 -%{_bindir}/convert -resize 16x16 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin16.xpm -%{_bindir}/convert -resize 32x32 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin32.xpm -%{_bindir}/convert -resize 64x64 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin64.xpm -%{_bindir}/convert -resize 128x128 %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin128.xpm -%{_bindir}/convert %{buildroot}%{_datadir}/pixmaps/bitcoin256.png %{buildroot}%{_datadir}/pixmaps/bitcoin256.xpm +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/dogecoin16.png -w16 -h16 +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/dogecoin32.png -w32 -h32 +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/dogecoin64.png -w64 -h64 +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/dogecoin128.png -w128 -h128 +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/dogecoin256.png -w256 -h256 +%{_bindir}/convert -resize 16x16 %{buildroot}%{_datadir}/pixmaps/dogecoin256.png %{buildroot}%{_datadir}/pixmaps/dogecoin16.xpm +%{_bindir}/convert -resize 32x32 %{buildroot}%{_datadir}/pixmaps/dogecoin256.png %{buildroot}%{_datadir}/pixmaps/dogecoin32.xpm +%{_bindir}/convert -resize 64x64 %{buildroot}%{_datadir}/pixmaps/dogecoin256.png %{buildroot}%{_datadir}/pixmaps/dogecoin64.xpm +%{_bindir}/convert -resize 128x128 %{buildroot}%{_datadir}/pixmaps/dogecoin256.png %{buildroot}%{_datadir}/pixmaps/dogecoin128.xpm +%{_bindir}/convert %{buildroot}%{_datadir}/pixmaps/dogecoin256.png %{buildroot}%{_datadir}/pixmaps/dogecoin256.xpm touch %{buildroot}%{_datadir}/pixmaps/*.png -r %{SOURCE100} touch %{buildroot}%{_datadir}/pixmaps/*.xpm -r %{SOURCE100} diff --git a/depends/packages/openssl.mk b/depends/packages/openssl.mk index b839583b8..7692a89bf 100644 --- a/depends/packages/openssl.mk +++ b/depends/packages/openssl.mk @@ -1,7 +1,8 @@ package=openssl -$(package)_version=1.0.1l -$(package)_download_path=https://www.openssl.org/source -$(package)_file_name=$(package)-$($(package)_version).tar.gz +$(package)_version=1.0.1 +$(package)_version_suffix=l +$(package)_download_path=https://www.openssl.org/source/old/$($(package)_version) +$(package)_file_name=$(package)-$($(package)_version)$($(package)_version_suffix).tar.gz $(package)_sha256_hash=b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4 define $(package)_set_vars diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 2b0afc550..c6551f953 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -1,6 +1,6 @@ PACKAGE=qt $(package)_version=5.7.1 -$(package)_download_path=http://download.qt.io/official_releases/qt/5.7/$($(package)_version)/submodules +$(package)_download_path=http://download.qt.io/new_archive/qt/5.7/$($(package)_version)/submodules $(package)_suffix=opensource-src-$($(package)_version).tar.gz $(package)_file_name=qtbase-$($(package)_suffix) $(package)_sha256_hash=95f83e532d23b3ddbde7973f380ecae1bac13230340557276f75f2e37984e410 diff --git a/doc/Building-Dogecoin-1.14-for-Mac.md b/doc/Building-Dogecoin-1.14-for-Mac.md index 567ebd4a3..22e2b0fe9 100644 --- a/doc/Building-Dogecoin-1.14-for-Mac.md +++ b/doc/Building-Dogecoin-1.14-for-Mac.md @@ -2,7 +2,7 @@ Note that this requires changes made by michilumin on the 1.14-dev branch as well as some changes to BDB. -Tested on OSX 10.11 El Capitan and 10.13 High Sierra. +Tested on OSX 10.11 El Capitan, 10.13 High Sierra and 11.1 Big Sur. **Paper wallet printing support seems to work fine through this method as well.** @@ -25,7 +25,7 @@ Make sure frameworks dir is properly owned... $sudo mkdir /usr/local/Frameworks $sudo chown $(whoami):admin /usr/local/Frameworks -Install Brew. +Install Brew. (If you already have Brew installed, perform a 'brew update'.) $/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" @@ -77,6 +77,15 @@ Build BDB 5.1.29 $export LDFLAGS=-L/usr/local/BerkeleyDB.5.1/lib $export CPPFLAGS=-I/usr/local/BerkeleyDB.5.1/include + + _**NOTE:** for MacOS BigSur (11.1) or later, and possibly Catalina (10.15) you will also have to include the "OBJC_OLD_DISPATCH_PROTOTYPES=1" flag._ + + _So in this case you want the above export to be:_ + + $export CPPFLAGS="-I/usr/local/BerkeleyDB.5.1/include -DOBJC_OLD_DISPATCH_PROTOTYPES=1" + + _(Note that the quotes are required.)_ + $export INCPATHS=-I/usr/local/opt/openssl/include $export LIBPATHS=-L/usr/local/opt/openssl/lib $cd /usr/local/include diff --git a/doc/build-windows.md b/doc/build-windows.md index 9549a4b9d..437a41a62 100644 --- a/doc/build-windows.md +++ b/doc/build-windows.md @@ -1,7 +1,7 @@ WINDOWS BUILD NOTES ==================== -Below are some notes on how to build Bitcoin Core for Windows. +Below are some notes on how to build Dogecoin Core for Windows. Most developers use cross-compilation from Ubuntu to build executables for Windows. This is also used to build the release binaries. @@ -26,18 +26,15 @@ Windows](https://msdn.microsoft.com/en-us/commandline/wsl/install_guide). To get the bash shell, you must first activate the feature in Windows. -1. Turn on Developer Mode - * Open Settings -> Update and Security -> For developers - * Select the Developer Mode radio button - * Restart if necessary -2. Enable the Windows Subsystem for Linux feature - * From Start, search for "Turn Windows features on or off" (type 'turn') - * Select Windows Subsystem for Linux (beta) - * Click OK - * Restart if necessary +1. Enable the Windows Subsystem for Linux feature + * Open the Windows Features dialog (`OptionalFeatures.exe`) + * Enable 'Windows Subsystem for Linux' + * Click 'OK' and restart if necessary +2. Install Ubuntu + * Open Microsoft Store and search for "Ubuntu 18.04" or use [this link](https://www.microsoft.com/store/productId/9N9TNGVNDL3Q) + * Click Install 3. Complete Installation - * Open a cmd prompt and type "bash" - * Accept the license + * Open a cmd prompt and type "Ubuntu1804" * Create a new UNIX user account (this is a separate account from your Windows account) After the bash shell is active, you can follow the instructions below, starting @@ -53,7 +50,13 @@ installing the toolchain will be different. First, install the general dependencies: - sudo apt-get install build-essential libtool autotools-dev automake pkg-config bsdmainutils curl + sudo apt update + sudo apt upgrade + sudo apt-get install build-essential libtool autotools-dev automake pkg-config bsdmainutils curl git + +If you want to build with the wallet and Qt GUI you also want to install the following (this example is under Ubuntu): + + sudo apt-get install libssl-dev libboost-all-dev qt5-default libprotobuf-dev libqrencode4 libdb++-dev libdb-dev miniupnpc A host toolchain (`build-essential`) is necessary because some dependency packages (such as `protobuf`) need to build host utilities that are used in the @@ -63,9 +66,35 @@ build process. To build executables for Windows 64-bit, install the following dependencies: - sudo apt-get install g++-mingw-w64-x86-64 mingw-w64-x86-64-dev + sudo apt-get install g++-mingw-w64-x86-64 -Then build using: +For Ubuntu 18.04 and 20.04, set the default mingw32 g++ compiler option to posix: + + sudo update-alternatives --config x86_64-w64-mingw32-g++ + +...Choose the "posix" (vs 'auto' or 'win32') option, and continue. + +Note that for WSL v1 the Dogecoin Core source path MUST be somewhere in the default mount file system, for +example /usr/src/dogecoin, AND not under, for example, /mnt/d/dogecoin. + +If this is not the case the dependency autoconf scripts will fail (silently.) +This means you cannot use a directory that is located directly on the host Windows file system to perform the build. + +If using WSL 1, you'll need to turn off WSL Support for Win32 applications temporarily, or you will get ABI errors and format errors for some .o files. + +If using WSL 1 then build using: + + PATH=$(echo "$PATH" | sed -e 's/:\/mnt.*//g') # strip out problematic Windows %PATH% imported var + sudo bash -c "echo 0 > /proc/sys/fs/binfmt_misc/status" # Temporarily Disable WSL support for Win32 applications. + cd depends + make HOST=x86_64-w64-mingw32 + cd .. + ./autogen.sh + CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site ./configure --prefix=/ + make + sudo bash -c "echo 1 > /proc/sys/fs/binfmt_misc/status" # Re-Enable WSL support for Win32 applications. + +If using WSL 2 then you should be able to build just with: cd depends make HOST=x86_64-w64-mingw32 @@ -73,7 +102,7 @@ Then build using: ./autogen.sh # not required when building from tarball CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site ./configure --prefix=/ make - + ## Building for 32-bit Windows To build executables for Windows 32-bit, install the following dependencies: @@ -99,6 +128,6 @@ Installation After building using the Windows subsystem it can be useful to copy the compiled executables to a directory on the windows drive in the same directory structure as they appear in the release `.zip` archive. This can be done in the following -way. This will install to `c:\workspace\bitcoin`, for example: +way. This will install to `c:\workspace\dogecoin`, for example: - make install DESTDIR=/mnt/c/workspace/bitcoin + make install DESTDIR=/mnt/c/workspace/dogecoin diff --git a/share/pixmaps/bitcoin.ico b/share/pixmaps/dogecoin.ico similarity index 100% rename from share/pixmaps/bitcoin.ico rename to share/pixmaps/dogecoin.ico diff --git a/share/pixmaps/bitcoin128.png b/share/pixmaps/dogecoin128.png similarity index 100% rename from share/pixmaps/bitcoin128.png rename to share/pixmaps/dogecoin128.png diff --git a/share/pixmaps/bitcoin128.xpm b/share/pixmaps/dogecoin128.xpm similarity index 100% rename from share/pixmaps/bitcoin128.xpm rename to share/pixmaps/dogecoin128.xpm diff --git a/share/pixmaps/bitcoin16.png b/share/pixmaps/dogecoin16.png similarity index 100% rename from share/pixmaps/bitcoin16.png rename to share/pixmaps/dogecoin16.png diff --git a/share/pixmaps/bitcoin16.xpm b/share/pixmaps/dogecoin16.xpm similarity index 100% rename from share/pixmaps/bitcoin16.xpm rename to share/pixmaps/dogecoin16.xpm diff --git a/share/pixmaps/bitcoin256.png b/share/pixmaps/dogecoin256.png similarity index 100% rename from share/pixmaps/bitcoin256.png rename to share/pixmaps/dogecoin256.png diff --git a/share/pixmaps/bitcoin256.xpm b/share/pixmaps/dogecoin256.xpm similarity index 100% rename from share/pixmaps/bitcoin256.xpm rename to share/pixmaps/dogecoin256.xpm diff --git a/share/pixmaps/bitcoin32.png b/share/pixmaps/dogecoin32.png similarity index 100% rename from share/pixmaps/bitcoin32.png rename to share/pixmaps/dogecoin32.png diff --git a/share/pixmaps/bitcoin32.xpm b/share/pixmaps/dogecoin32.xpm similarity index 100% rename from share/pixmaps/bitcoin32.xpm rename to share/pixmaps/dogecoin32.xpm diff --git a/share/pixmaps/bitcoin64.png b/share/pixmaps/dogecoin64.png similarity index 100% rename from share/pixmaps/bitcoin64.png rename to share/pixmaps/dogecoin64.png diff --git a/share/pixmaps/bitcoin64.xpm b/share/pixmaps/dogecoin64.xpm similarity index 100% rename from share/pixmaps/bitcoin64.xpm rename to share/pixmaps/dogecoin64.xpm diff --git a/share/setup.nsi.in b/share/setup.nsi.in index f4442b258..2fdf83090 100644 --- a/share/setup.nsi.in +++ b/share/setup.nsi.in @@ -10,7 +10,7 @@ SetCompressor /SOLID lzma !define URL @PACKAGE_URL@ # MUI Symbol Definitions -!define MUI_ICON "@abs_top_srcdir@/share/pixmaps/bitcoin.ico" +!define MUI_ICON "@abs_top_srcdir@/share/pixmaps/dogecoin.ico" !define MUI_WELCOMEFINISHPAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-wizard.bmp" !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_RIGHT diff --git a/src/qt/forms/paperwalletdialog.ui b/src/qt/forms/paperwalletdialog.ui index 60a36e2ef..df3d8415f 100644 --- a/src/qt/forms/paperwalletdialog.ui +++ b/src/qt/forms/paperwalletdialog.ui @@ -82,14 +82,14 @@ 212 - 20 + 10 31 - 341 + 361 - Monospace + Courier 12 75 false @@ -117,7 +117,7 @@ - Monospace + Courier 8 50 false diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts index 3d7bad323..127095064 100644 --- a/src/qt/locale/bitcoin_pl.ts +++ b/src/qt/locale/bitcoin_pl.ts @@ -181,7 +181,7 @@ %1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your dogecoins from being stolen by malware infecting your computer. - %1 zamknie się aby dokończyć proces szyfrowania. Pamiętaj, że szyfrowanie portfela nie zabezpiecza w pełni Twoich dogecoinów przed kradzieżą przez wirusy lub trojany mogące zainfekować Twój komputer. + %1 zamknie się aby dokończyć proces szyfrowania. Pamiętaj, że szyfrowanie portfela nie zabezpiecza w pełni Twoich Dogecoinów przed kradzieżą przez wirusy lub trojany mogące zainfekować Twój komputer. IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet. @@ -323,7 +323,7 @@ Send coins to a Dogecoin address - Wyślij monety na adres dogecoinowy + Wyślij monety na adres Dogecoinowy Backup wallet to another location @@ -375,11 +375,11 @@ Sign messages with your Dogecoin addresses to prove you own them - Podpisz wiadomości swoim adresem aby udowodnić jego posiadanie + Podpisz wiadomości swoim adresem Dogecoinowym, aby udowodnić jego posiadanie Verify messages to ensure they were signed with specified Dogecoin addresses - Zweryfikuj wiadomość, aby upewnić się, że została podpisana podanym adresem dogecoinowym. + Zweryfikuj wiadomość, aby upewnić się, że została podpisana podanym adresem Dogecoinowym. &File @@ -399,7 +399,7 @@ Request payments (generates QR codes and dogecoin: URIs) - Żądaj płatności (generuje kod QR oraz dogecoinowe URI) + Żądaj płatności (generuje kod QR oraz Dogecoinowe URI) Show the list of used sending addresses and labels @@ -411,15 +411,15 @@ Open a dogecoin: URI or payment request - Otwórz URI dogecoin: lub żądanie zapłaty + Otwórz Dogecoinowe: URI lub żądanie zapłaty &Command-line options &Opcje linii komend - + %n active connection(s) to Dogecoin network - %n aktywnych połączeń do sieci Dogecoin%n aktywnych połączeń do sieci Dogecoin%n aktywnych połączeń do sieci Dogecoin%n aktywnych połączeń do sieci Dogecoin + %n aktywnych połączeń do sieci Dogecoin Indexing blocks on disk... @@ -427,11 +427,11 @@ Processing blocks on disk... - Przetwarzanie blocks on disk... + Przetwarzanie bloków na dysku... - + Processed %n block(s) of transaction history. - Przetworzono %n bloków historii transakcji.Przetworzono %n bloków historii transakcji.Przetworzono %n bloków historii transakcji.Przetworzono %n bloków historii transakcji. + Przetworzono %n bloków historii transakcji. %1 behind @@ -471,7 +471,7 @@ Catching up... - Trwa synchronizacja… + Trwa synchronizacja... Date: %1 @@ -777,7 +777,7 @@ Set language, for example "de_DE" (default: system locale) - Wybierz język, na przykład «de_DE» (domyślnie: język systemowy) + Wybierz język, na przykład "de_DE" (domyślnie: język systemowy) Start minimized @@ -824,19 +824,19 @@ Error: Specified data directory "%1" cannot be created. - Błąd: podany folder danych «%1» nie mógł zostać utworzony. + Błąd: podany folder danych "%1" nie mógł zostać utworzony. Error Błąd - + %n GB of free space available - %n GB dostępnego wolnego miejsca%n GB dostępnego wolnego miejsca%n GB dostępnego wolnego miejsca%n GB dostępnego wolnego miejsca + %n GB dostępnego wolnego miejsca - + (of %n GB needed) - (z %n GB potrzebnych)(z %n GB potrzebnych)(z %n GB potrzebnych)(z %n GB potrzebnych) + (z %n GB potrzebnych) @@ -851,7 +851,7 @@ Unknown... - Nienznane... + Nieznane... Last block time @@ -1017,7 +1017,7 @@ Proxy &IP: - &IP proxy: + &IP proxy: &Port: @@ -1097,7 +1097,7 @@ Choose the default subdivision unit to show in the interface and when sending coins. - Wybierz podział jednostki pokazywany w interfejsie oraz podczas wysyłania monet + Wybierz podział jednostki pokazywany w interfejsie oraz podczas wysyłania monet. Whether to show coin control features or not. @@ -1148,7 +1148,7 @@ The displayed information may be out of date. Your wallet automatically synchronizes with the Dogecoin network after a connection is established, but this process has not completed yet. - Wyświetlana informacja może być nieaktualna. Twój portfel synchronizuje się automatycznie z siecią dogecoin, zaraz po tym jak uzyskano połączenie, ale proces ten nie został jeszcze ukończony. + Wyświetlana informacja może być nieaktualna. Twój portfel synchronizuje się automatycznie z siecią Dogecoin, zaraz po tym jak uzyskano połączenie, ale proces ten nie został jeszcze ukończony. Watch-only: @@ -1172,7 +1172,7 @@ Immature: - Niedojrzały: + Niedojrzały: Mined balance that has not yet matured @@ -1192,7 +1192,7 @@ Your current balance in watch-only addresses - Twoje obecne saldo na podglądanym adresie + Twoje obecne saldo na podglądanym adresie Spendable: @@ -1223,7 +1223,7 @@ Cannot start dogecoin: click-to-pay handler - Nie można uruchomić protokołu dogecoin: kliknij-by-zapłacić + Nie można uruchomić protokołu Dogecoin: kliknij-by-zapłacić URI handling @@ -1293,7 +1293,7 @@ Enter a Dogecoin address (e.g. %1) - Wprowadź adres dogecoinowy (np. %1) + Wprowadź adres Dogecoinowy (np. %1) %1 d @@ -1386,7 +1386,7 @@ Using BerkeleyDB version - Używana wersja BerkeleyDB + Używana wersja BerkeleyDB Datadir @@ -1602,11 +1602,11 @@ Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen. - Użyj strzałek do przewijania historii i <b>Ctrl-L</b> aby wyczyścić ekran + Użyj strzałek do przewijania historii i <b>Ctrl-L</b> aby wyczyścić ekran. Type <b>help</b> for an overview of available commands. - Wpisz <b>help</b> aby uzyskać listę dostępnych komend + Wpisz <b>help</b> aby uzyskać listę dostępnych komend. %1 B @@ -1693,7 +1693,7 @@ An optional amount to request. Leave this empty or zero to not request a specific amount. - Opcjonalna kwota by zażądać. Zostaw puste lub zero by nie zażądać konkretnej kwoty. + Opcjonalna kwota żądania. Zostaw puste lub zero by nie zażądać konkretnej kwoty. Clear all fields of the form. @@ -1866,7 +1866,7 @@ If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address. - Kiedy ta opcja jest wybrana, to jeżeli adres reszty jest pusty lub nieprawidłowy, to reszta będzie wysyłana na nowo wygenerowany adres, + Kiedy ta opcja jest wybrana, to jeżeli adres reszty jest pusty lub nieprawidłowy, to reszta będzie wysyłana na nowo wygenerowany adres. Custom change address @@ -1902,7 +1902,7 @@ Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for dogecoin transactions than the network can process. - Zapłacenie tylko minimalnej opłaty jest nadal wystarczające, dopóki jest mniejszy wolumen transakcji niż miejsca w blokach. Należy jednak mieć świadomość, że może skończyć się to niezatwierdzeniem nigdy transakcji, gdy jest większe zapotrzebowanie na transakcje dogecoina niż sieć może przetworzyć. + Zapłacenie tylko minimalnej opłaty jest nadal wystarczające, dopóki jest mniejszy wolumen transakcji niż miejsca w blokach. Należy jednak mieć świadomość, że może skończyć się to niezatwierdzeniem nigdy transakcji, gdy jest większe zapotrzebowanie na transakcje Dogecoina niż sieć może przetworzyć. (read the tooltip) @@ -2053,7 +2053,7 @@ The Dogecoin address to send the payment to - Adres Dogecoin gdzie wysłać płatność + Adres Dogecoin, na który wysłać płatność Alt+A @@ -2073,7 +2073,7 @@ The fee will be deducted from the amount being sent. The recipient will receive less dogecoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally. - Opłata zostanie odjęta od kwoty wysyłane.Odbiorca otrzyma mniej niż dogecoins wpisz w polu kwoty. Jeśli wybrano kilku odbiorców, opłata jest podzielona równo. + Opłata zostanie odjęta od kwoty wysyłanej. Odbiorca otrzyma mniej niż Dogecoinów wpisanych w polu kwoty. Jeśli wybrano kilku odbiorców, opłata jest podzielona równo. S&ubtract fee from amount @@ -2097,7 +2097,7 @@ A message that was attached to the dogecoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dogecoin network. - Wiadomość, która została dołączona do URI dogecoin:, która będzie przechowywana wraz z transakcją w celach informacyjnych. Uwaga: Ta wiadomość nie będzie rozsyłana w sieci Dogecoin. + Wiadomość, która została dołączona do URI Dogecoina, która będzie przechowywana wraz z transakcją w celach informacyjnych. Uwaga: Ta wiadomość nie będzie rozsyłana w sieci Dogecoin. Pay To: @@ -2194,8 +2194,8 @@ Enter the receiver's 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. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction! - Wpisz adres, wiadomość oraz sygnaturę (podpis) odbiorcy (upewnij się, że dokładnie skopiujesz wszystkie zakończenia linii, spacje, tabulacje itp.). Uważaj by nie dodać więcej do podpisu niż do samej podpisywanej wiadomości by uniknąć ataku man-in-the-middle. -Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadawca posiada klucz do adresu, natomiast nie potwierdza to, że poprawne wysłanie jakiejkolwiek transakcji! + Wpisz adres, wiadomość oraz sygnaturę (podpis) odbiorcy (upewnij się, że dokładnie skopiujesz wszystkie zakończenia linii, spacje, tabulacje itp.). Uważaj by nie dodać więcej do podpisu niż do samej podpisywanej wiadomości by uniknąć ataku man-in-the-middle. +Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadawca posiada klucz do adresu, natomiast nie potwierdza to, że poprawne wysłanie jakiejkolwiek transakcji! The Dogecoin address the message was signed with @@ -2203,7 +2203,7 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw Verify the message to ensure it was signed with the specified Dogecoin address - Zweryfikuj wiadomość, aby upewnić się, że została podpisana odpowiednim adresem Dogecoin. + Zweryfikuj wiadomość, aby upewnić się, że została podpisana odpowiednim adresem Dogecoin. Verify &Message @@ -2460,7 +2460,7 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) - Prune: ostatnia synchronizacja portfela jest za danymi. Muszisz -reindexować (pobrać cały ciąg bloków ponownie w przypadku przyciętego węzła) + Przycinanie: ostatnia synchronizacja portfela wykracza poza przycięte dane. Musisz użyć -reindex (pobrać cały ciąg bloków ponownie w przypadku przyciętego węzła) Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again. @@ -2500,7 +2500,7 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d) - Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d) + Akceptuj przekazywane transakcje otrzymane od użytkowników z białej listy nawet gdy przekazywanie transakcji nie jest włączone (domyślnie: %d) Bind to given address and always listen on it. Use [host]:port notation for IPv6 @@ -2672,7 +2672,7 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw Only connect to nodes in network <net> (ipv4, ipv6 or onion) - Łącz z węzłami tylko w sieci <net> (ipv4, piv6 lub onion) + Łącz z węzłami tylko w sieci <net> (IPv4, IPv6 lub onion) Print this help message and exit @@ -2932,7 +2932,7 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw Unable to bind to %s on this computer (bind returned error %s) - Nie można przywiązać do %s na tym komputerze (bind zwrócił błąd %s) + Nie można przywiązać do %s na tym komputerze (przywiązanie zwróciło błąd %s) Upgrade wallet to latest format on startup @@ -3008,7 +3008,7 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments. - Całkowita długość łańcucha wersji (%i) przekracza maksymalną dopuszczalną długość (%i). Zmniejsz ilość lub rozmiar parametru uacomment. + Całkowita długość łańcucha wersji (%i) przekracza maksymalną dopuszczalną długość (%i). Zmniejsz ilość lub rozmiar parametru uacomments. Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d) @@ -3040,7 +3040,7 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw Always query for peer addresses via DNS lookup (default: %u) - Zawsze wypytuj o adresy węzłów poprzez podejrzenie DNS (domyślnie: %u) + Zawsze wypytuj o adresy węzłów poprzez podejrzenie w DNS (domyślnie: %u) How many blocks to check at startup (default: %u, 0 = all) @@ -3167,4 +3167,4 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw Błąd - \ No newline at end of file + diff --git a/src/qt/res/icons/about.png b/src/qt/res/icons/about.png index 22c21de44..0633c8d85 100644 Binary files a/src/qt/res/icons/about.png and b/src/qt/res/icons/about.png differ diff --git a/src/qt/res/icons/about_qt.png b/src/qt/res/icons/about_qt.png index c40abfd3a..d2398acd3 100644 Binary files a/src/qt/res/icons/about_qt.png and b/src/qt/res/icons/about_qt.png differ diff --git a/src/qt/res/icons/address-book.png b/src/qt/res/icons/address-book.png index b11c7d535..fdf43547a 100644 Binary files a/src/qt/res/icons/address-book.png and b/src/qt/res/icons/address-book.png differ diff --git a/src/qt/res/icons/bitcoin.png b/src/qt/res/icons/bitcoin.png index 714699df9..236e7142e 100644 Binary files a/src/qt/res/icons/bitcoin.png and b/src/qt/res/icons/bitcoin.png differ diff --git a/src/qt/res/icons/clock1.png b/src/qt/res/icons/clock1.png index 162204d1b..4c227f196 100644 Binary files a/src/qt/res/icons/clock1.png and b/src/qt/res/icons/clock1.png differ diff --git a/src/qt/res/icons/clock2.png b/src/qt/res/icons/clock2.png index 8f4263a31..14fbc5d2f 100644 Binary files a/src/qt/res/icons/clock2.png and b/src/qt/res/icons/clock2.png differ diff --git a/src/qt/res/icons/clock3.png b/src/qt/res/icons/clock3.png index 7f11a7566..5e333f371 100644 Binary files a/src/qt/res/icons/clock3.png and b/src/qt/res/icons/clock3.png differ diff --git a/src/qt/res/icons/clock4.png b/src/qt/res/icons/clock4.png index fdd1a0fce..fc6253c4a 100644 Binary files a/src/qt/res/icons/clock4.png and b/src/qt/res/icons/clock4.png differ diff --git a/src/qt/res/icons/clock5.png b/src/qt/res/icons/clock5.png index 7d6556c6c..aa711aca3 100644 Binary files a/src/qt/res/icons/clock5.png and b/src/qt/res/icons/clock5.png differ diff --git a/src/qt/res/icons/configure.png b/src/qt/res/icons/configure.png index 5333c83d5..db7147eb1 100644 Binary files a/src/qt/res/icons/configure.png and b/src/qt/res/icons/configure.png differ diff --git a/src/qt/res/icons/connect0.png b/src/qt/res/icons/connect0.png index ef708d81f..78277a141 100644 Binary files a/src/qt/res/icons/connect0.png and b/src/qt/res/icons/connect0.png differ diff --git a/src/qt/res/icons/connect1.png b/src/qt/res/icons/connect1.png index ed358e6f8..d9ca9b8b5 100644 Binary files a/src/qt/res/icons/connect1.png and b/src/qt/res/icons/connect1.png differ diff --git a/src/qt/res/icons/connect2.png b/src/qt/res/icons/connect2.png index 3bbb0d395..3e2c61b3c 100644 Binary files a/src/qt/res/icons/connect2.png and b/src/qt/res/icons/connect2.png differ diff --git a/src/qt/res/icons/connect3.png b/src/qt/res/icons/connect3.png index 0db99ad8d..9d33fea14 100644 Binary files a/src/qt/res/icons/connect3.png and b/src/qt/res/icons/connect3.png differ diff --git a/src/qt/res/icons/connect4.png b/src/qt/res/icons/connect4.png index 9dd19fc2b..0e035ab99 100644 Binary files a/src/qt/res/icons/connect4.png and b/src/qt/res/icons/connect4.png differ diff --git a/src/qt/res/icons/debugwindow.png b/src/qt/res/icons/debugwindow.png index 290fe6086..de86f8308 100644 Binary files a/src/qt/res/icons/debugwindow.png and b/src/qt/res/icons/debugwindow.png differ diff --git a/src/qt/res/icons/edit.png b/src/qt/res/icons/edit.png index 46582716e..2309726cf 100644 Binary files a/src/qt/res/icons/edit.png and b/src/qt/res/icons/edit.png differ diff --git a/src/qt/res/icons/export.png b/src/qt/res/icons/export.png index ac76cc1ef..e5d537361 100644 Binary files a/src/qt/res/icons/export.png and b/src/qt/res/icons/export.png differ diff --git a/src/qt/res/icons/eye.png b/src/qt/res/icons/eye.png index f2f139dbb..4c56bab71 100644 Binary files a/src/qt/res/icons/eye.png and b/src/qt/res/icons/eye.png differ diff --git a/src/qt/res/icons/eye_minus.png b/src/qt/res/icons/eye_minus.png index 795bf6436..7c46e7a32 100644 Binary files a/src/qt/res/icons/eye_minus.png and b/src/qt/res/icons/eye_minus.png differ diff --git a/src/qt/res/icons/eye_plus.png b/src/qt/res/icons/eye_plus.png index eaab69297..14aa3b9b4 100644 Binary files a/src/qt/res/icons/eye_plus.png and b/src/qt/res/icons/eye_plus.png differ diff --git a/src/qt/res/icons/filesave.png b/src/qt/res/icons/filesave.png index 779cca1d5..ab407c3bf 100644 Binary files a/src/qt/res/icons/filesave.png and b/src/qt/res/icons/filesave.png differ diff --git a/src/qt/res/icons/hd_disabled.png b/src/qt/res/icons/hd_disabled.png index 687b6d2e3..d0781d3f7 100644 Binary files a/src/qt/res/icons/hd_disabled.png and b/src/qt/res/icons/hd_disabled.png differ diff --git a/src/qt/res/icons/hd_enabled.png b/src/qt/res/icons/hd_enabled.png index 568dde1cd..94fc16b1f 100644 Binary files a/src/qt/res/icons/hd_enabled.png and b/src/qt/res/icons/hd_enabled.png differ diff --git a/src/qt/res/icons/info.png b/src/qt/res/icons/info.png index 692b50c2a..be034e247 100644 Binary files a/src/qt/res/icons/info.png and b/src/qt/res/icons/info.png differ diff --git a/src/qt/res/icons/key.png b/src/qt/res/icons/key.png index f301c4f38..101c970df 100644 Binary files a/src/qt/res/icons/key.png and b/src/qt/res/icons/key.png differ diff --git a/src/qt/res/icons/lock_closed.png b/src/qt/res/icons/lock_closed.png index 1bd98b21a..bf21e48c2 100644 Binary files a/src/qt/res/icons/lock_closed.png and b/src/qt/res/icons/lock_closed.png differ diff --git a/src/qt/res/icons/lock_open.png b/src/qt/res/icons/lock_open.png index a7045133b..299bc8034 100644 Binary files a/src/qt/res/icons/lock_open.png and b/src/qt/res/icons/lock_open.png differ diff --git a/src/qt/res/icons/network_disabled.png b/src/qt/res/icons/network_disabled.png index 269c3cfab..54897ec11 100644 Binary files a/src/qt/res/icons/network_disabled.png and b/src/qt/res/icons/network_disabled.png differ diff --git a/src/qt/res/icons/open.png b/src/qt/res/icons/open.png index 4d958f0e1..7f44e88fb 100644 Binary files a/src/qt/res/icons/open.png and b/src/qt/res/icons/open.png differ diff --git a/src/qt/res/icons/overview.png b/src/qt/res/icons/overview.png index 411595413..192d9d883 100644 Binary files a/src/qt/res/icons/overview.png and b/src/qt/res/icons/overview.png differ diff --git a/src/qt/res/icons/paper_wallet.png b/src/qt/res/icons/paper_wallet.png index f67138d62..75a94939a 100644 Binary files a/src/qt/res/icons/paper_wallet.png and b/src/qt/res/icons/paper_wallet.png differ diff --git a/src/qt/res/icons/print.png b/src/qt/res/icons/print.png index 5e3f9eb5c..e56cf606d 100644 Binary files a/src/qt/res/icons/print.png and b/src/qt/res/icons/print.png differ diff --git a/src/qt/res/icons/receive.png b/src/qt/res/icons/receive.png index f4e6f58d0..d12d974c1 100644 Binary files a/src/qt/res/icons/receive.png and b/src/qt/res/icons/receive.png differ diff --git a/src/qt/res/icons/remove.png b/src/qt/res/icons/remove.png index 8e738d630..216dde44e 100644 Binary files a/src/qt/res/icons/remove.png and b/src/qt/res/icons/remove.png differ diff --git a/src/qt/res/icons/send.png b/src/qt/res/icons/send.png index ac76cc1ef..4e22f9208 100644 Binary files a/src/qt/res/icons/send.png and b/src/qt/res/icons/send.png differ diff --git a/src/qt/res/icons/synced.png b/src/qt/res/icons/synced.png index 5ac28d36a..5407b12fe 100644 Binary files a/src/qt/res/icons/synced.png and b/src/qt/res/icons/synced.png differ diff --git a/src/qt/res/icons/transaction2.png b/src/qt/res/icons/transaction2.png index 5ac28d36a..3bc584b07 100644 Binary files a/src/qt/res/icons/transaction2.png and b/src/qt/res/icons/transaction2.png differ diff --git a/src/qt/res/icons/transaction_abandoned.png b/src/qt/res/icons/transaction_abandoned.png index 8ca6445c2..c230b07b9 100644 Binary files a/src/qt/res/icons/transaction_abandoned.png and b/src/qt/res/icons/transaction_abandoned.png differ diff --git a/src/qt/res/icons/tx_inout.png b/src/qt/res/icons/tx_inout.png index 0a6e72a89..e54603e4a 100644 Binary files a/src/qt/res/icons/tx_inout.png and b/src/qt/res/icons/tx_inout.png differ diff --git a/src/qt/res/icons/tx_input.png b/src/qt/res/icons/tx_input.png index 9e9ee9293..d207895f8 100644 Binary files a/src/qt/res/icons/tx_input.png and b/src/qt/res/icons/tx_input.png differ diff --git a/src/qt/res/icons/tx_mined.png b/src/qt/res/icons/tx_mined.png index 5a6ef521c..eea5e5067 100644 Binary files a/src/qt/res/icons/tx_mined.png and b/src/qt/res/icons/tx_mined.png differ diff --git a/src/qt/res/icons/tx_output.png b/src/qt/res/icons/tx_output.png index 6f66ab654..7f07e76b7 100644 Binary files a/src/qt/res/icons/tx_output.png and b/src/qt/res/icons/tx_output.png differ diff --git a/src/qt/res/icons/verify.png b/src/qt/res/icons/verify.png index 8e2cb2cc1..3e2e269d2 100644 Binary files a/src/qt/res/icons/verify.png and b/src/qt/res/icons/verify.png differ diff --git a/src/qt/res/icons/wallet_bgcoin.png b/src/qt/res/icons/wallet_bgcoin.png index 20e538671..481726f15 100644 Binary files a/src/qt/res/icons/wallet_bgcoin.png and b/src/qt/res/icons/wallet_bgcoin.png differ diff --git a/src/qt/res/icons/warning.png b/src/qt/res/icons/warning.png index 6bc5ac789..77c54adec 100644 Binary files a/src/qt/res/icons/warning.png and b/src/qt/res/icons/warning.png differ diff --git a/src/qt/res/src/bitcoin.svg b/src/qt/res/src/bitcoin.svg index 14cf0c5e1..a4c92412a 100644 --- a/src/qt/res/src/bitcoin.svg +++ b/src/qt/res/src/bitcoin.svg @@ -1,58 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/qt/res/src/clock_0.svg b/src/qt/res/src/clock_0.svg index 2a4ae0235..969459d3e 100644 --- a/src/qt/res/src/clock_0.svg +++ b/src/qt/res/src/clock_0.svg @@ -1,14 +1 @@ - - - - - - - - - + \ No newline at end of file diff --git a/src/qt/res/src/clock_1.svg b/src/qt/res/src/clock_1.svg index 2a3d84c2d..ca89f4c66 100644 --- a/src/qt/res/src/clock_1.svg +++ b/src/qt/res/src/clock_1.svg @@ -1,15 +1 @@ - - - - - - - - - + \ No newline at end of file diff --git a/src/qt/res/src/clock_2.svg b/src/qt/res/src/clock_2.svg index 2de8d467b..97436653a 100644 --- a/src/qt/res/src/clock_2.svg +++ b/src/qt/res/src/clock_2.svg @@ -1,13 +1 @@ - - - - - - - - - + \ No newline at end of file diff --git a/src/qt/res/src/clock_3.svg b/src/qt/res/src/clock_3.svg index b691043e3..461b6e4f1 100644 --- a/src/qt/res/src/clock_3.svg +++ b/src/qt/res/src/clock_3.svg @@ -1,15 +1 @@ - - - - - - - - - + \ No newline at end of file diff --git a/src/qt/res/src/clock_4.svg b/src/qt/res/src/clock_4.svg index ea311f31e..49af4f0e2 100644 --- a/src/qt/res/src/clock_4.svg +++ b/src/qt/res/src/clock_4.svg @@ -1,23 +1 @@ - -image/svg+xml \ No newline at end of file + \ No newline at end of file diff --git a/src/qt/res/src/connect-0.svg b/src/qt/res/src/connect-0.svg index 0920555b9..cbc0b60e2 100644 --- a/src/qt/res/src/connect-0.svg +++ b/src/qt/res/src/connect-0.svg @@ -1,66 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/qt/res/src/connect-1.svg b/src/qt/res/src/connect-1.svg index 25dea4cd3..ee078eb29 100644 --- a/src/qt/res/src/connect-1.svg +++ b/src/qt/res/src/connect-1.svg @@ -1,69 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/qt/res/src/connect-2.svg b/src/qt/res/src/connect-2.svg index bb98333d2..6e9cce26e 100644 --- a/src/qt/res/src/connect-2.svg +++ b/src/qt/res/src/connect-2.svg @@ -1,59 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/qt/res/src/connect-3.svg b/src/qt/res/src/connect-3.svg index a54a55ef6..a6adec6f5 100644 --- a/src/qt/res/src/connect-3.svg +++ b/src/qt/res/src/connect-3.svg @@ -1,72 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/qt/res/src/connect-4.svg b/src/qt/res/src/connect-4.svg index b83b9f9d0..59deaac24 100644 --- a/src/qt/res/src/connect-4.svg +++ b/src/qt/res/src/connect-4.svg @@ -1,65 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/qt/res/src/hd_disabled.svg b/src/qt/res/src/hd_disabled.svg index 035f4431c..7b8d1d759 100644 --- a/src/qt/res/src/hd_disabled.svg +++ b/src/qt/res/src/hd_disabled.svg @@ -1,26 +1 @@ - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/qt/res/src/hd_enabled.svg b/src/qt/res/src/hd_enabled.svg index cbaa16f8f..5baea4717 100644 --- a/src/qt/res/src/hd_enabled.svg +++ b/src/qt/res/src/hd_enabled.svg @@ -1,13 +1 @@ - - - - - - - - - + \ No newline at end of file diff --git a/src/qt/res/src/mine.svg b/src/qt/res/src/mine.svg index 4a3f78660..2c5909b4e 100644 --- a/src/qt/res/src/mine.svg +++ b/src/qt/res/src/mine.svg @@ -1,12 +1 @@ - - - - - - - - - + \ No newline at end of file diff --git a/src/qt/res/src/network_disabled.svg b/src/qt/res/src/network_disabled.svg index a041d7743..873b3b0bf 100644 --- a/src/qt/res/src/network_disabled.svg +++ b/src/qt/res/src/network_disabled.svg @@ -1,49 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/qt/res/src/qt.svg b/src/qt/res/src/qt.svg index 373c91f0c..b4c166603 100644 --- a/src/qt/res/src/qt.svg +++ b/src/qt/res/src/qt.svg @@ -1,26 +1 @@ - -image/svg+xml \ No newline at end of file + \ No newline at end of file diff --git a/src/qt/res/src/spinner.png b/src/qt/res/src/spinner.png index b296a5848..cbaa7673a 100644 Binary files a/src/qt/res/src/spinner.png and b/src/qt/res/src/spinner.png differ diff --git a/src/qt/res/src/transaction0.svg b/src/qt/res/src/transaction0.svg index e7fcd8214..483d8ec8e 100644 --- a/src/qt/res/src/transaction0.svg +++ b/src/qt/res/src/transaction0.svg @@ -1,35 +1 @@ - - - - - - - image/svg+xml - - - - - - - - - + \ No newline at end of file diff --git a/src/qt/res/src/tx_in.svg b/src/qt/res/src/tx_in.svg index a8911f904..1cb077bcc 100644 --- a/src/qt/res/src/tx_in.svg +++ b/src/qt/res/src/tx_in.svg @@ -1,9 +1 @@ - - - - - - + \ No newline at end of file diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index 77e5e03e6..7bf01c906 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -752,10 +752,19 @@ void RPCConsole::message(int category, const QString &message, bool html) out += ""; out += ""; out += "
" + timeString + ""; + + QString interpretedMessage; + if(category == CMD_REPLY && message == "null") + { + interpretedMessage = "Empty response"; + } else { + interpretedMessage = message; + } + if(html) - out += message; + out += interpretedMessage; else - out += GUIUtil::HtmlEscape(message, false); + out += GUIUtil::HtmlEscape(interpretedMessage, false); out += "
"; ui->messagesWidget->append(out); } diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index e25e8cf7b..085523dc0 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -200,7 +200,7 @@ PaperWalletDialog::PaperWalletDialog(QWidget *parent) : ui->buttonBox->addButton(tr("Close"), QDialogButtonBox::RejectRole); // Begin with a small bold monospace font for the textual version of the key and address. - QFont font("Monospace"); + QFont font("Courier"); font.setBold(true); font.setStyleHint(QFont::TypeWriter); font.setPixelSize(1); @@ -302,7 +302,7 @@ void PaperWalletDialog::on_getNewAddress_clicked() // Update the fonts to fit the height of the wallet. // This should only really trigger the first time since the font size persists. double paperHeight = (double)ui->paperTemplate->height(); - double maxTextWidth = paperHeight * 0.99; + double maxTextWidth = paperHeight * 0.98; double minTextWidth = paperHeight * 0.95; int pixelSizeStep = 1; diff --git a/src/validation.cpp b/src/validation.cpp index c21c78467..6b5dcb188 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2516,7 +2516,7 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams, // state of transactions in our wallet is currently cleared when we // receive another notification and there is a race condition where // notification of a connected conflict might cause an outside process - // to abandon a transaction and then have it inadvertantly cleared by + // to abandon a transaction and then have it inadvertently cleared by // the notification that the conflicted transaction was evicted. MemPoolConflictRemovalTracker mrt(mempool); CBlockIndex *pindexOldTip = chainActive.Tip(); diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 4210ea05e..ee6481f9d 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -82,7 +82,7 @@ UniValue importprivkey(const JSONRPCRequest& request) if (request.fHelp || request.params.size() < 1 || request.params.size() > 3) throw runtime_error( - "importprivkey \"bitcoinprivkey\" ( \"label\" ) ( rescan )\n" + "importprivkey \"dogecoinprivkey\" ( \"label\" ) ( rescan )\n" "\nAdds a private key (as returned by dumpprivkey) to your wallet.\n" "\nArguments:\n" "1. \"dogecoinprivkey\" (string, required) The private key (see dumpprivkey)\n"