diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 8768a8ca6..3cf9ab8a9 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,6 +1,6 @@ - - + diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 00d5478c4..2fe8366a8 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,7 +2,7 @@ Pull requests without a rationale and clear improvement may be closed immediately. Please provide clear motivation for your patch and explain how it improves -Bitcoin Core user experience or Bitcoin Core developer experience +NYC3 Core user experience or NYC3 Core developer experience significantly. * Any test improvements or new tests that improve coverage are always welcome. @@ -15,7 +15,7 @@ significantly. was fixed. * Features are welcome, but might be rejected due to design or scope issues. If a feature is based on a lot of dependencies, contributors should first - consider building the system outside of Bitcoin Core, if possible. + consider building the system outside of NYC3 Core, if possible. * Refactoring changes are only accepted if they are required for a feature or bug fix or otherwise improve developer experience significantly. For example, most "code style" refactoring changes require a thorough explanation why they @@ -25,7 +25,7 @@ significantly. preferred in the [developer notes](/doc/developer-notes.md), stylistic code changes are usually rejected. -Bitcoin Core has a thorough review process and even the most trivial change +NYC3 Core has a thorough review process and even the most trivial change needs to pass a lot of eyes and requires non-zero or even substantial time effort to review. There is a huge lack of active reviewers on the project, so patches often sit for a long time. diff --git a/.gitignore b/.gitignore index be784024a..2d2c1bf90 100644 --- a/.gitignore +++ b/.gitignore @@ -83,7 +83,7 @@ src/qt/bitcoin-qt.includes *.qm Makefile bitcoin-qt -Bitcoin-Qt.app +NYC3-Qt.app background.tiff* # Unit-tests diff --git a/.travis/lint_04_install.sh b/.travis/lint_04_install.sh index 9a22773e5..1edff7225 100755 --- a/.travis/lint_04_install.sh +++ b/.travis/lint_04_install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/.travis/lint_05_before_script.sh b/.travis/lint_05_before_script.sh index 28bcbb47f..15dcbdc59 100755 --- a/.travis/lint_05_before_script.sh +++ b/.travis/lint_05_before_script.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/.travis/lint_06_script.sh b/.travis/lint_06_script.sh index 701e6d800..ba5036477 100755 --- a/.travis/lint_06_script.sh +++ b/.travis/lint_06_script.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/.travis/test_03_before_install.sh b/.travis/test_03_before_install.sh index 3c9fcf3f9..f73cf7fcd 100755 --- a/.travis/test_03_before_install.sh +++ b/.travis/test_03_before_install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/.travis/test_04_install.sh b/.travis/test_04_install.sh index 8055bbdd1..1edd05afa 100755 --- a/.travis/test_04_install.sh +++ b/.travis/test_04_install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/.travis/test_05_before_script.sh b/.travis/test_05_before_script.sh index 70caee979..b30054105 100755 --- a/.travis/test_05_before_script.sh +++ b/.travis/test_05_before_script.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/.travis/test_06_script_a.sh b/.travis/test_06_script_a.sh index 8cc593f93..b471f4e20 100755 --- a/.travis/test_06_script_a.sh +++ b/.travis/test_06_script_a.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/.travis/test_06_script_b.sh b/.travis/test_06_script_b.sh index e13abfd52..a70f761af 100755 --- a/.travis/test_06_script_b.sh +++ b/.travis/test_06_script_b.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7f5b0e471..9b79622bc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -200,7 +200,7 @@ workload on reviewing. ------------------------- The following applies to code changes to the NYC3 project (and related -projects such as libsecp256k1), and is not to be confused with overall Bitcoin +projects such as libsecp256k1), and is not to be confused with overall NYC3 Network Protocol consensus changes. Whether a pull request is merged into NYC3 rests with the project merge @@ -221,7 +221,7 @@ In general, all pull requests must: - Where bugs are fixed, where possible, there should be unit tests demonstrating the bug and also proving the fix. This helps prevent regression. -Patches that change Bitcoin consensus rules are considerably more involved than +Patches that change NYC3 consensus rules are considerably more involved than normal because they affect the entire ecosystem and so must be preceded by extensive mailing list discussions and have a numbered BIP. While each case will be different, one should be prepared to expend more time and effort than for @@ -262,7 +262,7 @@ higher in terms of discussion and peer review requirements, keeping in mind that mistakes could be very costly to the wider community. This includes refactoring of consensus critical code. -Where a patch set proposes to change the Bitcoin consensus, it must have been +Where a patch set proposes to change the NYC3 consensus, it must have been discussed extensively on the mailing list and IRC, be accompanied by a widely discussed BIP and have a generally widely perceived technical consensus of being a worthwhile change based on the judgement of the maintainers. diff --git a/COPYING b/COPYING index 9d54ecbde..6b71a7146 100644 --- a/COPYING +++ b/COPYING @@ -1,7 +1,7 @@ The MIT License (MIT) -Copyright (c) 2009-2019 The Bitcoin Core developers -Copyright (c) 2009-2019 Bitcoin Developers +Copyright (c) 2009-2019 The NYC3 Core developers +Copyright (c) 2009-2019 NYC3 Developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/INSTALL.md b/INSTALL.md index bc29c6280..5edba29c4 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,5 +1,5 @@ -Building Bitcoin +Building NYC3 ================ See doc/build-*.md for instructions on building the various -elements of the NYC3 reference implementation of Bitcoin. +elements of the NYC3 reference implementation of NYC3. diff --git a/Makefile.am b/Makefile.am index 85674f819..5efcee29b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (c) 2013-2016 The Bitcoin Core developers +# Copyright (c) 2013-2016 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -26,7 +26,7 @@ BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EX empty := space := $(empty) $(empty) -OSX_APP=Bitcoin-Qt.app +OSX_APP=NYC3-Qt.app OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME)) OSX_DMG = $(OSX_VOLNAME).dmg OSX_BACKGROUND_SVG=background.svg @@ -35,7 +35,7 @@ OSX_BACKGROUND_IMAGE_DPIS=36 72 OSX_DSSTORE_GEN=$(top_srcdir)/contrib/macdeploy/custom_dsstore.py OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist -OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns +OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/nyc3.icns OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW @@ -94,11 +94,11 @@ $(OSX_APP)/Contents/Info.plist: $(OSX_PLIST) $(MKDIR_P) $(@D) $(INSTALL_DATA) $< $@ -$(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS) +$(OSX_APP)/Contents/Resources/nyc3.icns: $(OSX_INSTALLER_ICONS) $(MKDIR_P) $(@D) $(INSTALL_DATA) $< $@ -$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: all-recursive +$(OSX_APP)/Contents/MacOS/NYC3-Qt: all-recursive $(MKDIR_P) $(@D) STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $@ @@ -107,8 +107,8 @@ $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings: echo '{ CFBundleDisplayName = "$(PACKAGE_NAME)"; CFBundleName = "$(PACKAGE_NAME)"; }' > $@ OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \ - $(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \ - $(OSX_APP)/Contents/MacOS/Bitcoin-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings + $(OSX_APP)/Contents/Resources/nyc3.icns $(OSX_APP)/Contents/Info.plist \ + $(OSX_APP)/Contents/MacOS/NYC3-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings osx_volname: echo $(OSX_VOLNAME) >$@ @@ -133,7 +133,7 @@ $(APP_DIST_DIR)/Applications: @rm -f $@ @cd $(@D); $(LN_S) /Applications $(@F) -$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt +$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/NYC3-Qt $(OSX_DMG): $(APP_DIST_EXTRAS) $(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -apple -o $@ dist @@ -148,7 +148,7 @@ $(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE_DPIF $(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN) $(PYTHON) $< "$@" "$(OSX_VOLNAME)" -$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) +$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/NYC3-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2 deploydir: $(APP_DIST_EXTRAS) diff --git a/README.md b/README.md index c340f5bbe..c599d6a37 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ NYC3 (NewYorkCoin3) integration/staging tree ============================================ -Built upon Bitcoin Core 0.18; NYC3 offers a blocktime of 10 seconds, consensus operates using a modified version of the Argon2 password hashing algorithm (http://github.com/barrystyle/argon2s) in a POW configuration and uses LWMA3 to regulate block-spacing. +Built upon NYC3 Core 0.18; NYC3 offers a blocktime of 10 seconds, consensus operates using a modified version of the Argon2 password hashing algorithm (http://github.com/barrystyle/argon2s) in a POW configuration and uses LWMA3 to regulate block-spacing. License diff --git a/autogen.sh b/autogen.sh index 180b8702c..b7bb5f4c1 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2013-2016 The Bitcoin Core developers +# Copyright (c) 2013-2016 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/build-aux/m4/bitcoin_find_bdb48.m4 b/build-aux/m4/bitcoin_find_bdb48.m4 index ea9c795da..47adf94e5 100644 --- a/build-aux/m4/bitcoin_find_bdb48.m4 +++ b/build-aux/m4/bitcoin_find_bdb48.m4 @@ -1,4 +1,4 @@ -dnl Copyright (c) 2013-2015 The Bitcoin Core developers +dnl Copyright (c) 2013-2015 The NYC3 Core developers dnl Distributed under the MIT software license, see the accompanying dnl file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index 1a7c5d5f7..f1bc378bb 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -1,4 +1,4 @@ -dnl Copyright (c) 2013-2016 The Bitcoin Core developers +dnl Copyright (c) 2013-2016 The NYC3 Core developers dnl Distributed under the MIT software license, see the accompanying dnl file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/build-aux/m4/bitcoin_subdir_to_include.m4 b/build-aux/m4/bitcoin_subdir_to_include.m4 index 7841042ac..0c4ec9b26 100644 --- a/build-aux/m4/bitcoin_subdir_to_include.m4 +++ b/build-aux/m4/bitcoin_subdir_to_include.m4 @@ -1,4 +1,4 @@ -dnl Copyright (c) 2013-2014 The Bitcoin Core developers +dnl Copyright (c) 2013-2014 The NYC3 Core developers dnl Distributed under the MIT software license, see the accompanying dnl file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/build_msvc/README.md b/build_msvc/README.md index 3d5e0bd71..6f250a300 100644 --- a/build_msvc/README.md +++ b/build_msvc/README.md @@ -9,7 +9,7 @@ Building with Visual Studio is an alternative to the Linux based [cross-compiler Dependencies --------------------- -A number of [open source libraries](https://github.com/bitcoin/bitcoin/blob/master/doc/dependencies.md) are required in order to be able to build Bitcoin. +A number of [open source libraries](https://github.com/bitcoin/bitcoin/blob/master/doc/dependencies.md) are required in order to be able to build NYC3. Options for installing the dependencies in a Visual Studio compatible manner are: diff --git a/build_msvc/bitcoin_config.h b/build_msvc/bitcoin_config.h index 4d22f0f7b..26266fb09 100644 --- a/build_msvc/bitcoin_config.h +++ b/build_msvc/bitcoin_config.h @@ -23,7 +23,7 @@ #define COPYRIGHT_HOLDERS "The %s developers" /* Copyright holder(s) */ -#define COPYRIGHT_HOLDERS_FINAL "The Bitcoin Core developers" +#define COPYRIGHT_HOLDERS_FINAL "The NYC3 Core developers" /* Replacement for %s in copyright holders string */ #define COPYRIGHT_HOLDERS_SUBSTITUTION "NYC3" diff --git a/configure.ac b/configure.ac index 4b8688e56..ded5da4bb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) -define(_CLIENT_VERSION_MAJOR, 0) -define(_CLIENT_VERSION_MINOR, 18) +define(_CLIENT_VERSION_MAJOR, 1) +define(_CLIENT_VERSION_MINOR, 1) define(_CLIENT_VERSION_REVISION, 0) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_RC, 0) diff --git a/contrib/README.md b/contrib/README.md index 44cdba646..010413244 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -13,7 +13,7 @@ Construct a linear, no-fork, best version of the blockchain. ### [Qos](/contrib/qos) ### -A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Bitcoin network. This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it. +A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the NYC3 network. This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it. ### [Seeds](/contrib/seeds) ### Utility to generate the pnSeed[] array that is compiled into the client. @@ -42,7 +42,7 @@ Test and Verify Tools --------------------- ### [TestGen](/contrib/testgen) ### -Utilities to generate test vectors for the data-driven Bitcoin tests. +Utilities to generate test vectors for the data-driven NYC3 tests. ### [Verify Binaries](/contrib/verifybinaries) ### This script attempts to download and verify the signature file SHA256SUMS.asc from bitcoin.org. diff --git a/contrib/bitcoin-cli.bash-completion b/contrib/bitcoin-cli.bash-completion index f4cac8418..139a0a63a 100644 --- a/contrib/bitcoin-cli.bash-completion +++ b/contrib/bitcoin-cli.bash-completion @@ -1,5 +1,5 @@ # bash programmable completion for bitcoin-cli(1) -# Copyright (c) 2012-2016 The Bitcoin Core developers +# Copyright (c) 2012-2016 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/contrib/bitcoin-tx.bash-completion b/contrib/bitcoin-tx.bash-completion index a83d2979e..e9a3c7f3a 100644 --- a/contrib/bitcoin-tx.bash-completion +++ b/contrib/bitcoin-tx.bash-completion @@ -1,5 +1,5 @@ # bash programmable completion for bitcoin-tx(1) -# Copyright (c) 2016 The Bitcoin Core developers +# Copyright (c) 2016 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/contrib/bitcoind.bash-completion b/contrib/bitcoind.bash-completion index cccd4bde0..ed9a33429 100644 --- a/contrib/bitcoind.bash-completion +++ b/contrib/bitcoind.bash-completion @@ -1,5 +1,5 @@ # bash programmable completion for bitcoind(1) and bitcoin-qt(1) -# Copyright (c) 2012-2016 The Bitcoin Core developers +# Copyright (c) 2012-2016 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/contrib/debian/copyright b/contrib/debian/copyright index 11992809f..6619021e5 100644 --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -1,5 +1,5 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: Bitcoin +Upstream-Name: NYC3 Upstream-Contact: Satoshi Nakamoto irc://#bitcoin@freenode.net Source: https://github.com/bitcoin/bitcoin diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md index 27e555545..f9ca16164 100644 --- a/contrib/devtools/README.md +++ b/contrib/devtools/README.md @@ -36,31 +36,31 @@ Specifying `verbose` will list the full filenames of files of each category. copyright\_header.py update \ [verbose] --------------------------------------------------------- -Updates all the copyright headers of `The Bitcoin Core developers` which were +Updates all the copyright headers of `The NYC3 Core developers` which were changed in a year more recent than is listed. For example: ``` -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The NYC3 Core developers ``` will be updated to: ``` -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The NYC3 Core developers ``` where `` is obtained from the `git log` history. This subcommand also handles copyright headers that have only a single year. In those cases: ``` -// Copyright (c) The Bitcoin Core developers +// Copyright (c) The NYC3 Core developers ``` will be updated to: ``` -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The NYC3 Core developers ``` where the update is appropriate. copyright\_header.py insert \ ------------------------------------ -Inserts a copyright header for `The Bitcoin Core developers` at the top of the +Inserts a copyright header for `The NYC3 Core developers` at the top of the file in either Python or C++ style as determined by the file extension. If the file is a Python file and it has `#!` starting the first line, the header is inserted in the line below it. @@ -70,7 +70,7 @@ The copyright dates will be set to be `-` where `` is equal to ``, it will be set as a single year rather than two hyphenated years. -If the file already has a copyright for `The Bitcoin Core developers`, the +If the file already has a copyright for `The NYC3 Core developers`, the script will exit. gen-manpages.sh diff --git a/contrib/devtools/copyright_header.py b/contrib/devtools/copyright_header.py index 726e03b0c..e3ac21b29 100755 --- a/contrib/devtools/copyright_header.py +++ b/contrib/devtools/copyright_header.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2018 The Bitcoin Core developers +# Copyright (c) 2016-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -89,7 +89,7 @@ def compile_copyright_regex(copyright_style, year_style, name): EXPECTED_HOLDER_NAMES = [ "Satoshi Nakamoto\n", - "The Bitcoin Core developers\n", + "The NYC3 Core developers\n", "NYC3 Developers\n", "BitPay Inc\.\n", "University of Illinois at Urbana-Champaign\.\n", @@ -334,7 +334,7 @@ def write_file_lines(filename, file_lines): COPYRIGHT = 'Copyright \(c\)' YEAR = "20[0-9][0-9]" YEAR_RANGE = '(%s)(-%s)?' % (YEAR, YEAR) -HOLDER = 'The Bitcoin Core developers' +HOLDER = 'The NYC3 Core developers' UPDATEABLE_LINE_COMPILED = re.compile(' '.join([COPYRIGHT, YEAR_RANGE, HOLDER])) def get_updatable_copyright_line(file_lines): @@ -399,24 +399,24 @@ def exec_update_header_year(base_directory): ################################################################################ UPDATE_USAGE = """ -Updates all the copyright headers of "The Bitcoin Core developers" which were +Updates all the copyright headers of "The NYC3 Core developers" which were changed in a year more recent than is listed. For example: -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The NYC3 Core developers will be updated to: -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The NYC3 Core developers where is obtained from the 'git log' history. This subcommand also handles copyright headers that have only a single year. In those cases: -// Copyright (c) The Bitcoin Core developers +// Copyright (c) The NYC3 Core developers will be updated to: -// Copyright (c) - The Bitcoin Core developers +// Copyright (c) - The NYC3 Core developers where the update is appropriate. @@ -449,7 +449,7 @@ def get_header_lines(header, start_year, end_year): return [line + '\n' for line in lines] CPP_HEADER = ''' -// Copyright (c) %s The Bitcoin Core developers +// Copyright (c) %s The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' @@ -458,7 +458,7 @@ def get_cpp_header_lines_to_insert(start_year, end_year): return reversed(get_header_lines(CPP_HEADER, start_year, end_year)) PYTHON_HEADER = ''' -# Copyright (c) %s The Bitcoin Core developers +# Copyright (c) %s The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' @@ -512,7 +512,7 @@ def insert_cpp_header(filename, file_lines, start_year, end_year): def exec_insert_header(filename, style): file_lines = read_file_lines(filename) if file_already_has_core_copyright(file_lines): - sys.exit('*** %s already has a copyright by The Bitcoin Core developers' + sys.exit('*** %s already has a copyright by The NYC3 Core developers' % (filename)) start_year, end_year = get_git_change_year_range(filename) if style == 'python': @@ -525,7 +525,7 @@ def exec_insert_header(filename, style): ################################################################################ INSERT_USAGE = """ -Inserts a copyright header for "The Bitcoin Core developers" at the top of the +Inserts a copyright header for "The NYC3 Core developers" at the top of the file in either Python or C++ style as determined by the file extension. If the file is a Python file and it has a '#!' starting the first line, the header is inserted in the line below it. @@ -539,7 +539,7 @@ where is according to the 'git log' history. If "" -If the file already has a copyright for "The Bitcoin Core developers", the +If the file already has a copyright for "The NYC3 Core developers", the script will exit. Usage: @@ -571,7 +571,7 @@ def insert_cmd(argv): ################################################################################ USAGE = """ -copyright_header.py - utilities for managing copyright headers of 'The Bitcoin +copyright_header.py - utilities for managing copyright headers of 'The NYC3 Core developers' in repository source files. Usage: diff --git a/contrib/devtools/optimize-pngs.py b/contrib/devtools/optimize-pngs.py index e9481dbbc..75a7666a4 100755 --- a/contrib/devtools/optimize-pngs.py +++ b/contrib/devtools/optimize-pngs.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' diff --git a/contrib/devtools/security-check.py b/contrib/devtools/security-check.py index 44b7f6c7c..04f2d12cb 100755 --- a/contrib/devtools/security-check.py +++ b/contrib/devtools/security-check.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' diff --git a/contrib/devtools/test-security-check.py b/contrib/devtools/test-security-check.py index fd374f632..4b4dbfe6a 100755 --- a/contrib/devtools/test-security-check.py +++ b/contrib/devtools/test-security-check.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' diff --git a/contrib/devtools/update-translations.py b/contrib/devtools/update-translations.py index 1b9d3a4c2..3aecde5d7 100755 --- a/contrib/devtools/update-translations.py +++ b/contrib/devtools/update-translations.py @@ -30,7 +30,7 @@ SOURCE_LANG = 'bitcoin_en.ts' LOCALE_DIR = 'src/qt/locale' # Minimum number of messages for translation to be considered at all MIN_NUM_MESSAGES = 10 -# Regexp to check for Bitcoin addresses +# Regexp to check for NYC3 addresses ADDRESS_REGEXP = re.compile('([13]|bc1)[a-zA-Z0-9]{30,}') def check_at_repository_root(): diff --git a/contrib/gitian-build.py b/contrib/gitian-build.py index fc7fbb764..c680e59c0 100755 --- a/contrib/gitian-build.py +++ b/contrib/gitian-build.py @@ -29,7 +29,7 @@ def setup(): if not os.path.isdir('gitian-builder'): subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git']) if not os.path.isdir('bitcoin'): - subprocess.check_call(['git', 'clone', 'https://github.com/bitcoin/bitcoin.git']) + subprocess.check_call(['git', 'clone', 'https://github.com/nyc3coin/nyc3']) os.chdir('gitian-builder') make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64'] if args.docker: diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 2f0231fa9..2eab61a5c 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-linux-0.18" +name: "nyc3-linux-0.18" enable_cache: true suites: - "bionic" @@ -32,12 +32,15 @@ packages: - "ca-certificates" - "python" remotes: -- "url": "https://github.com/bitcoin/bitcoin.git" - "dir": "bitcoin" +- "url": "https://github.com/nyc3coin/nyc3" + "dir": "nyc3" +- "url": "https://github.com/barrystyle/argon2s.git" + "dir": "argon2s" files: [] script: | set -e -o pipefail - +#this is a hack since gitian has no natural support for submodules + cp -r argon2s/* nyc3/src/argon2s WRAP_DIR=$HOME/wrapped HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu" CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests" @@ -122,7 +125,7 @@ script: | chmod +x ${WRAP_DIR}/${prog} done - cd bitcoin + cd nyc3 BASEPREFIX=`pwd`/depends # Build dependencies for each host for i in $HOSTS; do @@ -144,13 +147,13 @@ script: | ./autogen.sh CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ make dist - SOURCEDIST=`echo bitcoin-*.tar.gz` + SOURCEDIST=`echo nyc3-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find nyc3-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST popd # Workaround for tarball not building with the bare tag version (prep) diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml index df6cddbf0..72b7167b0 100644 --- a/contrib/gitian-descriptors/gitian-osx-signer.yml +++ b/contrib/gitian-descriptors/gitian-osx-signer.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-dmg-signer" +name: "nyc3-dmg-signer" suites: - "bionic" architectures: diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index f250909de..817c8ff4a 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-osx-0.18" +name: "nyc3-osx-0.18" enable_cache: true suites: - "bionic" @@ -28,13 +28,17 @@ packages: - "python-setuptools" - "fonts-tuffy" remotes: -- "url": "https://github.com/bitcoin/bitcoin.git" - "dir": "bitcoin" +- "url": "https://github.com/nyc3coin/nyc3" + "dir": "nyc3" +- "url": "https://github.com/barrystyle/argon2s.git" + "dir": "argon2s" files: - "MacOSX10.11.sdk.tar.gz" script: | set -e -o pipefail - +#this is a hack since gitian has no natural support for submodules + cp -r argon2s/* nyc3/src/argon2s + #make sure this file exists... WRAP_DIR=$HOME/wrapped HOSTS="x86_64-apple-darwin14" CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage" @@ -86,7 +90,7 @@ script: | create_per-host_faketime_wrappers "2000-01-01 12:00:00" export PATH=${WRAP_DIR}:${PATH} - cd bitcoin + cd nyc3 BASEPREFIX=`pwd`/depends mkdir -p ${BASEPREFIX}/SDKs @@ -107,14 +111,14 @@ script: | ./autogen.sh CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ make dist - SOURCEDIST=`echo bitcoin-*.tar.gz` + SOURCEDIST=`echo nyc3-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find nyc3-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST popd # Workaround for tarball not building with the bare tag version (prep) diff --git a/contrib/gitian-descriptors/gitian-win-signer.yml b/contrib/gitian-descriptors/gitian-win-signer.yml index 08d20177a..3ab010d07 100644 --- a/contrib/gitian-descriptors/gitian-win-signer.yml +++ b/contrib/gitian-descriptors/gitian-win-signer.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-win-signer" +name: "nyc3-win-signer" suites: - "bionic" architectures: diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index fedd87fcc..81706dc46 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-win-0.18" +name: "nyc3-win-0.18" enable_cache: true suites: - "bionic" @@ -23,12 +23,15 @@ packages: - "python" - "rename" remotes: -- "url": "https://github.com/bitcoin/bitcoin.git" - "dir": "bitcoin" +- "url": "https://github.com/nyc3coin/nyc3" + "dir": "nyc3" +- "url": "https://github.com/barrystyle/argon2s.git" + "dir": "argon2s" files: [] script: | set -e -o pipefail - +#this is a hack since gitian has no natural support for submodules + cp -r argon2s/* nyc3/src/argon2s WRAP_DIR=$HOME/wrapped HOSTS="i686-w64-mingw32 x86_64-w64-mingw32" CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests" @@ -76,7 +79,7 @@ script: | function create_per-host_linker_wrapper { # This is only needed for trusty, as the mingw linker leaks a few bytes of - # heap, causing non-determinism. See discussion in https://github.com/bitcoin/bitcoin/pull/6900 + # heap, causing non-determinism. See discussion in https://github.com/nyc3/nyc3/pull/6900 for i in $HOSTS; do mkdir -p ${WRAP_DIR}/${i} for prog in collect2; do @@ -105,7 +108,7 @@ script: | create_per-host_linker_wrapper "2000-01-01 12:00:00" export PATH=${WRAP_DIR}:${PATH} - cd bitcoin + cd nyc3 BASEPREFIX=`pwd`/depends # Build dependencies for each host for i in $HOSTS; do @@ -123,14 +126,14 @@ script: | ./autogen.sh CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ make dist - SOURCEDIST=`echo bitcoin-*.tar.gz` + SOURCEDIST=`echo nyc3-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find nyc3-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST mkdir -p $OUTDIR/src cp ../$SOURCEDIST $OUTDIR/src popd @@ -159,7 +162,7 @@ script: | make deploy make install DESTDIR=${INSTALLPATH} rename 's/-setup\.exe$/-setup-unsigned.exe/' *-setup.exe - cp -f bitcoin-*setup*.exe $OUTDIR/ + cp -f nyc3-*setup*.exe $OUTDIR/ cd installed mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/ find . -name "lib*.la" -delete @@ -175,7 +178,7 @@ script: | cp -rf contrib/windeploy $BUILD_DIR cd $BUILD_DIR/windeploy mkdir unsigned - cp $OUTDIR/bitcoin-*setup-unsigned.exe unsigned/ + cp $OUTDIR/nyc3-*setup-unsigned.exe unsigned/ find . | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.zip ${OUTDIR}/${DISTNAME}-win64-debug.zip mv ${OUTDIR}/${DISTNAME}-i686-*-debug.zip ${OUTDIR}/${DISTNAME}-win32-debug.zip diff --git a/contrib/init/bitcoind.conf b/contrib/init/bitcoind.conf index 77553a676..58b479981 100644 --- a/contrib/init/bitcoind.conf +++ b/contrib/init/bitcoind.conf @@ -38,7 +38,7 @@ pre-start script echo "It is recommended that you also set alertnotify so you are " echo "notified of problems:" echo - echo "ie: alertnotify=echo %%s | mail -s \"Bitcoin Alert\"" \ + echo "ie: alertnotify=echo %%s | mail -s \"NYC3 Alert\"" \ "admin@foo.com" echo exit 1 diff --git a/contrib/init/bitcoind.openrc b/contrib/init/bitcoind.openrc index 55a043c6b..e55fb5325 100644 --- a/contrib/init/bitcoind.openrc +++ b/contrib/init/bitcoind.openrc @@ -19,7 +19,7 @@ BITCOIND_NICE=${BITCOIND_NICE:-${NICELEVEL:-0}} BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}" name="NYC3 Daemon" -description="Bitcoin cryptocurrency P2P network daemon" +description="NYC3 cryptocurrency P2P network daemon" command="/usr/bin/bitcoind" command_args="-pid=\"${BITCOIND_PIDFILE}\" \ @@ -84,7 +84,7 @@ checkconfig() eerror "It is recommended that you also set alertnotify so you are " eerror "notified of problems:" eerror "" - eerror "ie: alertnotify=echo %%s | mail -s \"Bitcoin Alert\"" \ + eerror "ie: alertnotify=echo %%s | mail -s \"NYC3 Alert\"" \ "admin@foo.com" eerror "" return 1 diff --git a/contrib/init/bitcoind.service b/contrib/init/bitcoind.service index cfc5f7758..82829c538 100644 --- a/contrib/init/bitcoind.service +++ b/contrib/init/bitcoind.service @@ -9,7 +9,7 @@ # in ExecStart= [Unit] -Description=Bitcoin daemon +Description=NYC3 daemon After=network.target [Service] diff --git a/contrib/linearize/README.md b/contrib/linearize/README.md index 298510698..9d3b8c888 100644 --- a/contrib/linearize/README.md +++ b/contrib/linearize/README.md @@ -1,5 +1,5 @@ # Linearize -Construct a linear, no-fork, best version of the Bitcoin blockchain. The scripts +Construct a linear, no-fork, best version of the NYC3 blockchain. The scripts run using Python 3 but are compatible with Python 2. ## Step 1: Download hash list diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py index 56c1fbfc9..ef4468e56 100755 --- a/contrib/linearize/linearize-data.py +++ b/contrib/linearize/linearize-data.py @@ -2,7 +2,7 @@ # # linearize-data.py: Construct a linear, no-fork version of the chain. # -# Copyright (c) 2013-2018 The Bitcoin Core developers +# Copyright (c) 2013-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py index 8529470e0..cee7cdf59 100755 --- a/contrib/linearize/linearize-hashes.py +++ b/contrib/linearize/linearize-hashes.py @@ -2,7 +2,7 @@ # # linearize-hashes.py: List blocks in a linear, no-fork version of the chain. # -# Copyright (c) 2013-2018 The Bitcoin Core developers +# Copyright (c) 2013-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # @@ -22,7 +22,7 @@ def hex_switchEndian(s): pairList = [s[i:i+2].encode() for i in range(0, len(s), 2)] return b''.join(pairList[::-1]).decode() -class BitcoinRPC: +class NYC3RPC: def __init__(self, host, port, username, password): authpair = "%s:%s" % (username, password) authpair = authpair.encode('utf-8') @@ -64,7 +64,7 @@ class BitcoinRPC: return 'error' in resp_obj and resp_obj['error'] is not None def get_block_hashes(settings, max_blocks_per_call=10000): - rpc = BitcoinRPC(settings['host'], settings['port'], + rpc = NYC3RPC(settings['host'], settings['port'], settings['rpcuser'], settings['rpcpassword']) height = settings['min_height'] diff --git a/contrib/macdeploy/README.md b/contrib/macdeploy/README.md index 6163734e6..015e27ec4 100644 --- a/contrib/macdeploy/README.md +++ b/contrib/macdeploy/README.md @@ -11,5 +11,5 @@ This script should not be run manually, instead, after building as usual: During the process, the disk image window will pop up briefly where the fancy settings are applied. This is normal, please do not interfere. -When finished, it will produce `Bitcoin-Core.dmg`. +When finished, it will produce `NYC3-Core.dmg`. diff --git a/contrib/macdeploy/background.svg b/contrib/macdeploy/background.svg index 9c330af45..6a3b83318 100644 --- a/contrib/macdeploy/background.svg +++ b/contrib/macdeploy/background.svg @@ -3,7 +3,7 @@ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"> diff --git a/contrib/macdeploy/custom_dsstore.py b/contrib/macdeploy/custom_dsstore.py index dc1c1882d..086234c05 100755 --- a/contrib/macdeploy/custom_dsstore.py +++ b/contrib/macdeploy/custom_dsstore.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2013-2018 The Bitcoin Core developers +# Copyright (c) 2013-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. import biplist @@ -53,7 +53,7 @@ ds['.']['icvp'] = icvp ds['.']['vSrn'] = ('long', 1) ds['Applications']['Iloc'] = (370, 156) -ds['Bitcoin-Qt.app']['Iloc'] = (128, 156) +ds['NYC3-Qt.app']['Iloc'] = (128, 156) ds.flush() ds.close() diff --git a/contrib/macdeploy/detached-sig-apply.sh b/contrib/macdeploy/detached-sig-apply.sh index f8503e4de..483839f09 100755 --- a/contrib/macdeploy/detached-sig-apply.sh +++ b/contrib/macdeploy/detached-sig-apply.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2014-2015 The Bitcoin Core developers +# Copyright (c) 2014-2015 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/contrib/macdeploy/detached-sig-create.sh b/contrib/macdeploy/detached-sig-create.sh index 5281ebcc4..9a50b0be4 100755 --- a/contrib/macdeploy/detached-sig-create.sh +++ b/contrib/macdeploy/detached-sig-create.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2014-2015 The Bitcoin Core developers +# Copyright (c) 2014-2015 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -7,7 +7,7 @@ export LC_ALL=C set -e ROOTDIR=dist -BUNDLE="${ROOTDIR}/Bitcoin-Qt.app" +BUNDLE="${ROOTDIR}/NYC3-Qt.app" CODESIGN=codesign TEMPDIR=sign.temp TEMPLIST=${TEMPDIR}/signatures.txt diff --git a/contrib/macdeploy/extract-osx-sdk.sh b/contrib/macdeploy/extract-osx-sdk.sh index 4c175156f..8b205425f 100755 --- a/contrib/macdeploy/extract-osx-sdk.sh +++ b/contrib/macdeploy/extract-osx-sdk.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (c) 2016 The Bitcoin Core developers +# Copyright (c) 2016 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index 9da03e5b0..fb851209b 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -154,7 +154,7 @@ class FrameworkInfo(object): class ApplicationBundleInfo(object): def __init__(self, path): self.path = path - appName = "Bitcoin-Qt" + appName = "NYC3-Qt" self.binaryPath = os.path.join(path, "Contents", "MacOS", appName) if not os.path.exists(self.binaryPath): raise RuntimeError("Could not find bundle binary for " + path) @@ -596,7 +596,7 @@ else: # ------------------------------------------------ -target = os.path.join("dist", "Bitcoin-Qt.app") +target = os.path.join("dist", "NYC3-Qt.app") if verbose >= 2: print("+ Copying source bundle +") diff --git a/contrib/qos/README.md b/contrib/qos/README.md index 0ded87c58..df291d22a 100644 --- a/contrib/qos/README.md +++ b/contrib/qos/README.md @@ -1,5 +1,5 @@ ### QoS (Quality of service) ### -This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. It limits outbound TCP traffic with a source or destination port of 8333, but not if the destination IP is within a LAN. +This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the NYC3 network. It limits outbound TCP traffic with a source or destination port of 8333, but not if the destination IP is within a LAN. This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it. diff --git a/contrib/qos/tc.sh b/contrib/qos/tc.sh index 5f9b87d9b..ef62b4927 100644 --- a/contrib/qos/tc.sh +++ b/contrib/qos/tc.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -9,7 +9,7 @@ export LC_ALL=C IF="eth0" #limit of the network interface in question LINKCEIL="1gbit" -#limit outbound Bitcoin protocol traffic to this rate +#limit outbound NYC3 protocol traffic to this rate LIMIT="160kbit" #defines the IPv4 address space for which you wish to disable rate limiting LOCALNET_V4="192.168.0.0/16" diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py index 6527deccf..32d95575c 100755 --- a/contrib/seeds/makeseeds.py +++ b/contrib/seeds/makeseeds.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2013-2018 The Bitcoin Core developers +# Copyright (c) 2013-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/contrib/testgen/README.md b/contrib/testgen/README.md index 580ed541c..e0f673569 100644 --- a/contrib/testgen/README.md +++ b/contrib/testgen/README.md @@ -1,6 +1,6 @@ ### TestGen ### -Utilities to generate test vectors for the data-driven Bitcoin tests. +Utilities to generate test vectors for the data-driven NYC3 tests. Usage: diff --git a/contrib/testgen/base58.py b/contrib/testgen/base58.py index da67cb2d9..c0a5ce6e9 100644 --- a/contrib/testgen/base58.py +++ b/contrib/testgen/base58.py @@ -1,8 +1,8 @@ -# Copyright (c) 2012-2018 The Bitcoin Core developers +# Copyright (c) 2012-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' -Bitcoin base58 encoding and decoding. +NYC3 base58 encoding and decoding. Based on https://bitcointalk.org/index.php?topic=1026.0 (public domain) ''' @@ -39,7 +39,7 @@ def b58encode(v): long_value = div result = __b58chars[long_value] + result - # Bitcoin does a little leading-zero-compression: + # NYC3 does a little leading-zero-compression: # leading 0-bytes in the input become leading-1s nPad = 0 for c in v: diff --git a/contrib/testgen/gen_key_io_test_vectors.py b/contrib/testgen/gen_key_io_test_vectors.py index a00acb1f4..6789fae06 100755 --- a/contrib/testgen/gen_key_io_test_vectors.py +++ b/contrib/testgen/gen_key_io_test_vectors.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2012-2018 The Bitcoin Core developers +# Copyright (c) 2012-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' diff --git a/contrib/valgrind.supp b/contrib/valgrind.supp index 0f6d993fd..e8d2ce1e0 100644 --- a/contrib/valgrind.supp +++ b/contrib/valgrind.supp @@ -1,4 +1,4 @@ -# Valgrind suppressions file for Bitcoin. +# Valgrind suppressions file for NYC3. # # Includes known Valgrind warnings in our dependencies that cannot be fixed # in-tree. diff --git a/contrib/verify-commits/gpg.sh b/contrib/verify-commits/gpg.sh index 7a10ba7d7..65be91a7c 100755 --- a/contrib/verify-commits/gpg.sh +++ b/contrib/verify-commits/gpg.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2014-2016 The Bitcoin Core developers +# Copyright (c) 2014-2016 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/contrib/verify-commits/pre-push-hook.sh b/contrib/verify-commits/pre-push-hook.sh index 4db4a9085..de515418e 100755 --- a/contrib/verify-commits/pre-push-hook.sh +++ b/contrib/verify-commits/pre-push-hook.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (c) 2014-2015 The Bitcoin Core developers +# Copyright (c) 2014-2015 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/contrib/verify-commits/verify-commits.py b/contrib/verify-commits/verify-commits.py index 6bbed0107..dac04996f 100755 --- a/contrib/verify-commits/verify-commits.py +++ b/contrib/verify-commits/verify-commits.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Verify commits against a trusted keys list.""" diff --git a/contrib/verifybinaries/verify.sh b/contrib/verifybinaries/verify.sh index 956390a3b..2520b9998 100755 --- a/contrib/verifybinaries/verify.sh +++ b/contrib/verifybinaries/verify.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (c) 2016 The Bitcoin Core developers +# Copyright (c) 2016 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/contrib/windeploy/detached-sig-create.sh b/contrib/windeploy/detached-sig-create.sh index 15f8108cf..48373a634 100755 --- a/contrib/windeploy/detached-sig-create.sh +++ b/contrib/windeploy/detached-sig-create.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2014-2015 The Bitcoin Core developers +# Copyright (c) 2014-2015 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/contrib/zmq/zmq_sub.py b/contrib/zmq/zmq_sub.py index 06893407f..c596c2ea1 100644 --- a/contrib/zmq/zmq_sub.py +++ b/contrib/zmq/zmq_sub.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """ ZMQ example using python3's asyncio - Bitcoin should be started with the command line arguments: + NYC3 should be started with the command line arguments: bitcoind -testnet -daemon \ -zmqpubrawtx=tcp://127.0.0.1:28332 \ -zmqpubrawblock=tcp://127.0.0.1:28332 \ diff --git a/contrib/zmq/zmq_sub3.4.py b/contrib/zmq/zmq_sub3.4.py index 66fdf7887..3a94085c0 100644 --- a/contrib/zmq/zmq_sub3.4.py +++ b/contrib/zmq/zmq_sub3.4.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """ ZMQ example using python3's asyncio - Bitcoin should be started with the command line arguments: + NYC3 should be started with the command line arguments: bitcoind -testnet -daemon \ -zmqpubrawtx=tcp://127.0.0.1:28332 \ -zmqpubrawblock=tcp://127.0.0.1:28332 \ diff --git a/depends/README.md b/depends/README.md index 693bc3619..b16f35c47 100644 --- a/depends/README.md +++ b/depends/README.md @@ -12,9 +12,9 @@ For example: make HOST=x86_64-w64-mingw32 -j4 -A prefix will be generated that's suitable for plugging into Bitcoin's +A prefix will be generated that's suitable for plugging into NYC3's configure. In the above example, a dir named x86_64-w64-mingw32 will be -created. To use it for Bitcoin: +created. To use it for NYC3: ./configure --prefix=`pwd`/depends/x86_64-w64-mingw32 diff --git a/depends/description.md b/depends/description.md index 9fc7093be..bf35a333c 100644 --- a/depends/description.md +++ b/depends/description.md @@ -1,4 +1,4 @@ -This is a system of building and caching dependencies necessary for building Bitcoin. +This is a system of building and caching dependencies necessary for building NYC3. There are several features that make it different from most similar systems: ### It is designed to be builder and host agnostic diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 5d4dd50c8..da922864a 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -1265,7 +1265,7 @@ DOCSET_FEEDNAME = "Doxygen generated docs" # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_DOCSET is set to YES. -DOCSET_BUNDLE_ID = org.bitcoin.Bitcoin-Core +DOCSET_BUNDLE_ID = org.bitcoin.NYC3-Core # The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify # the documentation publisher. This should be a reverse domain-name style @@ -1273,7 +1273,7 @@ DOCSET_BUNDLE_ID = org.bitcoin.Bitcoin-Core # The default value is: org.doxygen.Publisher. # This tag requires that the tag GENERATE_DOCSET is set to YES. -DOCSET_PUBLISHER_ID = org.bitcoin.Bitcoin-Core +DOCSET_PUBLISHER_ID = org.bitcoin.NYC3-Core # The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. # The default value is: Publisher. diff --git a/doc/README.md b/doc/README.md index 8be3c6cbc..f752587e7 100644 --- a/doc/README.md +++ b/doc/README.md @@ -3,7 +3,7 @@ NYC3 Setup --------------------- -NYC3 is the original Bitcoin client and it builds the backbone of the network. It downloads and, by default, stores the entire history of Bitcoin transactions, which requires a few hundred gigabytes of disk space. Depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. +NYC3 is the original NYC3 client and it builds the backbone of the network. It downloads and, by default, stores the entire history of NYC3 transactions, which requires a few hundred gigabytes of disk space. Depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. To download NYC3, visit [bitcoincore.org](https://bitcoincore.org/en/download/). @@ -28,10 +28,10 @@ Drag NYC3 to your applications folder, and then run NYC3. ### Need Help? -* See the documentation at the [Bitcoin Wiki](https://en.bitcoin.it/wiki/Main_Page) +* See the documentation at the [NYC3 Wiki](https://en.bitcoin.it/wiki/Main_Page) for help and more information. * Ask for help on [#bitcoin](http://webchat.freenode.net?channels=bitcoin) on Freenode. If you don't have an IRC client, use [webchat here](http://webchat.freenode.net?channels=bitcoin). -* Ask for help on the [BitcoinTalk](https://bitcointalk.org/) forums, in the [Technical Support board](https://bitcointalk.org/index.php?board=4.0). +* Ask for help on the [NYC3Talk](https://bitcointalk.org/) forums, in the [Technical Support board](https://bitcointalk.org/index.php?board=4.0). Building --------------------- @@ -48,7 +48,7 @@ The following are developer notes on how to build NYC3 on your native platform. Development --------------------- -The Bitcoin repo's [root README](/README.md) contains relevant information on the development process and automated testing. +The NYC3 repo's [root README](/README.md) contains relevant information on the development process and automated testing. - [Developer Notes](developer-notes.md) - [Productivity Notes](productivity.md) @@ -66,9 +66,9 @@ The Bitcoin repo's [root README](/README.md) contains relevant information on th - [Benchmarking](benchmarking.md) ### Resources -* Discuss on the [BitcoinTalk](https://bitcointalk.org/) forums, in the [Development & Technical Discussion board](https://bitcointalk.org/index.php?board=6.0). +* Discuss on the [NYC3Talk](https://bitcointalk.org/) forums, in the [Development & Technical Discussion board](https://bitcointalk.org/index.php?board=6.0). * Discuss project-specific development on #bitcoin-core-dev on Freenode. If you don't have an IRC client, use [webchat here](http://webchat.freenode.net/?channels=bitcoin-core-dev). -* Discuss general Bitcoin development on #bitcoin-dev on Freenode. If you don't have an IRC client, use [webchat here](http://webchat.freenode.net/?channels=bitcoin-dev). +* Discuss general NYC3 development on #bitcoin-dev on Freenode. If you don't have an IRC client, use [webchat here](http://webchat.freenode.net/?channels=bitcoin-dev). ### Miscellaneous - [Assets Attribution](assets-attribution.md) diff --git a/doc/README_windows.txt b/doc/README_windows.txt index 822c8d4b6..aa34df148 100644 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -3,7 +3,7 @@ NYC3 Intro ----- -Bitcoin is a free open source peer-to-peer electronic cash system that is +NYC3 is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. @@ -13,8 +13,8 @@ Setup ----- Unpack the files into a directory and run bitcoin-qt.exe. -NYC3 is the original Bitcoin client and it builds the backbone of the network. -However, it downloads and stores the entire history of Bitcoin transactions; +NYC3 is the original NYC3 client and it builds the backbone of the network. +However, it downloads and stores the entire history of NYC3 transactions; depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. diff --git a/doc/bips.md b/doc/bips.md index 026817aa7..4bb34cf8e 100644 --- a/doc/bips.md +++ b/doc/bips.md @@ -5,7 +5,7 @@ BIPs that are implemented by NYC3 (up-to-date up to **v0.18.0**): * [`BIP 13`](https://github.com/bitcoin/bips/blob/master/bip-0013.mediawiki): The address format for P2SH addresses has been implemented since **v0.6.0** ([PR #669](https://github.com/bitcoin/bitcoin/pull/669)). * [`BIP 14`](https://github.com/bitcoin/bips/blob/master/bip-0014.mediawiki): The subversion string is being used as User Agent since **v0.6.0** ([PR #669](https://github.com/bitcoin/bitcoin/pull/669)). * [`BIP 16`](https://github.com/bitcoin/bips/blob/master/bip-0016.mediawiki): The pay-to-script-hash evaluation rules have been implemented since **v0.6.0**, and took effect on *April 1st 2012* ([PR #748](https://github.com/bitcoin/bitcoin/pull/748)). -* [`BIP 21`](https://github.com/bitcoin/bips/blob/master/bip-0021.mediawiki): The URI format for Bitcoin payments has been implemented since **v0.6.0** ([PR #176](https://github.com/bitcoin/bitcoin/pull/176)). +* [`BIP 21`](https://github.com/bitcoin/bips/blob/master/bip-0021.mediawiki): The URI format for NYC3 payments has been implemented since **v0.6.0** ([PR #176](https://github.com/bitcoin/bitcoin/pull/176)). * [`BIP 22`](https://github.com/bitcoin/bips/blob/master/bip-0022.mediawiki): The 'getblocktemplate' (GBT) RPC protocol for mining has been implemented since **v0.7.0** ([PR #936](https://github.com/bitcoin/bitcoin/pull/936)). * [`BIP 23`](https://github.com/bitcoin/bips/blob/master/bip-0023.mediawiki): Some extensions to GBT have been implemented since **v0.10.0rc1**, including longpolling and block proposals ([PR #1816](https://github.com/bitcoin/bitcoin/pull/1816)). * [`BIP 30`](https://github.com/bitcoin/bips/blob/master/bip-0030.mediawiki): The evaluation rules to forbid creating new transactions with the same txid as previous not-fully-spent transactions were implemented since **v0.6.0**, and the rule took effect on *March 15th 2012* ([PR #915](https://github.com/bitcoin/bitcoin/pull/915)). @@ -35,5 +35,5 @@ BIPs that are implemented by NYC3 (up-to-date up to **v0.18.0**): * [`BIP 152`](https://github.com/bitcoin/bips/blob/master/bip-0152.mediawiki): Compact block transfer and related optimizations are used as of **v0.13.0** ([PR 8068](https://github.com/bitcoin/bitcoin/pull/8068)). * [`BIP 159`](https://github.com/bitcoin/bips/blob/master/bip-0159.mediawiki): The NODE_NETWORK_LIMITED service bit is signalled as of **v0.16.0** ([PR 11740](https://github.com/bitcoin/bitcoin/pull/11740)), and such nodes are connected to as of **v0.17.0** ([PR 10387](https://github.com/bitcoin/bitcoin/pull/10387)). * [`BIP 173`](https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki): Bech32 addresses for native Segregated Witness outputs are supported as of **v0.16.0** ([PR 11167](https://github.com/bitcoin/bitcoin/pull/11167)). -* [`BIP 174`](https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki): RPCs to operate on Partially Signed Bitcoin Transactions (PSBT) are present as of **v0.17.0** ([PR 13557](https://github.com/bitcoin/bitcoin/pull/13557)). +* [`BIP 174`](https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki): RPCs to operate on Partially Signed NYC3 Transactions (PSBT) are present as of **v0.17.0** ([PR 13557](https://github.com/bitcoin/bitcoin/pull/13557)). * [`BIP 176`](https://github.com/bitcoin/bips/blob/master/bip-0176.mediawiki): Bits Denomination [QT only] is supported as of **v0.16.0** ([PR 12035](https://github.com/bitcoin/bitcoin/pull/12035)). diff --git a/doc/bitcoin-conf.md b/doc/bitcoin-conf.md index 88ecb8fe6..86530e44a 100644 --- a/doc/bitcoin-conf.md +++ b/doc/bitcoin-conf.md @@ -32,6 +32,6 @@ Network specific options can be: ## Configuration File Path -The configuration file is not automatically created; you can create it using your favorite text editor. By default, the configuration file name is `bitcoin.conf` and it is located in the Bitcoin data directory, but both the Bitcoin data directory and the configuration file path may be changed using the `-datadir` and `-conf` command-line options. +The configuration file is not automatically created; you can create it using your favorite text editor. By default, the configuration file name is `bitcoin.conf` and it is located in the NYC3 data directory, but both the NYC3 data directory and the configuration file path may be changed using the `-datadir` and `-conf` command-line options. The `includeconf=` option in the `bitcoin.conf` file can be used to include additional configuration files. diff --git a/doc/build-freebsd.md b/doc/build-freebsd.md index 6e6bc320d..be7ee5980 100644 --- a/doc/build-freebsd.md +++ b/doc/build-freebsd.md @@ -13,7 +13,7 @@ You will need the following dependencies, which can be installed as root via pkg ```shell pkg install autoconf automake boost-libs git gmake libevent libtool openssl pkgconf -git clone https://github.com/bitcoin/bitcoin.git +git clone https://github.com/nyc3coin/nyc3 ``` In order to run the test suite (recommended), you will need to have Python 3 installed: diff --git a/doc/build-netbsd.md b/doc/build-netbsd.md index 165ada3c5..d1783bda5 100644 --- a/doc/build-netbsd.md +++ b/doc/build-netbsd.md @@ -22,7 +22,7 @@ libtool pkg-config python37 -git clone https://github.com/bitcoin/bitcoin.git +git clone https://github.com/nyc3coin/nyc3 ``` See [dependencies.md](dependencies.md) for a complete overview. diff --git a/doc/build-openbsd.md b/doc/build-openbsd.md index f9ca4b2c8..8ddb5b652 100644 --- a/doc/build-openbsd.md +++ b/doc/build-openbsd.md @@ -17,7 +17,7 @@ pkg_add autoconf # (select highest version, e.g. 2.69) pkg_add automake # (select highest version, e.g. 1.16) pkg_add python # (select highest version, e.g. 3.6) -git clone https://github.com/bitcoin/bitcoin.git +git clone https://github.com/nyc3coin/nyc3 ``` See [dependencies.md](dependencies.md) for a complete overview. diff --git a/doc/build-osx.md b/doc/build-osx.md index 39b086a8d..d740eacb4 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -82,17 +82,17 @@ NYC3 is now available at `./src/bitcoind` Before running, you may create an empty configuration file: - mkdir -p "/Users/${USER}/Library/Application Support/Bitcoin" + mkdir -p "/Users/${USER}/Library/Application Support/NYC3" - touch "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf" + touch "/Users/${USER}/Library/Application Support/NYC3/bitcoin.conf" - chmod 600 "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf" + chmod 600 "/Users/${USER}/Library/Application Support/NYC3/bitcoin.conf" The first time you run bitcoind, it will start downloading the blockchain. This process could take many hours, or even days on slower than average systems. You can monitor the download process by looking at the debug.log file: - tail -f $HOME/Library/Application\ Support/Bitcoin/debug.log + tail -f $HOME/Library/Application\ Support/NYC3/debug.log Other commands: ------- diff --git a/doc/build-unix.md b/doc/build-unix.md index c19d16548..94de5ff4f 100644 --- a/doc/build-unix.md +++ b/doc/build-unix.md @@ -244,7 +244,7 @@ Setup and Build Example: Arch Linux This example lists the steps necessary to setup and build a command line only, non-wallet distribution of the latest changes on Arch Linux: pacman -S git base-devel boost libevent python - git clone https://github.com/bitcoin/bitcoin.git + git clone https://github.com/nyc3coin/nyc3 cd bitcoin/ ./autogen.sh ./configure --disable-wallet --without-gui --without-miniupnpc diff --git a/doc/build-windows.md b/doc/build-windows.md index 322e902e5..8c164f347 100644 --- a/doc/build-windows.md +++ b/doc/build-windows.md @@ -89,7 +89,7 @@ This means you cannot use a directory that is located directly on the host Windo Acquire the source in the usual way: - git clone https://github.com/bitcoin/bitcoin.git + git clone https://github.com/nyc3coin/nyc3 Once the source code is ready the build steps are below: @@ -117,7 +117,7 @@ This means you cannot use a directory that located directly on the host Windows Acquire the source in the usual way: - git clone https://github.com/bitcoin/bitcoin.git + git clone https://github.com/nyc3coin/nyc3 Then build using: diff --git a/doc/descriptors.md b/doc/descriptors.md index ff504ce7b..be6949436 100644 --- a/doc/descriptors.md +++ b/doc/descriptors.md @@ -100,7 +100,7 @@ not contain "p2" for brevity. ### Multisig Several pieces of software use multi-signature (multisig) scripts based -on Bitcoin's OP_CHECKMULTISIG opcode. To support these, we introduce the +on NYC3's OP_CHECKMULTISIG opcode. To support these, we introduce the `multi(k,key_1,key_2,...,key_n)` function. It represents a *k-of-n* multisig policy, where any *k* out of the *n* provided `KEY` expressions must sign. diff --git a/doc/developer-notes.md b/doc/developer-notes.md index e710cb4a9..a694db9f9 100644 --- a/doc/developer-notes.md +++ b/doc/developer-notes.md @@ -807,7 +807,7 @@ you must be aware of. In most configurations we use the default LevelDB value for `max_open_files`, which is 1000 at the time of this writing. If LevelDB actually uses this many -file descriptors it will cause problems with Bitcoin's `select()` loop, because +file descriptors it will cause problems with NYC3's `select()` loop, because it may cause new sockets to be created where the fd value is >= 1024. For this reason, on 64-bit Unix systems we rely on an internal LevelDB optimization that uses `mmap()` + `close()` to open table files without actually retaining @@ -833,14 +833,14 @@ details. ### Consensus Compatibility It is possible for LevelDB changes to inadvertently change consensus -compatibility between nodes. This happened in Bitcoin 0.8 (when LevelDB was +compatibility between nodes. This happened in NYC3 0.8 (when LevelDB was first introduced). When upgrading LevelDB you should review the upstream changes to check for issues affecting consensus compatibility. For example, if LevelDB had a bug that accidentally prevented a key from being returned in an edge case, and that bug was fixed upstream, the bug "fix" would be an incompatible consensus change. In this situation the correct behavior -would be to revert the upstream fix before applying the updates to Bitcoin's +would be to revert the upstream fix before applying the updates to NYC3's copy of LevelDB. In general you should be wary of any upstream changes affecting what data is returned from LevelDB queries. diff --git a/doc/dnsseed-policy.md b/doc/dnsseed-policy.md index 64b96fd04..7be874579 100644 --- a/doc/dnsseed-policy.md +++ b/doc/dnsseed-policy.md @@ -4,9 +4,9 @@ Expectations for DNS Seed operators NYC3 attempts to minimize the level of trust in DNS seeds, but DNS seeds still pose a small amount of risk for the network. As such, DNS seeds must be run by entities which have some minimum -level of trust within the Bitcoin community. +level of trust within the NYC3 community. -Other implementations of Bitcoin software may also use the same +Other implementations of NYC3 software may also use the same seeds and may be more exposed. In light of this exposure, this document establishes some basic expectations for operating dnsseeds. @@ -16,7 +16,7 @@ and not sell or transfer control of the DNS seed. Any hosting services contracted by the operator are equally expected to uphold these expectations. 1. The DNS seed results must consist exclusively of fairly selected and -functioning Bitcoin nodes from the public network to the best of the +functioning NYC3 nodes from the public network to the best of the operator's understanding and capability. 2. For the avoidance of doubt, the results may be randomized but must not @@ -26,7 +26,7 @@ urgent technical necessity and disclosed. 3. The results may not be served with a DNS TTL of less than one minute. 4. Any logging of DNS queries should be only that which is necessary -for the operation of the service or urgent health of the Bitcoin +for the operation of the service or urgent health of the NYC3 network and must not be retained longer than necessary nor disclosed to any third party. @@ -42,7 +42,7 @@ details of their operating practices. related to the DNS seed operation. If these expectations cannot be satisfied the operator should -discontinue providing services and contact the active Bitcoin +discontinue providing services and contact the active NYC3 Core development team as well as posting on [bitcoin-dev](https://lists.linuxfoundation.org/mailman/listinfo/bitcoin-dev). diff --git a/doc/init.md b/doc/init.md index a6c9bb94d..75dcf066b 100644 --- a/doc/init.md +++ b/doc/init.md @@ -84,9 +84,9 @@ OpenRC). ### macOS Binary: `/usr/local/bin/bitcoind` -Configuration file: `~/Library/Application Support/Bitcoin/bitcoin.conf` -Data directory: `~/Library/Application Support/Bitcoin` -Lock file: `~/Library/Application Support/Bitcoin/.lock` +Configuration file: `~/Library/Application Support/NYC3/bitcoin.conf` +Data directory: `~/Library/Application Support/NYC3` +Lock file: `~/Library/Application Support/NYC3/.lock` Installing Service Configuration ----------------------------------- diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1 index 2f6b6ce6f..6e9b08b7b 100644 --- a/doc/man/bitcoin-cli.1 +++ b/doc/man/bitcoin-cli.1 @@ -104,7 +104,7 @@ Chain selection options: .IP Use the test chain .SH COPYRIGHT -Copyright (C) 2009-2019 The Bitcoin Core developers +Copyright (C) 2009-2019 The NYC3 Core developers Please contribute if you find NYC3 useful. Visit for further information about the software. diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1 index ac8bd2985..94d3959d0 100644 --- a/doc/man/bitcoin-qt.1 +++ b/doc/man/bitcoin-qt.1 @@ -626,7 +626,7 @@ Set SSL root certificates for payment request (default: \fB\-system\-\fR) .IP Show splash screen on startup (default: 1) .SH COPYRIGHT -Copyright (C) 2009-2019 The Bitcoin Core developers +Copyright (C) 2009-2019 The NYC3 Core developers Please contribute if you find NYC3 useful. Visit for further information about the software. diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1 index dde97b795..810cd07d7 100644 --- a/doc/man/bitcoin-tx.1 +++ b/doc/man/bitcoin-tx.1 @@ -105,7 +105,7 @@ set=NAME:JSON\-STRING .IP Set register NAME to given JSON\-STRING .SH COPYRIGHT -Copyright (C) 2009-2019 The Bitcoin Core developers +Copyright (C) 2009-2019 The NYC3 Core developers Please contribute if you find NYC3 useful. Visit for further information about the software. diff --git a/doc/man/bitcoin-wallet.1 b/doc/man/bitcoin-wallet.1 index 306a03331..d31308779 100644 --- a/doc/man/bitcoin-wallet.1 +++ b/doc/man/bitcoin-wallet.1 @@ -52,7 +52,7 @@ info .IP Get wallet info .SH COPYRIGHT -Copyright (C) 2009-2019 The Bitcoin Core developers +Copyright (C) 2009-2019 The NYC3 Core developers Please contribute if you find NYC3 useful. Visit for further information about the software. diff --git a/doc/man/bitcoind.1 b/doc/man/bitcoind.1 index e743fdcb1..2bb18a357 100644 --- a/doc/man/bitcoind.1 +++ b/doc/man/bitcoind.1 @@ -600,7 +600,7 @@ Username for JSON\-RPC connections .IP Accept command line and JSON\-RPC commands .SH COPYRIGHT -Copyright (C) 2009-2019 The Bitcoin Core developers +Copyright (C) 2009-2019 The NYC3 Core developers Please contribute if you find NYC3 useful. Visit for further information about the software. diff --git a/doc/psbt.md b/doc/psbt.md index 56a49b0b7..0e2d46e65 100644 --- a/doc/psbt.md +++ b/doc/psbt.md @@ -1,6 +1,6 @@ # PSBT Howto for NYC3 -Since NYC3 0.17, an RPC interface exists for Partially Signed Bitcoin +Since NYC3 0.17, an RPC interface exists for Partially Signed NYC3 Transactions (PSBTs, as specified in [BIP 174](https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki)). @@ -10,7 +10,7 @@ scenarios. ## PSBT in general -PSBT is an interchange format for Bitcoin transactions that are not fully signed +PSBT is an interchange format for NYC3 transactions that are not fully signed yet, together with relevant metadata to help entities work towards signing it. It is intended to simplify workflows where multiple parties need to cooperate to produce a transaction. Examples include hardware wallets, multisig setups, and @@ -18,7 +18,7 @@ produce a transaction. Examples include hardware wallets, multisig setups, and ### Overall workflow -Overall, the construction of a fully signed Bitcoin transaction goes through the +Overall, the construction of a fully signed NYC3 transaction goes through the following steps: - A **Creator** proposes a particular transaction to be created. They construct @@ -32,7 +32,7 @@ following steps: partial signature for the inputs for which they have relevant key(s). - A **Finalizer** is run for each input to convert the partial signatures and possibly script information into a final `scriptSig` and/or `scriptWitness`. -- An **Extractor** produces a valid Bitcoin transaction (in network format) +- An **Extractor** produces a valid NYC3 transaction (in network format) from a PSBT for which all inputs are finalized. Generally, each of the above (excluding Creator and Extractor) will simply diff --git a/doc/release-notes.md b/doc/release-notes.md index b583d3245..7cd4808c7 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -19,7 +19,7 @@ How to Upgrade 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 +`/Applications/NYC3-Qt` (on Mac) or `bitcoind`/`bitcoin-qt` (on Linux). The first time you run version 0.15.0 or newer, your chainstate database diff --git a/doc/release-notes/release-notes-0.10.0.md b/doc/release-notes/release-notes-0.10.0.md index cb6a95bcc..42f1b93c2 100644 --- a/doc/release-notes/release-notes-0.10.0.md +++ b/doc/release-notes/release-notes-0.10.0.md @@ -17,7 +17,7 @@ How to Upgrade 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 +installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). Downgrading warning @@ -172,7 +172,7 @@ improved by making the signatures constant time and deterministic. This change is a result of switching signing to use libsecp256k1 instead of OpenSSL. Libsecp256k1 is a cryptographic library -optimized for the curve Bitcoin uses which was created by Bitcoin +optimized for the curve NYC3 uses which was created by NYC3 Core developer Pieter Wuille. There exist attacks[1] against most ECC implementations where an @@ -187,7 +187,7 @@ long time, but this functionality has still not made its way into a released version of OpenSSL. Libsecp256k1 achieves significantly stronger protection: As far as we're aware this is the only deployed implementation of constant time signing for -the curve Bitcoin uses and we have reason to believe that +the curve NYC3 uses and we have reason to believe that libsecp256k1 is better tested and more thoroughly reviewed than the implementation in OpenSSL. @@ -225,7 +225,7 @@ Consensus library Starting from 0.10.0, the NYC3 distribution includes a consensus library. The purpose of this library is to make the verification functionality that is -critical to Bitcoin's consensus available to other applications, e.g. to language +critical to NYC3's consensus available to other applications, e.g. to language bindings such as [python-bitcoinlib](https://pypi.python.org/pypi/python-bitcoinlib) or alternative node implementations. @@ -247,7 +247,7 @@ Standard script rules relaxed for P2SH addresses The IsStandard() rules have been almost completely removed for P2SH redemption scripts, allowing applications to make use of any valid script type, such as "n-of-m OR y", hash-locked oracle addresses, etc. -While the Bitcoin protocol has always supported these types of script, +While the NYC3 protocol has always supported these types of script, actually using them on mainnet has been previously inconvenient as standard NYC3 nodes wouldn't relay them to miners, nor would most miners include them in blocks they mined. @@ -282,7 +282,7 @@ Mining and relay policy enhancements NYC3's block templates are now for version 3 blocks only, and any mining software relying on its `getblocktemplate` must be updated in parallel to use libblkmaker either version 0.4.2 or any version from 0.5.1 onward. -If you are solo mining, this will affect you the moment you upgrade Bitcoin +If you are solo mining, this will affect you the moment you upgrade NYC3 Core, which must be done prior to BIP66 achieving its 951/1001 status. If you are mining with the stratum mining protocol: this does not affect you. If you are mining with the getblocktemplate protocol to a pool: this will affect @@ -315,7 +315,7 @@ BIP 66: strict DER encoding for signatures NYC3 0.10 implements BIP 66, which introduces block version 3, and a new consensus rule, which prohibits non-DER signatures. Such transactions have been -non-standard since Bitcoin v0.8.0 (released in February 2013), but were +non-standard since NYC3 v0.8.0 (released in February 2013), but were technically still permitted inside blocks. This change breaks the dependency on OpenSSL's signature parsing, and is @@ -539,7 +539,7 @@ GUI: - `7007402` Implement SI-style (thin space) thoudands separator - `91cce17` Use fixed-point arithmetic in amount spinbox - `bdba2dd` Remove an obscure option no-one cares about -- `bd0aa10` Replace the temporary file hack currently used to change Bitcoin-Qt's dock icon (OS X) with a buffer-based solution +- `bd0aa10` Replace the temporary file hack currently used to change NYC3-Qt's dock icon (OS X) with a buffer-based solution - `94e1b9e` Re-work overviewpage UI - `8bfdc9a` Better looking trayicon - `b197bf3` disable tray interactions when client model set to 0 diff --git a/doc/release-notes/release-notes-0.10.1.md b/doc/release-notes/release-notes-0.10.1.md index 5872665f6..8d2c8693a 100644 --- a/doc/release-notes/release-notes-0.10.1.md +++ b/doc/release-notes/release-notes-0.10.1.md @@ -17,7 +17,7 @@ How to Upgrade 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 +installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). Downgrade warning diff --git a/doc/release-notes/release-notes-0.10.2.md b/doc/release-notes/release-notes-0.10.2.md index 9b55becdb..12c525d96 100644 --- a/doc/release-notes/release-notes-0.10.2.md +++ b/doc/release-notes/release-notes-0.10.2.md @@ -17,7 +17,7 @@ How to Upgrade 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 +installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). Downgrade warning diff --git a/doc/release-notes/release-notes-0.10.3.md b/doc/release-notes/release-notes-0.10.3.md index fdc6442b9..1b715f1c9 100644 --- a/doc/release-notes/release-notes-0.10.3.md +++ b/doc/release-notes/release-notes-0.10.3.md @@ -17,7 +17,7 @@ How to Upgrade 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 +installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). Downgrade warning @@ -84,15 +84,15 @@ much more common since BIP62 was initially written. NYC3 has produced compatible signatures since a28fb70e in September 2013, but this didn't make it into a release until 0.9 -in March 2014; Bitcoinj has done so for a similar span of time. -Bitcoinjs and electrum have been more recently updated. +in March 2014; NYC3j has done so for a similar span of time. +NYC3js and electrum have been more recently updated. This does not replace the need for BIP62 or similar, as miners can still cooperate to break transactions. Nor does it replace the need for wallet software to handle malleability sanely[1]. This only eliminates the cheap and irritating DOS attack. -[1] On the Malleability of Bitcoin Transactions +[1] On the Malleability of NYC3 Transactions Marcin Andrychowicz, Stefan Dziembowski, Daniel Malinowski, Łukasz Mazurek http://fc15.ifca.ai/preproceedings/bitcoin/paper_9.pdf diff --git a/doc/release-notes/release-notes-0.10.4.md b/doc/release-notes/release-notes-0.10.4.md index cd0c4a60e..6d79f6590 100644 --- a/doc/release-notes/release-notes-0.10.4.md +++ b/doc/release-notes/release-notes-0.10.4.md @@ -18,7 +18,7 @@ How to Upgrade 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 +installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). Downgrade warning diff --git a/doc/release-notes/release-notes-0.11.0.md b/doc/release-notes/release-notes-0.11.0.md index b46b8b08e..2c63b5f26 100644 --- a/doc/release-notes/release-notes-0.11.0.md +++ b/doc/release-notes/release-notes-0.11.0.md @@ -17,7 +17,7 @@ How to Upgrade 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 +installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). Downgrade warning @@ -346,7 +346,7 @@ git merge commit are mentioned. - #5626 `ab0d798` Fix icon sizes and column width - #5683 `c7b22aa` add new osx dmg background picture - #5620 `7823598` Payment request expiration bug fix -- #5729 `9c4a5a5` Allow unit changes for read-only BitcoinAmountField +- #5729 `9c4a5a5` Allow unit changes for read-only NYC3AmountField - #5753 `0f44672` Add bitcoin logo to about screen - #5629 `a956586` Prevent amount overflow problem with payment requests - #5830 `215475a` Don't save geometry for options and about/help window @@ -404,7 +404,7 @@ git merge commit are mentioned. - #6104 `3e2559c` Show an init message while activating best chain - #6125 `351f73e` Clean up parsing of bool command line args - #5964 `b4c219b` Lightweight task scheduler -- #6116 `30dc3c1` [OSX] rename Bitcoin-Qt.app to Bitcoin-Core.app +- #6116 `30dc3c1` [OSX] rename NYC3-Qt.app to NYC3-Core.app - #6168 `b3024f0` contrib/linearize: Support linearization of testnet blocks - #6098 `7708fcd` Update Windows resource files (and add one for bitcoin-tx) - #6159 `e1412d3` Catch errors on datadir lock and pidfile delete @@ -427,7 +427,7 @@ Thanks to everyone who directly contributed to this release: - azeteki - Ben Holden-Crowther - bikinibabe -- BitcoinPRReadingGroup +- NYC3PRReadingGroup - Blake Jakopovic - BtcDrak - charlescharles diff --git a/doc/release-notes/release-notes-0.11.1.md b/doc/release-notes/release-notes-0.11.1.md index fdcfac720..efb4e958d 100644 --- a/doc/release-notes/release-notes-0.11.1.md +++ b/doc/release-notes/release-notes-0.11.1.md @@ -17,7 +17,7 @@ How to Upgrade 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 +installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). Downgrade warning @@ -85,15 +85,15 @@ much more common since BIP62 was initially written. NYC3 has produced compatible signatures since a28fb70e in September 2013, but this didn't make it into a release until 0.9 -in March 2014; Bitcoinj has done so for a similar span of time. -Bitcoinjs and electrum have been more recently updated. +in March 2014; NYC3j has done so for a similar span of time. +NYC3js and electrum have been more recently updated. This does not replace the need for BIP62 or similar, as miners can still cooperate to break transactions. Nor does it replace the need for wallet software to handle malleability sanely[1]. This only eliminates the cheap and irritating DOS attack. -[1] On the Malleability of Bitcoin Transactions +[1] On the Malleability of NYC3 Transactions Marcin Andrychowicz, Stefan Dziembowski, Daniel Malinowski, Łukasz Mazurek http://fc15.ifca.ai/preproceedings/bitcoin/paper_9.pdf diff --git a/doc/release-notes/release-notes-0.11.2.md b/doc/release-notes/release-notes-0.11.2.md index 75a43c93b..608a63a8e 100644 --- a/doc/release-notes/release-notes-0.11.2.md +++ b/doc/release-notes/release-notes-0.11.2.md @@ -18,7 +18,7 @@ How to Upgrade 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 +installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). Downgrade warning @@ -100,7 +100,7 @@ version 0.4.3 or any version from 0.5.2 onward. BIP113 mempool-only locktime enforcement using GetMedianTimePast() ---------------------------------------------------------------- -Bitcoin transactions currently may specify a locktime indicating when +NYC3 transactions currently may specify a locktime indicating when they may be added to a valid block. Current consensus rules require that blocks have a block header time greater than the locktime specified in any transaction in that block. diff --git a/doc/release-notes/release-notes-0.12.0.md b/doc/release-notes/release-notes-0.12.0.md index 5e107bd52..1e1beb9fb 100644 --- a/doc/release-notes/release-notes-0.12.0.md +++ b/doc/release-notes/release-notes-0.12.0.md @@ -16,7 +16,7 @@ How to Upgrade 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 +installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). Downgrade warning @@ -60,7 +60,7 @@ Notable changes Signature validation using libsecp256k1 --------------------------------------- -ECDSA signatures inside Bitcoin transactions now use validation using +ECDSA signatures inside NYC3 transactions now use validation using [libsecp256k1](https://github.com/bitcoin-core/secp256k1) instead of OpenSSL. Depending on the platform, this means a significant speedup for raw signature @@ -250,7 +250,7 @@ information, pass `-debug=tor`. Notifications through ZMQ ------------------------- -Bitcoind can now (optionally) asynchronously notify clients through a +NYC3d can now (optionally) asynchronously notify clients through a ZMQ-based PUB socket of the arrival of new transactions and blocks. This feature requires installation of the ZMQ C API library 4.x and configuring its use through the command line or configuration file. @@ -263,7 +263,7 @@ Various improvements have been made to how the wallet calculates transaction fees. Users can decide to pay a predefined fee rate by setting `-paytxfee=` -(or `settxfee ` rpc during runtime). A value of `n=0` signals Bitcoin +(or `settxfee ` rpc during runtime). A value of `n=0` signals NYC3 Core to use floating fees. By default, NYC3 will use floating fees. @@ -637,7 +637,7 @@ git merge commit are mentioned. ### Build system - #6210 `0e4f2a0` build: disable optional use of gmp in internal secp256k1 build (Wladimir J. van der Laan) -- #6214 `87406aa` [OSX] revert renaming of Bitcoin-Qt.app and use CFBundleDisplayName (partial revert of #6116) (Jonas Schnelli) +- #6214 `87406aa` [OSX] revert renaming of NYC3-Qt.app and use CFBundleDisplayName (partial revert of #6116) (Jonas Schnelli) - #6218 `9d67b10` build/gitian misc updates (Cory Fields) - #6269 `d4565b6` gitian: Use the new bitcoin-detached-sigs git repo for OSX signatures (Cory Fields) - #6418 `d4a910c` Add autogen.sh to source tarball. (randy-waterhouse) diff --git a/doc/release-notes/release-notes-0.12.1.md b/doc/release-notes/release-notes-0.12.1.md index 3a9e6d97f..5623b7c82 100644 --- a/doc/release-notes/release-notes-0.12.1.md +++ b/doc/release-notes/release-notes-0.12.1.md @@ -17,7 +17,7 @@ How to Upgrade 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 +installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). Downgrade warning @@ -74,7 +74,7 @@ BIP112 soft fork to enforce OP_CHECKSEQUENCEVERIFY -------------------------------------------------- [BIP112][] redefines the existing OP_NOP3 as OP_CHECKSEQUENCEVERIFY (CSV) -for a new opcode in the Bitcoin scripting system that in combination with +for a new opcode in the NYC3 scripting system that in combination with [BIP68][] allows execution pathways of a script to be restricted based on the age of the output being spent. @@ -88,7 +88,7 @@ NYC3 0.11.2 previously introduced mempool-only locktime enforcement using GetMedianTimePast(). This release seeks to consensus enforce the rule. -Bitcoin transactions currently may specify a locktime indicating when +NYC3 transactions currently may specify a locktime indicating when they may be added to a valid block. Current consensus rules require that blocks have a block header time greater than the locktime specified in any transaction in that block. diff --git a/doc/release-notes/release-notes-0.13.0.md b/doc/release-notes/release-notes-0.13.0.md index 8aabb1d1a..f88eaa8d9 100644 --- a/doc/release-notes/release-notes-0.13.0.md +++ b/doc/release-notes/release-notes-0.13.0.md @@ -232,7 +232,7 @@ files on disk. These two have now been split up, so that all blocks are known before validation starts. This was necessary to make certain optimizations that are available during normal synchronizations also available during reindexing. -The two phases are distinct in the Bitcoin-Qt GUI. During the first one, +The two phases are distinct in the NYC3-Qt GUI. During the first one, "Reindexing blocks on disk" is shown. During the second (slower) one, "Processing blocks on disk" is shown. @@ -563,7 +563,7 @@ git merge commit are mentioned. - #8257 `ff03c50` Do not ask a UI question from bitcoind (sipa) - #8288 `91abb77` Network-specific example address (laanwj) - #7707 `a914968` UI support for abandoned transactions (jonasschnelli) -- #8207 `f7a403b` Add a link to the Bitcoin-Core repository and website to the About Dialog (MarcoFalke) +- #8207 `f7a403b` Add a link to the NYC3-Core repository and website to the About Dialog (MarcoFalke) - #8281 `6a87eb0` Remove client name from debug window (laanwj) - #8407 `45eba4b` Add dbcache migration path (jonasschnelli) @@ -660,7 +660,7 @@ git merge commit are mentioned. - #8090 `a2df115` Adding P2SH(p2pkh) script test case (Christewart) - #7992 `ec45cc5` Extend #7956 with one more test (TheBlueMatt) - #8139 `ae5575b` Fix interrupted HTTP RPC connection workaround for Python 3.5+ (sipa) -- #8164 `0f24eaf` [Bitcoin-Tx] fix missing test fixtures, fix 32bit atoi issue (jonasschnelli) +- #8164 `0f24eaf` [NYC3-Tx] fix missing test fixtures, fix 32bit atoi issue (jonasschnelli) - #8166 `0b5279f` Src/test: Do not shadow local variables (paveljanik) - #8141 `44c1b1c` Continuing port of java comparison tool (mrbandrews) - #8201 `36b7400` fundrawtransaction: Fix race, assert amounts (MarcoFalke) diff --git a/doc/release-notes/release-notes-0.13.1.md b/doc/release-notes/release-notes-0.13.1.md index 7094e6b04..5a205d296 100644 --- a/doc/release-notes/release-notes-0.13.1.md +++ b/doc/release-notes/release-notes-0.13.1.md @@ -56,9 +56,9 @@ covered by the txid. This provides several immediate benefits: identifier (txid) of transactions without referencing the witness, which can sometimes be changed by third-parties (such as miners) or by co-signers in a multisig spend. This solves all known cases of unwanted transaction - malleability, which is a problem that makes programming Bitcoin wallet + malleability, which is a problem that makes programming NYC3 wallet software more difficult and which seriously complicates the design of smart - contracts for Bitcoin. + contracts for NYC3. - **Capacity increase:** Segwit transactions contain new fields that are not part of the data currently used to calculate the size of a block, which @@ -72,7 +72,7 @@ covered by the txid. This provides several immediate benefits: following section for details). - **Weighting data based on how it affects node performance:** Some parts of - each Bitcoin block need to be stored by nodes in order to validate future + each NYC3 block need to be stored by nodes in order to validate future blocks; other parts of a block can be immediately forgotten (pruned) or used only for helping other nodes sync their copy of the block chain. One large part of the immediately prunable data are transaction signatures (witnesses), @@ -105,7 +105,7 @@ covered by the txid. This provides several immediate benefits: different signature method that doesn't suffer from this problem and doesn't have any unwanted side-effects. -- **Increased security for multisig:** Bitcoin addresses (both P2PKH addresses +- **Increased security for multisig:** NYC3 addresses (both P2PKH addresses that start with a '1' and P2SH addresses that start with a '3') use a hash function known as RIPEMD-160. For P2PKH addresses, this provides about 160 bits of security---which is beyond what cryptographers believe can be broken @@ -115,15 +115,15 @@ covered by the txid. This provides several immediate benefits: Segwit allows advanced transactions to use the SHA256 hash function instead, which provides about 128 bits of security (that is 281 trillion times as much security as 80 bits and is equivalent to the maximum bits of security - believed to be provided by Bitcoin's choice of parameters for its Elliptic + believed to be provided by NYC3's choice of parameters for its Elliptic Curve Digital Security Algorithm [ECDSA].) - **More efficient almost-full-node security** Satoshi Nakamoto's original - Bitcoin paper describes a method for allowing newly-started full nodes to + NYC3 paper describes a method for allowing newly-started full nodes to skip downloading and validating some data from historic blocks that are protected by large amounts of proof of work. Unfortunately, Nakamoto's method can't guarantee that a newly-started node using this method will - produce an accurate copy of Bitcoin's current ledger (called the UTXO set), + produce an accurate copy of NYC3's current ledger (called the UTXO set), making the node vulnerable to falling out of consensus with other nodes. Although the problems with Nakamoto's method can't be fixed in a soft fork, Segwit accomplishes something similar to his original proposal: it makes it @@ -135,14 +135,14 @@ covered by the txid. This provides several immediate benefits: of this 0.13.1 release. - **Script versioning:** Segwit makes it easy for future soft forks to allow - Bitcoin users to individually opt-in to almost any change in the Bitcoin + NYC3 users to individually opt-in to almost any change in the NYC3 Script language when those users receive new transactions. Features currently being researched by NYC3 contributors that may use this capability include support for Schnorr signatures, which can improve the privacy and efficiency of multisig transactions (or transactions with multiple inputs), and Merklized Abstract Syntax Trees (MAST), which can improve the privacy and efficiency of scripts with two or more conditions. - Other Bitcoin community members are studying several other improvements + Other NYC3 community members are studying several other improvements that can be made using script versioning. Activation for the segwit soft fork is being managed using BIP9 diff --git a/doc/release-notes/release-notes-0.14.2.md b/doc/release-notes/release-notes-0.14.2.md index ab4d07cc4..65c98eab0 100644 --- a/doc/release-notes/release-notes-0.14.2.md +++ b/doc/release-notes/release-notes-0.14.2.md @@ -48,7 +48,7 @@ possible. Known Bugs ========== -Since 0.14.0 the approximate transaction fee shown in Bitcoin-Qt when using coin +Since 0.14.0 the approximate transaction fee shown in NYC3-Qt when using coin control and smart fee estimation does not reflect any change in target from the smart fee slider. It will only present an approximate fee calculated using the default target. The fee calculated using the correct target is still applied to diff --git a/doc/release-notes/release-notes-0.14.3.md b/doc/release-notes/release-notes-0.14.3.md index 002e5609e..405d1bd8e 100644 --- a/doc/release-notes/release-notes-0.14.3.md +++ b/doc/release-notes/release-notes-0.14.3.md @@ -40,7 +40,7 @@ the vulnerable versions to 0.14.3, 0.15.2 or 0.16.3 as soon as possible. Known Bugs ========== -Since 0.14.0 the approximate transaction fee shown in Bitcoin-Qt when using coin +Since 0.14.0 the approximate transaction fee shown in NYC3-Qt when using coin control and smart fee estimation does not reflect any change in target from the smart fee slider. It will only present an approximate fee calculated using the default target. The fee calculated using the correct target is still applied to diff --git a/doc/release-notes/release-notes-0.15.0.1.md b/doc/release-notes/release-notes-0.15.0.1.md index b99c2fc3a..7a67849fe 100644 --- a/doc/release-notes/release-notes-0.15.0.1.md +++ b/doc/release-notes/release-notes-0.15.0.1.md @@ -21,7 +21,7 @@ How to Upgrade 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) +installer (on Windows) or just copy over `/Applications/NYC3-Qt` (on Mac) or `bitcoind`/`bitcoin-qt` (on Linux). The first time you run version 0.15.0 or higher, your chainstate database will diff --git a/doc/release-notes/release-notes-0.15.0.md b/doc/release-notes/release-notes-0.15.0.md index ad6190ffc..e60df6aae 100644 --- a/doc/release-notes/release-notes-0.15.0.md +++ b/doc/release-notes/release-notes-0.15.0.md @@ -18,7 +18,7 @@ How to Upgrade 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) +installer (on Windows) or just copy over `/Applications/NYC3-Qt` (on Mac) or `bitcoind`/`bitcoin-qt` (on Linux). The first time you run version 0.15.0, your chainstate database will be converted to a @@ -144,9 +144,9 @@ Multi-wallet support NYC3 now supports loading multiple, separate wallets (See [PR 8694](https://github.com/bitcoin/bitcoin/pull/8694), [PR 10849](https://github.com/bitcoin/bitcoin/pull/10849)). The wallets are completely separated, with individual balances, keys and received transactions. -Multi-wallet is enabled by using more than one `-wallet` argument when starting Bitcoin, either on the command line or in the Bitcoin config file. +Multi-wallet is enabled by using more than one `-wallet` argument when starting NYC3, either on the command line or in the NYC3 config file. -**In Bitcoin-Qt, only the first wallet will be displayed and accessible for creating and signing transactions.** GUI selectable multiple wallets will be supported in a future version. However, even in 0.15 other loaded wallets will remain synchronized to the node's current tip in the background. This can be useful if running a pruned node, since loading a wallet where the most recent sync is beyond the pruned height results in having to download and revalidate the whole blockchain. Continuing to synchronize all wallets in the background avoids this problem. +**In NYC3-Qt, only the first wallet will be displayed and accessible for creating and signing transactions.** GUI selectable multiple wallets will be supported in a future version. However, even in 0.15 other loaded wallets will remain synchronized to the node's current tip in the background. This can be useful if running a pruned node, since loading a wallet where the most recent sync is beyond the pruned height results in having to download and revalidate the whole blockchain. Continuing to synchronize all wallets in the background avoids this problem. NYC3 0.15.0 contains the following changes to the RPC interface and `bitcoin-cli` for multi-wallet: @@ -634,7 +634,7 @@ Low-level RPC changes - #10415 `217b416` [tests] Speed up fuzzing by ~200x when using afl-fuzz (practicalswift) - #10445 `b4b057a` Add test for empty chain and reorg consistency for gettxoutsetinfo (gmaxwell) - #10423 `1aefc94` [tests] skipped tests should clean up after themselves (jnewbery) -- #10359 `329fc1d` [tests] functional tests should call BitcoinTestFramework start/stop node methods (jnewbery) +- #10359 `329fc1d` [tests] functional tests should call NYC3TestFramework start/stop node methods (jnewbery) - #10514 `e103b3f` Bugfix: missing == 0 after randrange (sipa) - #10515 `c871f32` [test] Add test for getchaintxstats (jimmysong) - #10509 `bea5b00` Remove xvfb configuration from travis (ryanofsky) @@ -653,7 +653,7 @@ Low-level RPC changes - #10612 `7c87a9c` The young person's guide to the test_framework (jnewbery) - #10659 `acb1153` [qa] blockchain: Pass on closed connection during generate call (MarcoFalke) - #10690 `416af3e` [qa] Bugfix: allow overriding extra_args in ComparisonTestFramework (sdaftuar) -- #10556 `65cc7aa` Move stop/start functions from utils.py into BitcoinTestFramework (jnewbery) +- #10556 `65cc7aa` Move stop/start functions from utils.py into NYC3TestFramework (jnewbery) - #10704 `dd07f47` [tests] nits in dbcrash.py (jnewbery) - #10743 `be82498` [test] don't run dbcrash.py on Travis (jnewbery) - #10761 `d3b5870` [tests] fix replace_by_fee.py (jnewbery) @@ -771,7 +771,7 @@ Low-level RPC changes - #10837 `8bc6d1f` Fix resource leak on error in GetDevURandom (corebob) - #10832 `89bb036` init: Factor out AppInitLockDataDirectory and fix startup core dump issue (laanwj) - #10914 `b995a37` Add missing lock in CScheduler::AreThreadsServicingQueue() (TheBlueMatt) -- #10958 `659c096` Update to latest Bitcoin patches for LevelDB (sipa) +- #10958 `659c096` Update to latest NYC3 patches for LevelDB (sipa) - #10919 `c1c671f` Fix more init bugs (TheBlueMatt) Credits diff --git a/doc/release-notes/release-notes-0.15.1.md b/doc/release-notes/release-notes-0.15.1.md index 241da3fde..52a05fb43 100644 --- a/doc/release-notes/release-notes-0.15.1.md +++ b/doc/release-notes/release-notes-0.15.1.md @@ -22,7 +22,7 @@ How to Upgrade 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) +installer (on Windows) or just copy over `/Applications/NYC3-Qt` (on Mac) or `bitcoind`/`bitcoin-qt` (on Linux). The first time you run version 0.15.0 or higher, your chainstate database will diff --git a/doc/release-notes/release-notes-0.15.2.md b/doc/release-notes/release-notes-0.15.2.md index 7b2a44112..696c702f1 100644 --- a/doc/release-notes/release-notes-0.15.2.md +++ b/doc/release-notes/release-notes-0.15.2.md @@ -18,7 +18,7 @@ How to Upgrade 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) +installer (on Windows) or just copy over `/Applications/NYC3-Qt` (on Mac) or `bitcoind`/`bitcoin-qt` (on Linux). The first time you run version 0.15.0 or higher, your chainstate database will diff --git a/doc/release-notes/release-notes-0.16.0.md b/doc/release-notes/release-notes-0.16.0.md index 896010894..9f2e3a646 100644 --- a/doc/release-notes/release-notes-0.16.0.md +++ b/doc/release-notes/release-notes-0.16.0.md @@ -18,7 +18,7 @@ How to Upgrade 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) +installer (on Windows) or just copy over `/Applications/NYC3-Qt` (on Mac) or `bitcoind`/`bitcoin-qt` (on Linux). The first time you run version 0.15.0 or newer, your chainstate database will be converted to a diff --git a/doc/release-notes/release-notes-0.16.1.md b/doc/release-notes/release-notes-0.16.1.md index 482a4e16f..27b81c02a 100644 --- a/doc/release-notes/release-notes-0.16.1.md +++ b/doc/release-notes/release-notes-0.16.1.md @@ -18,7 +18,7 @@ How to Upgrade 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) +installer (on Windows) or just copy over `/Applications/NYC3-Qt` (on Mac) or `bitcoind`/`bitcoin-qt` (on Linux). The first time you run version 0.15.0 or newer, your chainstate database will be converted to a diff --git a/doc/release-notes/release-notes-0.16.2.md b/doc/release-notes/release-notes-0.16.2.md index 3858ff875..e696b39c2 100644 --- a/doc/release-notes/release-notes-0.16.2.md +++ b/doc/release-notes/release-notes-0.16.2.md @@ -18,7 +18,7 @@ How to Upgrade 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) +installer (on Windows) or just copy over `/Applications/NYC3-Qt` (on Mac) or `bitcoind`/`bitcoin-qt` (on Linux). The first time you run version 0.15.0 or newer, your chainstate database will be converted to a diff --git a/doc/release-notes/release-notes-0.16.3.md b/doc/release-notes/release-notes-0.16.3.md index 09ec34ebf..e4f43a003 100644 --- a/doc/release-notes/release-notes-0.16.3.md +++ b/doc/release-notes/release-notes-0.16.3.md @@ -17,7 +17,7 @@ How to Upgrade 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) +installer (on Windows) or just copy over `/Applications/NYC3-Qt` (on Mac) or `bitcoind`/`bitcoin-qt` (on Linux). The first time you run version 0.15.0 or newer, your chainstate database will be converted to a diff --git a/doc/release-notes/release-notes-0.17.0.md b/doc/release-notes/release-notes-0.17.0.md index df4c81da4..567295848 100644 --- a/doc/release-notes/release-notes-0.17.0.md +++ b/doc/release-notes/release-notes-0.17.0.md @@ -18,7 +18,7 @@ How to Upgrade 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) +installer (on Windows) or just copy over `/Applications/NYC3-Qt` (on Mac) or `bitcoind`/`bitcoin-qt` (on Linux). If your node has a txindex, the txindex db will be migrated the first time you run 0.17.0 or newer, which may take up to a few hours. Your node will not be functional until this migration completes. @@ -184,10 +184,10 @@ Here are the changes to RPC methods: | `listtransactions` | The `account` named parameter has been renamed to `dummy`. If provided, the `dummy` parameter must be set to the string `*`, unless running with the `-deprecatedrpc=accounts` argument (in which case functionality is unchanged). | | `getbalance` | `account`, `minconf` and `include_watchonly` parameters are deprecated, and can only be used if running with '-deprecatedrpc=accounts' | -BIP 174 Partially Signed Bitcoin Transactions support +BIP 174 Partially Signed NYC3 Transactions support ----------------------------------------------------- -[BIP 174 PSBT](https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki) is an interchange format for Bitcoin transactions that are not fully signed +[BIP 174 PSBT](https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki) is an interchange format for NYC3 transactions that are not fully signed yet, together with relevant metadata to help entities work towards signing it. It is intended to simplify workflows where multiple parties need to cooperate to produce a transaction. Examples include hardware wallets, multisig setups, and @@ -195,7 +195,7 @@ produce a transaction. Examples include hardware wallets, multisig setups, and ### Overall workflow -Overall, the construction of a fully signed Bitcoin transaction goes through the +Overall, the construction of a fully signed NYC3 transaction goes through the following steps: - A **Creator** proposes a particular transaction to be created. He constructs @@ -210,7 +210,7 @@ following steps: partial signature for the inputs for which they have relevant key(s). - A **Finalizer** is run for each input to convert the partial signatures and possibly script information into a final `scriptSig` and/or `scriptWitness`. -- An **Extractor** produces a valid Bitcoin transaction (in network format) +- An **Extractor** produces a valid NYC3 transaction (in network format) from a PSBT for which all inputs are finalized. Generally, each of the above (excluding Creator and Extractor) will simply @@ -587,7 +587,7 @@ Support for Python 2 has been discontinued for all test files and tools. - #13043 `6e249e4` OptionsDialog: add prune setting (Sjors) - #13506 `6579d80` load wallet in UI after possible init aborts (jonasschnelli) - #13458 `dc53f7f` Drop qt4 support (laanwj) -- #13528 `b877c39` Move BitcoinGUI initializers to class, fix initializer order warning (laanwj) +- #13528 `b877c39` Move NYC3GUI initializers to class, fix initializer order warning (laanwj) - #13536 `baf3a3a` coincontrol: Remove unused qt4 workaround (MarcoFalke) - #13537 `10ffca7` Peer table: Visualize inbound/outbound state for every row (wodry) - #13791 `2c14c1f` Reject dialogs if key escape is pressed (promag) @@ -652,7 +652,7 @@ Support for Python 2 has been discontinued for all test files and tools. - #12252 `8d57319` Require all tests to follow naming convention (ajtowns) - #12295 `935eb8d` Enable flake8 warnings for all currently non-violated rules (practicalswift) - #11858 `b4d8549` Prepare tests for Windows (MarcoFalke) -- #11771 `2dbc4a4` Change invalidtxrequest to use BitcoinTestFramework (jnewbery) +- #11771 `2dbc4a4` Change invalidtxrequest to use NYC3TestFramework (jnewbery) - #12200 `d09968f` Bind functional test nodes to 127.0.0.1 (Sjors) - #12425 `26dc2da` Add some script tests (richardkiss) - #12455 `23481fa` Fix bip68 sequence test to reflect updated rpc error message (Empact) @@ -665,7 +665,7 @@ Support for Python 2 has been discontinued for all test files and tools. - #12600 `29088b1` Add a test for large tx output scripts with segwit input (richardkiss) - #12627 `791c3ea` Fix some tests to work on native windows (MarcoFalke) - #12405 `0f58d7f` travis: Full clone for git subtree check (MarcoFalke) -- #11772 `0630974` Change invalidblockrequest to use BitcoinTestFramework (jnewbery) +- #11772 `0630974` Change invalidblockrequest to use NYC3TestFramework (jnewbery) - #12681 `1846296` Fix ComputeTimeSmart test failure with `-DDEBUG_LOCKORDER` (ryanofsky) - #12682 `9f04c8e` travis: Clone depth 1 unless `$check_doc` (MarcoFalke) - #12710 `00d1680` Append scripts to new `test_list` array to fix bad assignment (jeffrade) @@ -678,9 +678,9 @@ Support for Python 2 has been discontinued for all test files and tools. - #12806 `18606eb` Fix function names in `feature_blocksdir` (MarcoFalke) - #12811 `0d8fc8d` Make summary row bold-red if any test failed and show failed tests at end of table (laanwj) - #12790 `490644d` Use blockmaxweight where tests previously had blockmaxsize (conscott) -- #11773 `f0f9732` Change `feature_block.py` to use BitcoinTestFramework (jnewbery) +- #11773 `f0f9732` Change `feature_block.py` to use NYC3TestFramework (jnewbery) - #12839 `40f4baf` Remove travis checkout depth (laanwj) -- #11817 `2a09a78` Change `feature_csv_activation.py` to use BitcoinTestFramework (jnewbery) +- #11817 `2a09a78` Change `feature_csv_activation.py` to use NYC3TestFramework (jnewbery) - #12284 `fa5825d` Remove assigned but never used local variables. Enable Travis checking for unused local variables (practicalswift) - #12719 `9beded5` Add note about test suite naming convention in developer-notes.md (practicalswift) - #12861 `c564424` Stop `feature_block.py` from blowing up memory (jnewbery) @@ -690,7 +690,7 @@ Support for Python 2 has been discontinued for all test files and tools. - #12766 `69310a3` Tidy up REST interface functional tests (romanz) - #12849 `83c7533` Add logging in loops in `p2p_sendhears.py` (ccdle12) - #12895 `d6f10b2` Add note about test suite name uniqueness requirement to developer notes (practicalswift) -- #12856 `27278df` Add Metaclass for BitcoinTestFramework (WillAyd) +- #12856 `27278df` Add Metaclass for NYC3TestFramework (WillAyd) - #12918 `6fc5a05` Assert on correct variable (kallewoof) - #11878 `a04440f` Add Travis check for duplicate includes (practicalswift) - #12917 `cf8073f` Windows fixups for functional tests (MarcoFalke) diff --git a/doc/release-notes/release-notes-0.17.1.md b/doc/release-notes/release-notes-0.17.1.md index c38bdaa63..2b219ae13 100644 --- a/doc/release-notes/release-notes-0.17.1.md +++ b/doc/release-notes/release-notes-0.17.1.md @@ -22,7 +22,7 @@ How to Upgrade 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) +installer (on Windows) or just copy over `/Applications/NYC3-Qt` (on Mac) or `bitcoind`/`bitcoin-qt` (on Linux). If your node has a txindex, the txindex db will be migrated the first time you run 0.17.0 or newer, which may take up to a few hours. Your node will not be functional until this migration completes. diff --git a/doc/release-notes/release-notes-0.3.12.md b/doc/release-notes/release-notes-0.3.12.md index 38715bc75..5cc2c7e72 100644 --- a/doc/release-notes/release-notes-0.3.12.md +++ b/doc/release-notes/release-notes-0.3.12.md @@ -10,4 +10,4 @@ If you have json-rpc code that checks the contents of the error string, you need http://www.bitcoin.org/smf/index.php?topic=969.0 Download: -http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.3.12/ +http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.3.12/ diff --git a/doc/release-notes/release-notes-0.3.13.md b/doc/release-notes/release-notes-0.3.13.md index 2b95ff233..f5f578f83 100644 --- a/doc/release-notes/release-notes-0.3.13.md +++ b/doc/release-notes/release-notes-0.3.13.md @@ -12,7 +12,7 @@ Gavin Andresen: * Clean shutdown on SIGTERM on Linux. Download: -http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.3.13/ +http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.3.13/ (Thanks Laszlo for the Mac OSX build!) diff --git a/doc/release-notes/release-notes-0.3.14.md b/doc/release-notes/release-notes-0.3.14.md index e73052ed9..f72a1caa8 100644 --- a/doc/release-notes/release-notes-0.3.14.md +++ b/doc/release-notes/release-notes-0.3.14.md @@ -1,5 +1,5 @@ Version 0.3.14 is now available -http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.3.14/ +http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.3.14/ Changes: * Key pool feature for safer wallet backup diff --git a/doc/release-notes/release-notes-0.3.15.md b/doc/release-notes/release-notes-0.3.15.md index b98052ef5..1311e7fc9 100644 --- a/doc/release-notes/release-notes-0.3.15.md +++ b/doc/release-notes/release-notes-0.3.15.md @@ -1,6 +1,6 @@ * paytxfee switch is now per KB, so it adds the correct fee for large transactions * sending avoids using coins with less than 6 confirmations if it can -* BitcoinMiner processes transactions in priority order based on age of dependencies +* NYC3Miner processes transactions in priority order based on age of dependencies * make sure generation doesn't start before block 74000 downloaded * bugfixes by Dean Gores * testnet, keypoololdest and paytxfee added to getinfo diff --git a/doc/release-notes/release-notes-0.3.20.2.md b/doc/release-notes/release-notes-0.3.20.2.md index 09ecb736b..9b83d15c6 100644 --- a/doc/release-notes/release-notes-0.3.20.2.md +++ b/doc/release-notes/release-notes-0.3.20.2.md @@ -3,9 +3,9 @@ worse as people upgraded, so I cherry-picked the bug fix and created a minor rel The Amazon Machine Images I used to do the builds are available: - ami-38a05251 Bitcoin-v0.3.20.2 Mingw (Windows; Administrator password 'bitcoin development') - ami-30a05259 Bitcoin_0.3.20.2 Linux32 - ami-8abc4ee3 Bitcoin_0.3.20.2 Linux64 + ami-38a05251 NYC3-v0.3.20.2 Mingw (Windows; Administrator password 'bitcoin development') + ami-30a05259 NYC3_0.3.20.2 Linux32 + ami-8abc4ee3 NYC3_0.3.20.2 Linux64 (mac build will be done soon) diff --git a/doc/release-notes/release-notes-0.3.21.md b/doc/release-notes/release-notes-0.3.21.md index f3b6bc426..14d76a94c 100644 --- a/doc/release-notes/release-notes-0.3.21.md +++ b/doc/release-notes/release-notes-0.3.21.md @@ -1,5 +1,5 @@ -Binaries for Bitcoin version 0.3.21 are available at: - https://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.3.21/ +Binaries for NYC3 version 0.3.21 are available at: + https://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.3.21/ Changes and new features from the 0.3.20 release include: diff --git a/doc/release-notes/release-notes-0.3.22.md b/doc/release-notes/release-notes-0.3.22.md index 4c05e3e5e..f2cbab7c1 100644 --- a/doc/release-notes/release-notes-0.3.22.md +++ b/doc/release-notes/release-notes-0.3.22.md @@ -1,4 +1,4 @@ -Download URL: https://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.3.22/ +Download URL: https://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.3.22/ This is largely a bugfix and TX fee schedule release. We also hope to make 0.3.23 a quick release, to fix problems that the network has seen due to explosive growth in the past week. diff --git a/doc/release-notes/release-notes-0.3.23.md b/doc/release-notes/release-notes-0.3.23.md index c1d520e49..9929b292f 100644 --- a/doc/release-notes/release-notes-0.3.23.md +++ b/doc/release-notes/release-notes-0.3.23.md @@ -1,5 +1,5 @@ Win32, Linux, MacOSX and source releases for bitcoin v0.3.23 have been uploaded to -https://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.3.23/ +https://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.3.23/ This is another quick bugfix release, trying to deal with the influx of new bitcoin users. diff --git a/doc/release-notes/release-notes-0.3.24.md b/doc/release-notes/release-notes-0.3.24.md index d35ac66f2..8d5249e6a 100644 --- a/doc/release-notes/release-notes-0.3.24.md +++ b/doc/release-notes/release-notes-0.3.24.md @@ -1,5 +1,5 @@ -Bitcoin v0.3.24 is now available for download at -https://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.3.24/ +NYC3 v0.3.24 is now available for download at +https://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.3.24/ This is another bug fix release. We had hoped to have wallet encryption ready for release, but more urgent fixes for existing clients were needed -- most notably block download problems were getting severe. Wallet encryption is ready for testing at https://github.com/bitcoin/bitcoin/pull/352 for the git-savvy, and hopefully will follow shortly in the next release, v0.4. @@ -15,6 +15,6 @@ C1) DNS seeding enabled by default. C2) UPNP enabled by default in the GUI client. The percentage of bitcoin clients that accept incoming connections is quite small, and that is a problem. This should help. bitcoind, and unofficial builds, are unchanged (though we encourage use of "-upnp" to help the network!) -C3) Initial unit testing framework. Bitcoin sorely needs automated tests, and this is a beginning. Contributions welcome. +C3) Initial unit testing framework. NYC3 sorely needs automated tests, and this is a beginning. Contributions welcome. C4) Internal wallet code cleanup. While invisible to an end user, this change provides the basis for v0.4's wallet encryption. diff --git a/doc/release-notes/release-notes-0.4.0.md b/doc/release-notes/release-notes-0.4.0.md index 145072a36..d3282325d 100644 --- a/doc/release-notes/release-notes-0.4.0.md +++ b/doc/release-notes/release-notes-0.4.0.md @@ -1,5 +1,5 @@ -Bitcoin version 0.4.0 is now available for download at: -http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.4.0/ +NYC3 version 0.4.0 is now available for download at: +http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.4.0/ The main feature in this release is wallet private key encryption; you can set a passphrase that must be entered before sending coins. @@ -27,14 +27,14 @@ Optimize database writes for large (lots of inputs) transactions Wallet Encryption -Bitcoin supports native wallet encryption so that people who steal your -wallet file don't automatically get access to all of your Bitcoins. +NYC3 supports native wallet encryption so that people who steal your +wallet file don't automatically get access to all of your NYC3s. In order to enable this feature, choose "Encrypt Wallet" from the Options menu. You will be prompted to enter a passphrase, which will be used as the key to encrypt your wallet and will be needed -every time you wish to send Bitcoins. If you lose this passphrase, +every time you wish to send NYC3s. If you lose this passphrase, you will lose access to spend all of the bitcoins in your wallet, -no one, not even the Bitcoin developers can recover your Bitcoins. +no one, not even the NYC3 developers can recover your NYC3s. This means you are responsible for your own security, store your passphrase in a secure location and do not forget it. @@ -46,24 +46,24 @@ relevant transactions, you are only protected from someone spending your coins. It is recommended that you backup your wallet file before you -encrypt your wallet. To do this, close the Bitcoin client and +encrypt your wallet. To do this, close the NYC3 client and copy the wallet.dat file from ~/.bitcoin/ on Linux, /Users/(user -name)/Application Support/Bitcoin/ on Mac OSX, and %APPDATA%/Bitcoin/ -on Windows (that is /Users/(user name)/AppData/Roaming/Bitcoin on +name)/Application Support/NYC3/ on Mac OSX, and %APPDATA%/NYC3/ +on Windows (that is /Users/(user name)/AppData/Roaming/NYC3 on Windows Vista and 7 and /Documents and Settings/(user name)/Application -Data/Bitcoin on Windows XP). Once you have copied that file to a -safe location, reopen the Bitcoin client and Encrypt your wallet. +Data/NYC3 on Windows XP). Once you have copied that file to a +safe location, reopen the NYC3 client and Encrypt your wallet. If everything goes fine, delete the backup and enjoy your encrypted wallet. Note that once you encrypt your wallet, you will never be -able to go back to a version of the Bitcoin client older than 0.4. +able to go back to a version of the NYC3 client older than 0.4. Keep in mind that you are always responsible for your own security. All it takes is a slightly more advanced wallet-stealing trojan which installs a keylogger to steal your wallet passphrase as you enter it -in addition to your wallet file and you have lost all your Bitcoins. +in addition to your wallet file and you have lost all your NYC3s. Wallet encryption cannot keep you safe if you do not practice good security, such as running up-to-date antivirus software, only -entering your wallet passphrase in the Bitcoin client and using the +entering your wallet passphrase in the NYC3 client and using the same passphrase only as your wallet passphrase. See the doc/README file in the bitcoin source for technical details diff --git a/doc/release-notes/release-notes-0.4.1.md b/doc/release-notes/release-notes-0.4.1.md index ac471a8d7..7f3effdcc 100644 --- a/doc/release-notes/release-notes-0.4.1.md +++ b/doc/release-notes/release-notes-0.4.1.md @@ -1,5 +1,5 @@ -Bitcoin version 0.4.1 is now available for download at: -http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.4.1/ +NYC3 version 0.4.1 is now available for download at: +http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.4.1/ This is a bugfix only release based on 0.4.0. @@ -7,30 +7,30 @@ Please report bugs by replying to this forum thread. MAJOR BUG FIX (CVE-2011-4447) -The wallet encryption feature introduced in Bitcoin version 0.4.0 did not sufficiently secure the private keys. An attacker who +The wallet encryption feature introduced in NYC3 version 0.4.0 did not sufficiently secure the private keys. An attacker who managed to get a copy of your encrypted wallet.dat file might be able to recover some or all of the unencrypted keys and steal the associated coins. -If you have a previously encrypted wallet.dat, the first time you run wxbitcoin or bitcoind the wallet will be rewritten, Bitcoin will +If you have a previously encrypted wallet.dat, the first time you run wxbitcoin or bitcoind the wallet will be rewritten, NYC3 will shut down, and you will be prompted to restart it to run with the new, properly encrypted file. If you had a previously encrypted wallet.dat that might have been copied or stolen (for example, you backed it up to a public location) you should send all of your bitcoins to yourself using a new bitcoin address and stop using any previously generated addresses. -Wallets encrypted with this version of Bitcoin are written properly. +Wallets encrypted with this version of NYC3 are written properly. Technical note: the encrypted wallet's 'keypool' will be regenerated the first time you request a new bitcoin address; to be certain that the new private keys are properly backed up you should: -1. Run Bitcoin and let it rewrite the wallet.dat file +1. Run NYC3 and let it rewrite the wallet.dat file 2. Run it again, then ask it for a new bitcoin address. -wxBitcoin: new address visible on main window +wxNYC3: new address visible on main window bitcoind: run the 'walletpassphrase' RPC command to unlock the wallet, then run the 'getnewaddress' RPC command. 3. If your encrypted wallet.dat may have been copied or stolen, send all of your bitcoins to the new bitcoin address. -4. Shut down Bitcoin, then backup the wallet.dat file. +4. Shut down NYC3, then backup the wallet.dat file. IMPORTANT: be sure to request a new bitcoin address before backing up, so that the 'keypool' is regenerated and backed up. "Security in depth" is always a good idea, so choosing a secure location for the backup and/or encrypting the backup before uploading it is recommended. And as in previous releases, if your machine is infected by malware there are several ways an attacker might steal your bitcoins. diff --git a/doc/release-notes/release-notes-0.4.3.md b/doc/release-notes/release-notes-0.4.3.md index fea1ae75b..26de2562d 100644 --- a/doc/release-notes/release-notes-0.4.3.md +++ b/doc/release-notes/release-notes-0.4.3.md @@ -3,7 +3,7 @@ http://luke.dashjr.org/programs/bitcoin/files/bitcoind-0.4.3/ (until Gavin uploa This is a bugfix-only release based on 0.4.0. -Please note that the wxBitcoin GUI client is no longer maintained nor supported. If someone would like to step up to maintain this, they should contact Luke-Jr. +Please note that the wxNYC3 GUI client is no longer maintained nor supported. If someone would like to step up to maintain this, they should contact Luke-Jr. Please report bugs for the daemon only using the issue tracker at github: https://github.com/bitcoin/bitcoin/issues @@ -15,7 +15,7 @@ BUG FIXES Cease locking memory used by non-sensitive information (this caused a huge performance hit on some platforms, especially noticable during initial blockchain download). Fixed some address-handling deadlocks (client freezes). -No longer accept inbound connections over the internet when Bitcoin is being used with Tor (identity leak). +No longer accept inbound connections over the internet when NYC3 is being used with Tor (identity leak). Use the correct base transaction fee of 0.0005 BTC for accepting transactions into mined blocks (since 0.4.0, it was incorrectly accepting 0.0001 BTC which was only meant to be relayed). Add new DNS seeds (maintained by Pieter Wuille and Luke Dashjr). diff --git a/doc/release-notes/release-notes-0.4.4.md b/doc/release-notes/release-notes-0.4.4.md index f435ba716..c472210ca 100644 --- a/doc/release-notes/release-notes-0.4.4.md +++ b/doc/release-notes/release-notes-0.4.4.md @@ -1,9 +1,9 @@ -Bitcoin version 0.4.4 is now available for download at: +NYC3 version 0.4.4 is now available for download at: http://luke.dashjr.org/programs/bitcoin/files/bitcoind-0.4.4/ This is a bugfix-only release based on 0.4.0. -Please note that the wxBitcoin GUI client is no longer maintained nor supported. If someone would like to step up to maintain this, they should contact Luke-Jr. +Please note that the wxNYC3 GUI client is no longer maintained nor supported. If someone would like to step up to maintain this, they should contact Luke-Jr. Please report bugs for the daemon only using the issue tracker at github: https://github.com/bitcoin/bitcoin/issues diff --git a/doc/release-notes/release-notes-0.4.6.md b/doc/release-notes/release-notes-0.4.6.md index 07c5e4b69..8b677f910 100644 --- a/doc/release-notes/release-notes-0.4.6.md +++ b/doc/release-notes/release-notes-0.4.6.md @@ -1,11 +1,11 @@ bitcoind version 0.4.6 is now available for download at: Windows: installer | zip (sig) Source: tar.gz -bitcoind and Bitcoin-Qt version 0.6.0.7 are also tagged in git, but it is recommended to upgrade to 0.6.1. +bitcoind and NYC3-Qt version 0.6.0.7 are also tagged in git, but it is recommended to upgrade to 0.6.1. These are bugfix-only releases. -Please report bugs by replying to this forum thread. Note that the 0.4.x wxBitcoin GUI client is no longer maintained nor supported. If someone would like to step up to maintain this, they should contact Luke-Jr. +Please report bugs by replying to this forum thread. Note that the 0.4.x wxNYC3 GUI client is no longer maintained nor supported. If someone would like to step up to maintain this, they should contact Luke-Jr. BUG FIXES @@ -13,25 +13,25 @@ Version 0.6.0 allowed importing invalid "private keys", which would be unspendab Verify status of encrypt/decrypt calls to detect failed padding Check blocks for duplicate transactions earlier. Fixes #1167 Upgrade Windows builds to OpenSSL 1.0.1b -Set label when selecting an address that already has a label. Fixes #1080 (Bitcoin-Qt) +Set label when selecting an address that already has a label. Fixes #1080 (NYC3-Qt) JSON-RPC listtransactions's from/count handling is now fixed Optimize and fix multithreaded access, when checking whether we already know about transactions Fix potential networking deadlock Proper support for Growl 1.3 notifications Display an error, rather than crashing, if encoding a QR Code failed (0.6.0.7) -Don't erroneously set "Display addresses" for users who haven't explicitly enabled it (Bitcoin-Qt) +Don't erroneously set "Display addresses" for users who haven't explicitly enabled it (NYC3-Qt) Some non-ASCII input in JSON-RPC expecting hexadecimal may have been misinterpreted rather than rejected Missing error condition checking added -Do not show green tick unless all known blocks are downloaded. Fixes #921 (Bitcoin-Qt) +Do not show green tick unless all known blocks are downloaded. Fixes #921 (NYC3-Qt) Increase time ago of last block for "up to date" status from 30 to 90 minutes -Show a message box when runaway exception happens (Bitcoin-Qt) +Show a message box when runaway exception happens (NYC3-Qt) Use a messagebox to display the error when -server is provided without providing a rpc password -Show error message instead of exception crash when unable to bind RPC port (Bitcoin-Qt) -Correct sign message bitcoin address tooltip. Fixes #1050 (Bitcoin-Qt) +Show error message instead of exception crash when unable to bind RPC port (NYC3-Qt) +Correct sign message bitcoin address tooltip. Fixes #1050 (NYC3-Qt) Removed "(no label)" from QR Code dialog titlebar if we have no label (0.6.0.7) Removed an ugly line break in tooltip for mature transactions (0.6.0.7) -Add missing tooltip and key shortcut in settings dialog (part of #1088) (Bitcoin-Qt) +Add missing tooltip and key shortcut in settings dialog (part of #1088) (NYC3-Qt) Work around issue in boost::program_options that prevents from compiling in clang Fixed bugs occurring only on platforms with unsigned characters (such as ARM). -Rename make_windows_icon.py to .sh as it is a shell script. Fixes #1099 (Bitcoin-Qt) +Rename make_windows_icon.py to .sh as it is a shell script. Fixes #1099 (NYC3-Qt) Various trivial internal corrections to types used for counting/size loops and warnings diff --git a/doc/release-notes/release-notes-0.5.0.md b/doc/release-notes/release-notes-0.5.0.md index baa409b5f..835e04b14 100644 --- a/doc/release-notes/release-notes-0.5.0.md +++ b/doc/release-notes/release-notes-0.5.0.md @@ -1,5 +1,5 @@ -Bitcoin version 0.5.0 is now available for download at: -http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.5.0/ +NYC3 version 0.5.0 is now available for download at: +http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.5.0/ The major change for this release is a completely new graphical interface that uses the Qt user interface toolkit. @@ -13,30 +13,30 @@ For Ubuntu users, there is a new ppa maintained by Matt Corallo which you can ad MAJOR BUG FIX (CVE-2011-4447) -The wallet encryption feature introduced in Bitcoin version 0.4.0 did not sufficiently secure the private keys. An attacker who +The wallet encryption feature introduced in NYC3 version 0.4.0 did not sufficiently secure the private keys. An attacker who managed to get a copy of your encrypted wallet.dat file might be able to recover some or all of the unencrypted keys and steal the associated coins. -If you have a previously encrypted wallet.dat, the first time you run bitcoin-qt or bitcoind the wallet will be rewritten, Bitcoin will +If you have a previously encrypted wallet.dat, the first time you run bitcoin-qt or bitcoind the wallet will be rewritten, NYC3 will shut down, and you will be prompted to restart it to run with the new, properly encrypted file. If you had a previously encrypted wallet.dat that might have been copied or stolen (for example, you backed it up to a public location) you should send all of your bitcoins to yourself using a new bitcoin address and stop using any previously generated addresses. -Wallets encrypted with this version of Bitcoin are written properly. +Wallets encrypted with this version of NYC3 are written properly. Technical note: the encrypted wallet's 'keypool' will be regenerated the first time you request a new bitcoin address; to be certain that the new private keys are properly backed up you should: -1. Run Bitcoin and let it rewrite the wallet.dat file +1. Run NYC3 and let it rewrite the wallet.dat file 2. Run it again, then ask it for a new bitcoin address. -Bitcoin-Qt: Address Book, then New Address... +NYC3-Qt: Address Book, then New Address... bitcoind: run the 'walletpassphrase' RPC command to unlock the wallet, then run the 'getnewaddress' RPC command. 3. If your encrypted wallet.dat may have been copied or stolen, send all of your bitcoins to the new bitcoin address. -4. Shut down Bitcoin, then backup the wallet.dat file. +4. Shut down NYC3, then backup the wallet.dat file. IMPORTANT: be sure to request a new bitcoin address before backing up, so that the 'keypool' is regenerated and backed up. "Security in depth" is always a good idea, so choosing a secure location for the backup and/or encrypting the backup before uploading it is recommended. And as in previous releases, if your machine is infected by malware there are several ways an attacker might steal your bitcoins. diff --git a/doc/release-notes/release-notes-0.5.1.md b/doc/release-notes/release-notes-0.5.1.md index d56bff6d9..926b9f06f 100644 --- a/doc/release-notes/release-notes-0.5.1.md +++ b/doc/release-notes/release-notes-0.5.1.md @@ -1,5 +1,5 @@ -Bitcoin version 0.5.1 is now available for download at: -http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.5.1/ +NYC3 version 0.5.1 is now available for download at: +http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.5.1/ This is a bugfix-only release. diff --git a/doc/release-notes/release-notes-0.5.2.md b/doc/release-notes/release-notes-0.5.2.md index f79816668..8891d23f1 100644 --- a/doc/release-notes/release-notes-0.5.2.md +++ b/doc/release-notes/release-notes-0.5.2.md @@ -1,5 +1,5 @@ -Bitcoin version 0.5.2 is now available for download at: -http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.5.2/ +NYC3 version 0.5.2 is now available for download at: +http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.5.2/ This is a bugfix-only release based on 0.5.1. @@ -15,7 +15,7 @@ Check all transactions in blocks after the last checkpoint (0.5.0 and 0.5.1 skip Cease locking memory used by non-sensitive information (this caused a huge performance hit on some platforms, especially noticable during initial blockchain download; this was not a security vulnerability). Fixed some address-handling deadlocks (client freezes). -No longer accept inbound connections over the internet when Bitcoin is being used with Tor (identity leak). +No longer accept inbound connections over the internet when NYC3 is being used with Tor (identity leak). Re-enable SSL support for the JSON-RPC interface (it was unintentionally disabled for the 0.5.0 and 0.5.1 release Linux binaries). Use the correct base transaction fee of 0.0005 BTC for accepting transactions into mined blocks (since 0.4.0, it was incorrectly accepting 0.0001 BTC which was only meant to be relayed). Don't show "IP" for transactions which are not necessarily IP transactions. diff --git a/doc/release-notes/release-notes-0.5.3.md b/doc/release-notes/release-notes-0.5.3.md index 7c84c5332..bf0bd2ae1 100644 --- a/doc/release-notes/release-notes-0.5.3.md +++ b/doc/release-notes/release-notes-0.5.3.md @@ -1,5 +1,5 @@ -Bitcoin version 0.5.3 is now available for download at: -http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.5.3/ +NYC3 version 0.5.3 is now available for download at: +http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.5.3/ This is a bugfix-only release based on 0.5.1. It also includes a few protocol updates. @@ -13,7 +13,7 @@ http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v0.5.3#.tar.gz PROTOCOL UPDATES BIP 30: Introduce a new network rule: "a block is not valid if it contains a transaction whose hash already exists in the block chain, unless all that transaction's outputs were already spent before said block" beginning on March 15, 2012, 00:00 UTC. -On testnet, allow mining of min-difficulty blocks if 20 minutes have gone by without mining a regular-difficulty block. This is to make testing Bitcoin easier, and will not affect normal mode. +On testnet, allow mining of min-difficulty blocks if 20 minutes have gone by without mining a regular-difficulty block. This is to make testing NYC3 easier, and will not affect normal mode. BUG FIXES @@ -24,19 +24,19 @@ Resolved multiple bugs preventing long-term unlocking of encrypted wallets Only send local IP in "version" messages if it is globally routable (ie, not private), and try to get such an IP from UPnP if applicable. Reannounce UPnP port forwards every 20 minutes, to workaround routers expiring old entries, and allow the -upnp option to override any stored setting. Skip splash screen when -min is used, and fix Minimize to Tray function. -Do not blank "label" in Bitcoin-Qt "Send" tab, if the user has already entered something. +Do not blank "label" in NYC3-Qt "Send" tab, if the user has already entered something. Correct various labels and messages. Various memory leaks and potential null pointer deferences have been fixed. -Handle invalid Bitcoin URIs using "bitcoin://" instead of "bitcoin:". +Handle invalid NYC3 URIs using "bitcoin://" instead of "bitcoin:". Several shutdown issues have been fixed. Revert to "global progress indication", as starting from zero every time was considered too confusing for many users. Check that keys stored in the wallet are valid at startup, and if not, report corruption. Enable accessible widgets on Windows, so that people with screen readers such as NVDA can make sense of it. Various build fixes. If no password is specified to bitcoind, recommend a secure password. -Automatically focus and scroll to new "Send coins" entries in Bitcoin-Qt. -Show a message box for --help on Windows, for Bitcoin-Qt. +Automatically focus and scroll to new "Send coins" entries in NYC3-Qt. +Show a message box for --help on Windows, for NYC3-Qt. Add missing "About Qt" menu option to show built-in Qt About dialog. -Don't show "-daemon" as an option for Bitcoin-Qt, since it isn't available. +Don't show "-daemon" as an option for NYC3-Qt, since it isn't available. Update hard-coded fallback seed nodes, choosing recent ones with long uptime and versions at least 0.4.0. Add checkpoint at block 168,000. diff --git a/doc/release-notes/release-notes-0.5.4.md b/doc/release-notes/release-notes-0.5.4.md index fcde3ac4e..34a590182 100644 --- a/doc/release-notes/release-notes-0.5.4.md +++ b/doc/release-notes/release-notes-0.5.4.md @@ -1,5 +1,5 @@ -Bitcoin version 0.5.4 is now available for download at: -http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.5.4/ +NYC3 version 0.5.4 is now available for download at: +http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.5.4/ NOTE: 0.5.4rc3 is being renamed to 0.5.4 final with no changes. This is a bugfix-only release in the 0.5.x series, plus a few protocol updates. @@ -22,8 +22,8 @@ Fix broken testnet mining. Stop excess inventory relay during initial block download. When disconnecting a node, clear the received buffer so that we do not process any already received messages. Yet another attempt at implementing "minimize to tray" that works on all operating systems. -Fix Bitcoin-Qt notifications under Growl 1.3. -Increase required age of Bitcoin-Qt's "not up to date" status from 30 to 90 minutes. +Fix NYC3-Qt notifications under Growl 1.3. +Increase required age of NYC3-Qt's "not up to date" status from 30 to 90 minutes. Implemented missing verifications that led to crash on entering some wrong passphrases for encrypted wallets. Fix default filename suffixes in GNOME save dialog. Make the "Send coins" tab use the configured unit type, even on the first attempt. @@ -31,7 +31,7 @@ Print detailed wallet loading errors to debug.log when it is corrupt. Allocate exactly the amount of space needed for signing transactions, instead of a fixed 10k buffer. Workaround for improbable memory access violation. Check wallet's minimum version before trying to load it. -Remove wxBitcoin properly when installing Bitcoin-Qt over it. (Windows) +Remove wxNYC3 properly when installing NYC3-Qt over it. (Windows) Detail reorganization information better in debug log. Use a messagebox to display the error when -server is provided without configuring a RPC password. Testing suite build now honours provided CXXFLAGS. diff --git a/doc/release-notes/release-notes-0.5.5.md b/doc/release-notes/release-notes-0.5.5.md index 75ebc3e6b..570b1cbc9 100644 --- a/doc/release-notes/release-notes-0.5.5.md +++ b/doc/release-notes/release-notes-0.5.5.md @@ -1,11 +1,11 @@ -bitcoind and Bitcoin-Qt version 0.5.5 are now available for download at: +bitcoind and NYC3-Qt version 0.5.5 are now available for download at: Windows: installer | zip (sig) Source: tar.gz -bitcoind and Bitcoin-Qt version 0.6.0.7 are also tagged in git, but it is recommended to upgrade to 0.6.1. +bitcoind and NYC3-Qt version 0.6.0.7 are also tagged in git, but it is recommended to upgrade to 0.6.1. These are bugfix-only releases. -Please report bugs by replying to this forum thread. Note that the 0.4.x wxBitcoin GUI client is no longer maintained nor supported. If someone would like to step up to maintain this, they should contact Luke-Jr. +Please report bugs by replying to this forum thread. Note that the 0.4.x wxNYC3 GUI client is no longer maintained nor supported. If someone would like to step up to maintain this, they should contact Luke-Jr. BUG FIXES @@ -13,25 +13,25 @@ Version 0.6.0 allowed importing invalid "private keys", which would be unspendab Verify status of encrypt/decrypt calls to detect failed padding Check blocks for duplicate transactions earlier. Fixes #1167 Upgrade Windows builds to OpenSSL 1.0.1b -Set label when selecting an address that already has a label. Fixes #1080 (Bitcoin-Qt) +Set label when selecting an address that already has a label. Fixes #1080 (NYC3-Qt) JSON-RPC listtransactions's from/count handling is now fixed Optimize and fix multithreaded access, when checking whether we already know about transactions Fix potential networking deadlock Proper support for Growl 1.3 notifications Display an error, rather than crashing, if encoding a QR Code failed (0.6.0.7) -Don't erroneously set "Display addresses" for users who haven't explicitly enabled it (Bitcoin-Qt) +Don't erroneously set "Display addresses" for users who haven't explicitly enabled it (NYC3-Qt) Some non-ASCII input in JSON-RPC expecting hexadecimal may have been misinterpreted rather than rejected Missing error condition checking added -Do not show green tick unless all known blocks are downloaded. Fixes #921 (Bitcoin-Qt) +Do not show green tick unless all known blocks are downloaded. Fixes #921 (NYC3-Qt) Increase time ago of last block for "up to date" status from 30 to 90 minutes -Show a message box when runaway exception happens (Bitcoin-Qt) +Show a message box when runaway exception happens (NYC3-Qt) Use a messagebox to display the error when -server is provided without providing a rpc password -Show error message instead of exception crash when unable to bind RPC port (Bitcoin-Qt) -Correct sign message bitcoin address tooltip. Fixes #1050 (Bitcoin-Qt) +Show error message instead of exception crash when unable to bind RPC port (NYC3-Qt) +Correct sign message bitcoin address tooltip. Fixes #1050 (NYC3-Qt) Removed "(no label)" from QR Code dialog titlebar if we have no label (0.6.0.7) Removed an ugly line break in tooltip for mature transactions (0.6.0.7) -Add missing tooltip and key shortcut in settings dialog (part of #1088) (Bitcoin-Qt) +Add missing tooltip and key shortcut in settings dialog (part of #1088) (NYC3-Qt) Work around issue in boost::program_options that prevents from compiling in clang Fixed bugs occurring only on platforms with unsigned characters (such as ARM). -Rename make_windows_icon.py to .sh as it is a shell script. Fixes #1099 (Bitcoin-Qt) +Rename make_windows_icon.py to .sh as it is a shell script. Fixes #1099 (NYC3-Qt) Various trivial internal corrections to types used for counting/size loops and warnings diff --git a/doc/release-notes/release-notes-0.6.0.md b/doc/release-notes/release-notes-0.6.0.md index 1963a3625..fcc007726 100644 --- a/doc/release-notes/release-notes-0.6.0.md +++ b/doc/release-notes/release-notes-0.6.0.md @@ -1,5 +1,5 @@ -Bitcoin version 0.6.0 is now available for download at: -http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.6.0/test/ +NYC3 version 0.6.0 is now available for download at: +http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.6.0/test/ This release includes more than 20 language localizations. More translations are welcome; join the @@ -38,7 +38,7 @@ hours). Backup Wallet menu option. -Bitcoin-Qt can display and save QR codes for sending +NYC3-Qt can display and save QR codes for sending and receiving addresses. New context menu on addresses to copy/edit/delete them. @@ -54,14 +54,14 @@ transactions and less traffic on the bitcoin network. The shorter keys are already supported by the network but wallet.dat files containing short keys are not compatible with earlier -versions of Bitcoin-Qt/bitcoind. +versions of NYC3-Qt/bitcoind. New command-line argument -blocknotify= that will spawn a shell process to run when a new block is accepted. New command-line argument -splash=0 to disable -Bitcoin-Qt's initial splash screen +NYC3-Qt's initial splash screen validateaddress JSON-RPC api command output includes two new fields for addresses in the wallet: @@ -105,10 +105,10 @@ attacks were fixed. NOT YET IMPLEMENTED FEATURES Support for clicking on bitcoin: URIs and -opening/launching Bitcoin-Qt is available only on Linux, +opening/launching NYC3-Qt is available only on Linux, and only if you configure your desktop to launch -Bitcoin-Qt. All platforms support dragging and dropping -bitcoin: URIs onto the Bitcoin-Qt window to start +NYC3-Qt. All platforms support dragging and dropping +bitcoin: URIs onto the NYC3-Qt window to start payment. @@ -125,7 +125,7 @@ with this release multisignature transactions are considered standard and will start to be relayed and accepted into blocks. -It is expected that future releases of Bitcoin-Qt +It is expected that future releases of NYC3-Qt will support the creation of multisignature transactions, once enough of the network has upgraded so relaying and validating them is robust. diff --git a/doc/release-notes/release-notes-0.6.2.md b/doc/release-notes/release-notes-0.6.2.md index bb85fb23a..141c7a1d9 100644 --- a/doc/release-notes/release-notes-0.6.2.md +++ b/doc/release-notes/release-notes-0.6.2.md @@ -1,5 +1,5 @@ -Bitcoin version 0.6.2 is now available for download at: -http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.6.2/ +NYC3 version 0.6.2 is now available for download at: +http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.6.2/ This is a bug-fix and code-cleanup release, with no major new features. diff --git a/doc/release-notes/release-notes-0.6.3.md b/doc/release-notes/release-notes-0.6.3.md index c27f607b5..df49607cc 100644 --- a/doc/release-notes/release-notes-0.6.3.md +++ b/doc/release-notes/release-notes-0.6.3.md @@ -1,5 +1,5 @@ -Bitcoin version 0.6.3 is now available for download at: - http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.6.3/ +NYC3 version 0.6.3 is now available for download at: + http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.6.3/ This is a bug-fix release, with no new features. @@ -20,10 +20,10 @@ Fixed an obscure bug that could cause the bitcoin process to get stuck on an invalid block-chain, if the invalid chain was hundreds of blocks long. -Bitcoin-Qt no longer automatically selects the first address +NYC3-Qt no longer automatically selects the first address in the address book (Issue #1384). -Fixed minimize-to-dock behavior of Bitcoin-Qt on the Mac. +Fixed minimize-to-dock behavior of NYC3-Qt on the Mac. Added a block checkpoint at block 185,333 to speed up initial blockchain download. diff --git a/doc/release-notes/release-notes-0.7.0.md b/doc/release-notes/release-notes-0.7.0.md index d33a58f99..d77ac93b7 100644 --- a/doc/release-notes/release-notes-0.7.0.md +++ b/doc/release-notes/release-notes-0.7.0.md @@ -1,7 +1,7 @@ -Bitcoin version 0.7.0 is now available for download at: - http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.7.0/ +NYC3 version 0.7.0 is now available for download at: + http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.7.0/ -We recommend that everybody running prior versions of bitcoind/Bitcoin-Qt +We recommend that everybody running prior versions of bitcoind/NYC3-Qt upgrade to this release, except for users running Mac OSX 10.5. Please report bugs using the issue tracker at github: @@ -27,7 +27,7 @@ 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 Code: -/Applications/Bitcoin-Qt +/Applications/NYC3-Qt (on Mac) or Code: bitcoind/bitcoin-qt @@ -45,7 +45,7 @@ Incompatible Changes and 'getrawmempool' commands. * Remove deprecated RPC 'getblocknumber' -Bitcoin Improvement Proposals implemented +NYC3 Improvement Proposals implemented BIP 22 - 'getblocktemplate', 'submitblock' RPCs BIP 34 - block version 2, height in coinbase diff --git a/doc/release-notes/release-notes-0.7.1.md b/doc/release-notes/release-notes-0.7.1.md index 22e910c09..b01758268 100644 --- a/doc/release-notes/release-notes-0.7.1.md +++ b/doc/release-notes/release-notes-0.7.1.md @@ -1,5 +1,5 @@ -Bitcoin version 0.7.1 is now available from: - http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.7.1/ +NYC3 version 0.7.1 is now available from: + http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.7.1/ This is a bug-fix minor release. @@ -30,7 +30,7 @@ How to Upgrade 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). +/Applications/NYC3-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 @@ -75,7 +75,7 @@ Dependency changes Bug fixes --------- -* Clicking on a bitcoin: URI on Windows should now launch Bitcoin-Qt properly. +* Clicking on a bitcoin: URI on Windows should now launch NYC3-Qt properly. * When running -testnet, use RPC port 18332 by default. diff --git a/doc/release-notes/release-notes-0.7.2.md b/doc/release-notes/release-notes-0.7.2.md index 40af34962..ea68a7269 100644 --- a/doc/release-notes/release-notes-0.7.2.md +++ b/doc/release-notes/release-notes-0.7.2.md @@ -1,5 +1,5 @@ -Bitcoin version 0.7.2 is now available from: - http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.7.2 +NYC3 version 0.7.2 is now available from: + http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.7.2 This is a bug-fix minor release. @@ -12,7 +12,7 @@ How to Upgrade 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). +/Applications/NYC3-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 @@ -40,7 +40,7 @@ Bug fixes database twice. * Fix use-after-free problems in initialization and shutdown, the latter of - which caused Bitcoin-Qt to crash on Windows when exiting. + which caused NYC3-Qt to crash on Windows when exiting. * Correct library linking so building on Windows natively works. diff --git a/doc/release-notes/release-notes-0.8.0.md b/doc/release-notes/release-notes-0.8.0.md index 4e98a7740..7a19896ce 100644 --- a/doc/release-notes/release-notes-0.8.0.md +++ b/doc/release-notes/release-notes-0.8.0.md @@ -1,5 +1,5 @@ -Bitcoin-Qt version 0.8.0 is now available from: - http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.8.0/ +NYC3-Qt version 0.8.0 is now available from: + http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.8.0/ This is a major release designed to improve performance and handle the increasing volume of transactions on the network. @@ -13,7 +13,7 @@ How to Upgrade 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). +/Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). The first time you run after the upgrade a re-indexing process will be started that will take anywhere from 30 minutes to several hours, @@ -31,7 +31,7 @@ details). Improvements ------------ -Mac and Windows binaries are signed with certificates owned by the Bitcoin +Mac and Windows binaries are signed with certificates owned by the NYC3 Foundation, to be compatible with the new security features in OSX 10.8 and Windows 8. diff --git a/doc/release-notes/release-notes-0.8.1.md b/doc/release-notes/release-notes-0.8.1.md index 4fd546bee..493a7a8b4 100644 --- a/doc/release-notes/release-notes-0.8.1.md +++ b/doc/release-notes/release-notes-0.8.1.md @@ -1,5 +1,5 @@ -Bitcoin-Qt/bitcoind version 0.8.1 is now available from: - http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.8.1/ +NYC3-Qt/bitcoind version 0.8.1 is now available from: + http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.8.1/ This is a maintenance release that adds a new network rule to avoid a chain-forking incompatibility with versions 0.7.2 and earlier. @@ -14,7 +14,7 @@ How to Upgrade 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). +/Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). If you are upgrading from version 0.7.2 or earlier, the first time you run 0.8.1 your blockchain files will be re-indexed, which will take diff --git a/doc/release-notes/release-notes-0.8.2.md b/doc/release-notes/release-notes-0.8.2.md index eea9ba2a2..bbc865f7e 100644 --- a/doc/release-notes/release-notes-0.8.2.md +++ b/doc/release-notes/release-notes-0.8.2.md @@ -1,5 +1,5 @@ -Bitcoin-Qt version 0.8.2 is now available from: - http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.8.2/ +NYC3-Qt version 0.8.2 is now available from: + http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.8.2/ This is a maintenance release that fixes many bugs and includes a few small new features. @@ -13,7 +13,7 @@ How to Upgrade 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). +/Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). If you are upgrading from version 0.7.2 or earlier, the first time you run 0.8.2 your blockchain files will be re-indexed, which will take @@ -43,7 +43,7 @@ with code that automatically calculates and suggests appropriate fees in the 0.9 release and note that if you set a fee policy significantly different from the rest of the network your transactions may never confirm. -Bitcoin-Qt changes +NYC3-Qt changes * New icon and splash screen * Improve reporting of synchronization process @@ -97,8 +97,8 @@ Wallet compatibility/rescuing Known Bugs -* Entering the 'getblocktemplate' or 'getwork' RPC commands into the Bitcoin-Qt debug -console will cause Bitcoin-Qt to crash. Run Bitcoin-Qt with the -server command-line +* Entering the 'getblocktemplate' or 'getwork' RPC commands into the NYC3-Qt debug +console will cause NYC3-Qt to crash. Run NYC3-Qt with the -server command-line option to workaround. Thanks to everybody who contributed to the 0.8.2 release! diff --git a/doc/release-notes/release-notes-0.8.3.md b/doc/release-notes/release-notes-0.8.3.md index 856c20aa3..2888939f7 100644 --- a/doc/release-notes/release-notes-0.8.3.md +++ b/doc/release-notes/release-notes-0.8.3.md @@ -1,5 +1,5 @@ -Bitcoin-Qt version 0.8.3 is now available from: - http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.8.3/ +NYC3-Qt version 0.8.3 is now available from: + http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.8.3/ This is a maintenance release to fix a denial-of-service attack that can cause nodes to crash. diff --git a/doc/release-notes/release-notes-0.8.4.md b/doc/release-notes/release-notes-0.8.4.md index c6f31f1fa..91f767df0 100644 --- a/doc/release-notes/release-notes-0.8.4.md +++ b/doc/release-notes/release-notes-0.8.4.md @@ -1,5 +1,5 @@ -Bitcoin-Qt version 0.8.4 is now available from: - http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.8.4/ +NYC3-Qt version 0.8.4 is now available from: + http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.8.4/ This is a maintenance release to fix a critical bug and three security issues; we urge all users to upgrade. @@ -14,7 +14,7 @@ How to Upgrade 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). +/Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). If you are upgrading from version 0.7.2 or earlier, the first time you run 0.8.4 your blockchain files will be re-indexed, which will take @@ -29,7 +29,7 @@ Security issues An attacker could send a series of messages that resulted in an integer division-by-zero error in the Bloom Filter handling -code, causing the Bitcoin-Qt or bitcoind process to crash. +code, causing the NYC3-Qt or bitcoind process to crash. Bloom filters were introduced with version 0.8, so versions 0.8.0 through 0.8.3 are vulnerable to this critical denial-of-service attack. @@ -59,7 +59,7 @@ Linux: clicking on bitcoin: links was broken if you were using a Gnome-based desktop. Fix a hang-at-shutdown bug that only affects users that compile -their own version of Bitcoin against Boost versions 1.50-1.52. +their own version of NYC3 against Boost versions 1.50-1.52. Other changes ------------- diff --git a/doc/release-notes/release-notes-0.8.5.md b/doc/release-notes/release-notes-0.8.5.md index aa93fe7c7..e65b862dd 100644 --- a/doc/release-notes/release-notes-0.8.5.md +++ b/doc/release-notes/release-notes-0.8.5.md @@ -1,5 +1,5 @@ -Bitcoin-Qt version 0.8.5 is now available from: - http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.8.5/ +NYC3-Qt version 0.8.5 is now available from: + http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.8.5/ This is a maintenance release to fix a critical bug; we urge all users to upgrade. @@ -14,7 +14,7 @@ How to Upgrade 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). +/Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). If you are upgrading from version 0.7.2 or earlier, the first time you run 0.8.5 your blockchain files will be re-indexed, which will take diff --git a/doc/release-notes/release-notes-0.8.6.md b/doc/release-notes/release-notes-0.8.6.md index 39a45e0db..74b79779b 100644 --- a/doc/release-notes/release-notes-0.8.6.md +++ b/doc/release-notes/release-notes-0.8.6.md @@ -1,6 +1,6 @@ -Bitcoin-Qt version 0.8.6 final is now available from: +NYC3-Qt version 0.8.6 final is now available from: - http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.8.6/ + http://sourceforge.net/projects/bitcoin/files/NYC3/bitcoin-0.8.6/ This is a maintenance release to fix a critical bug; we urge all users to upgrade. @@ -16,7 +16,7 @@ If you already downloaded 0.8.6rc1 you do not need to re-download. This release 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). +/Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). If you are upgrading from version 0.7.2 or earlier, the first time you run 0.8.6 your blockchain files will be re-indexed, which will take @@ -47,7 +47,7 @@ your machine. - Additional debug.log logging for diagnosis of network problems, log timestamps by default -- Fix Bitcoin-Qt startup crash when clicking dock icon on OSX +- Fix NYC3-Qt startup crash when clicking dock icon on OSX - Fix memory leaks in CKey::SetCompactSignature() and Key::SignCompact() diff --git a/doc/release-notes/release-notes-0.9.0.md b/doc/release-notes/release-notes-0.9.0.md index 0f14d89e8..79a4ce773 100644 --- a/doc/release-notes/release-notes-0.9.0.md +++ b/doc/release-notes/release-notes-0.9.0.md @@ -14,14 +14,14 @@ How to Upgrade 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), uninstall all -earlier versions of Bitcoin, then run the installer (on Windows) or just copy -over /Applications/Bitcoin-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). +earlier versions of NYC3, then run the installer (on Windows) or just copy +over /Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). If you are upgrading from version 0.7.2 or earlier, the first time you run 0.9.0 your blockchain files will be re-indexed, which will take anywhere from 30 minutes to several hours, depending on the speed of your machine. -On Windows, do not forget to uninstall all earlier versions of the Bitcoin +On Windows, do not forget to uninstall all earlier versions of the NYC3 client first, especially if you are switching to the 64-bit version. Windows 64-bit installer @@ -62,7 +62,7 @@ of minutes on a typical machine). Rebranding to NYC3 --------------------------- -To reduce confusion between Bitcoin-the-network and Bitcoin-the-software we +To reduce confusion between NYC3-the-network and NYC3-the-software we have renamed the reference client to NYC3. @@ -85,13 +85,13 @@ Autotools build system For 0.9.0 we switched to an autotools-based build system instead of individual (q)makefiles. -Using the standard "./autogen.sh; ./configure; make" to build Bitcoin-Qt and +Using the standard "./autogen.sh; ./configure; make" to build NYC3-Qt and bitcoind makes it easier for experienced open source developers to contribute to the project. Be sure to check doc/build-*.md for your platform before building from source. -Bitcoin-cli +NYC3-cli ------------- Another change in the 0.9 release is moving away from the bitcoind executable diff --git a/doc/release-notes/release-notes-0.9.1.md b/doc/release-notes/release-notes-0.9.1.md index cb3e3445a..46e7fce7e 100644 --- a/doc/release-notes/release-notes-0.9.1.md +++ b/doc/release-notes/release-notes-0.9.1.md @@ -20,7 +20,7 @@ How to Upgrade 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 +installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). If you are upgrading from version 0.7.2 or earlier, the first time you run diff --git a/doc/release-notes/release-notes-0.9.2.1.md b/doc/release-notes/release-notes-0.9.2.1.md index a1333948a..19313c8bd 100644 --- a/doc/release-notes/release-notes-0.9.2.1.md +++ b/doc/release-notes/release-notes-0.9.2.1.md @@ -15,7 +15,7 @@ How to Upgrade 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 +installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). If you are upgrading from version 0.7.2 or earlier, the first time you run diff --git a/doc/release-notes/release-notes-0.9.2.md b/doc/release-notes/release-notes-0.9.2.md index 811dfdf5d..98add9da9 100644 --- a/doc/release-notes/release-notes-0.9.2.md +++ b/doc/release-notes/release-notes-0.9.2.md @@ -15,7 +15,7 @@ How to Upgrade 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 +installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). If you are upgrading from version 0.7.2 or earlier, the first time you run diff --git a/doc/release-notes/release-notes-0.9.3.md b/doc/release-notes/release-notes-0.9.3.md index b8566bfbd..ef8cf50df 100644 --- a/doc/release-notes/release-notes-0.9.3.md +++ b/doc/release-notes/release-notes-0.9.3.md @@ -17,7 +17,7 @@ How to Upgrade 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 +installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). If you are upgrading from version 0.7.2 or earlier, the first time you run diff --git a/doc/release-notes/release-notes-0.9.4.md b/doc/release-notes/release-notes-0.9.4.md index bf26e1676..0a0baea2b 100644 --- a/doc/release-notes/release-notes-0.9.4.md +++ b/doc/release-notes/release-notes-0.9.4.md @@ -14,7 +14,7 @@ How to Upgrade 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 +installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). OpenSSL Warning @@ -22,7 +22,7 @@ OpenSSL Warning OpenSSL 1.0.0p / 1.0.1k was recently released and is being pushed out by various operating system maintainers. Review by Gregory Maxwell determined that -this update is incompatible with the Bitcoin system and could lead to consensus +this update is incompatible with the NYC3 system and could lead to consensus forks. NYC3 released binaries from https://bitcoin.org are unaffected, diff --git a/doc/release-notes/release-notes-0.9.5.md b/doc/release-notes/release-notes-0.9.5.md index b035fc3b3..a5695ffb4 100644 --- a/doc/release-notes/release-notes-0.9.5.md +++ b/doc/release-notes/release-notes-0.9.5.md @@ -15,7 +15,7 @@ How to Upgrade 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 +installer (on Windows) or just copy over /Applications/NYC3-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux). Notable changes @@ -27,7 +27,7 @@ Mining and relay policy enhancements NYC3's block templates are now for version 3 blocks only, and any mining software relying on its `getblocktemplate` must be updated in parallel to use libblkmaker either version 0.4.2 or any version from 0.5.1 onward. -If you are solo mining, this will affect you the moment you upgrade Bitcoin +If you are solo mining, this will affect you the moment you upgrade NYC3 Core, which must be done prior to BIP66 achieving its 951/1001 status. If you are mining with the stratum mining protocol: this does not affect you. If you are mining with the getblocktemplate protocol to a pool: this will affect diff --git a/doc/release-process.md b/doc/release-process.md index 2ac0cc9af..e214362d2 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -38,9 +38,9 @@ Check out the source code in the following directory hierarchy. git clone https://github.com/bitcoin-core/gitian.sigs.git git clone https://github.com/bitcoin-core/bitcoin-detached-sigs.git git clone https://github.com/devrandom/gitian-builder.git - git clone https://github.com/bitcoin/bitcoin.git + git clone https://github.com/nyc3coin/nyc3 -### Bitcoin maintainers/release engineers, suggestion for writing release notes +### NYC3 maintainers/release engineers, suggestion for writing release notes Write release notes. git shortlog helps a lot, for example: @@ -278,14 +278,14 @@ bitcoin.org (see below for bitcoin.org update instructions). - Update bitcoin.org version - - First, check to see if the Bitcoin.org maintainers have prepared a + - First, check to see if the NYC3.org maintainers have prepared a release: https://github.com/bitcoin-dot-org/bitcoin.org/labels/Core - If they have, it will have previously failed their Travis CI checks because the final release files weren't uploaded. Trigger a Travis CI rebuild---if it passes, merge. - - If they have not prepared a release, follow the Bitcoin.org release + - If they have not prepared a release, follow the NYC3.org release instructions: https://github.com/bitcoin-dot-org/bitcoin.org/blob/master/docs/adding-events-release-notes-and-alerts.md#release-notes - After the pull request is merged, the website will automatically show the newest version within 15 minutes, as well @@ -333,6 +333,6 @@ bitcoin.org (see below for bitcoin.org update instructions). - Update title of #bitcoin on Freenode IRC - - Optionally twitter, reddit /r/Bitcoin, ... but this will usually sort out itself + - Optionally twitter, reddit /r/NYC3, ... but this will usually sort out itself - Celebrate diff --git a/doc/shared-libraries.md b/doc/shared-libraries.md index e960863a8..8c866bb73 100644 --- a/doc/shared-libraries.md +++ b/doc/shared-libraries.md @@ -3,7 +3,7 @@ Shared Libraries ## bitcoinconsensus -The purpose of this library is to make the verification functionality that is critical to Bitcoin's consensus available to other applications, e.g. to language bindings. +The purpose of this library is to make the verification functionality that is critical to NYC3's consensus available to other applications, e.g. to language bindings. ### API @@ -43,7 +43,7 @@ The interface is defined in the C header `bitcoinconsensus.h` located in `src/sc - `bitcoinconsensus_ERR_AMOUNT_REQUIRED` - Input amount is required if WITNESS is used ### Example Implementations -- [NBitcoin](https://github.com/NicolasDorier/NBitcoin/blob/master/NBitcoin/Script.cs#L814) (.NET Bindings) +- [NNYC3](https://github.com/NicolasDorier/NNYC3/blob/master/NNYC3/Script.cs#L814) (.NET Bindings) - [node-libbitcoinconsensus](https://github.com/bitpay/node-libbitcoinconsensus) (Node.js Bindings) - [java-libbitcoinconsensus](https://github.com/dexX7/java-libbitcoinconsensus) (Java Bindings) - [bitcoinconsensus-php](https://github.com/Bit-Wasp/bitcoinconsensus-php) (PHP Bindings) diff --git a/doc/translation_process.md b/doc/translation_process.md index 969283284..f92c16b3d 100644 --- a/doc/translation_process.md +++ b/doc/translation_process.md @@ -1,14 +1,14 @@ Translations ============ -The Bitcoin-Core project has been designed to support multiple localisations. This makes adding new phrases, and completely new languages easily achievable. For managing all application translations, Bitcoin-Core makes use of the Transifex online translation management tool. +The NYC3-Core project has been designed to support multiple localisations. This makes adding new phrases, and completely new languages easily achievable. For managing all application translations, NYC3-Core makes use of the Transifex online translation management tool. ### Helping to translate (using Transifex) Transifex is setup to monitor the GitHub repo for updates, and when code containing new translations is found, Transifex will process any changes. It may take several hours after a pull-request has been merged, to appear in the Transifex web interface. -Multiple language support is critical in assisting Bitcoin’s global adoption, and growth. One of Bitcoin’s greatest strengths is cross-border money transfers, any help making that easier is greatly appreciated. +Multiple language support is critical in assisting NYC3’s global adoption, and growth. One of NYC3’s greatest strengths is cross-border money transfers, any help making that easier is greatly appreciated. -See the [Transifex Bitcoin project](https://www.transifex.com/projects/p/bitcoin/) to assist in translations. You should also join the translation mailing list for announcements - see details below. +See the [Transifex NYC3 project](https://www.transifex.com/projects/p/bitcoin/) to assist in translations. You should also join the translation mailing list for announcements - see details below. ### Writing code with translations We use automated scripts to help extract translations in both Qt, and non-Qt source files. It is rarely necessary to manually edit the files in `src/qt/locale/`. The translation source files must adhere to the following format: @@ -43,7 +43,7 @@ git commit ### Creating a Transifex account Visit the [Transifex Signup](https://www.transifex.com/signup/) page to create an account. Take note of your username and password, as they will be required to configure the command-line tool. -You can find the Bitcoin translation project at [https://www.transifex.com/projects/p/bitcoin/](https://www.transifex.com/projects/p/bitcoin/). +You can find the NYC3 translation project at [https://www.transifex.com/projects/p/bitcoin/](https://www.transifex.com/projects/p/bitcoin/). ### Installing the Transifex client command-line tool The client is used to fetch updated translations. If you are having problems, or need more details, see [https://docs.transifex.com/client/installing-the-client](https://docs.transifex.com/client/installing-the-client) @@ -62,7 +62,7 @@ token = username = USERNAME ``` -The Transifex Bitcoin project config file is included as part of the repo. It can be found at `.tx/config`, however you shouldn’t need to change anything. +The Transifex NYC3 project config file is included as part of the repo. It can be found at `.tx/config`, however you shouldn’t need to change anything. ### Synchronising translations To assist in updating translations, we have created a script to help. @@ -110,6 +110,6 @@ To create a new language template, you will need to edit the languages manifest **Note:** that the language translation file **must end in `.qm`** (the compiled extension), and not `.ts`. ### Questions and general assistance -The Bitcoin-Core translation maintainers include *tcatm, seone, Diapolo, wumpus and luke-jr*. You can find them, and others, in the Freenode IRC chatroom - `irc.freenode.net #bitcoin-core-dev`. +The NYC3-Core translation maintainers include *tcatm, seone, Diapolo, wumpus and luke-jr*. You can find them, and others, in the Freenode IRC chatroom - `irc.freenode.net #bitcoin-core-dev`. If you are a translator, you should also subscribe to the mailing list, https://groups.google.com/forum/#!forum/bitcoin-translators. Announcements will be posted during application pre-releases to notify translators to check for updates. diff --git a/doc/translation_strings_policy.md b/doc/translation_strings_policy.md index 377c1a994..9bc6dd72b 100644 --- a/doc/translation_strings_policy.md +++ b/doc/translation_strings_policy.md @@ -75,10 +75,10 @@ In Qt code, use tr's third argument for optional plurality. For example: This adds ``s to the respective `.ts` file, which can be translated separately depending on the language. In English, this is simply: - %n active connection(s) to Bitcoin network + %n active connection(s) to NYC3 network - %n active connection to Bitcoin network - %n active connections to Bitcoin network + %n active connection to NYC3 network + %n active connections to NYC3 network diff --git a/doc/zmq.md b/doc/zmq.md index 44ebd9e2c..ddb84854e 100644 --- a/doc/zmq.md +++ b/doc/zmq.md @@ -115,5 +115,5 @@ retrieve the chain from the last known block to the new tip. There are several possibilities that ZMQ notification can get lost during transmission depending on the communication type you are -using. Bitcoind appends an up-counting sequence number to each +using. NYC3d appends an up-counting sequence number to each notification which allows listeners to detect lost notifications. diff --git a/libbitcoinconsensus.pc.in b/libbitcoinconsensus.pc.in index eb920c47e..a55d74f91 100644 --- a/libbitcoinconsensus.pc.in +++ b/libbitcoinconsensus.pc.in @@ -4,7 +4,7 @@ libdir=@libdir@ includedir=@includedir@ Name: @PACKAGE_NAME@ consensus library -Description: Library for the Bitcoin consensus protocol. +Description: Library for the NYC3 consensus protocol. Version: @PACKAGE_VERSION@ Libs: -L${libdir} -lbitcoinconsensus Cflags: -I${includedir} diff --git a/share/examples/bitcoin.conf b/share/examples/bitcoin.conf index 6062d49c4..c779c4793 100644 --- a/share/examples/bitcoin.conf +++ b/share/examples/bitcoin.conf @@ -57,10 +57,10 @@ #maxconnections= # -# JSON-RPC options (for controlling a running Bitcoin/bitcoind process) +# JSON-RPC options (for controlling a running NYC3/bitcoind process) # -# server=1 tells Bitcoin-Qt and bitcoind to accept JSON-RPC commands +# server=1 tells NYC3-Qt and bitcoind to accept JSON-RPC commands #server=0 # Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. @@ -100,7 +100,7 @@ # NOTE: opening up the RPC port to hosts outside your local trusted network is NOT RECOMMENDED, # because the rpcpassword is transmitted over the network unencrypted. -# server=1 tells Bitcoin-Qt to accept JSON-RPC commands. +# server=1 tells NYC3-Qt to accept JSON-RPC commands. # it is also read by bitcoind to determine if RPC should be enabled #rpcallowip=10.1.1.34/255.255.255.0 #rpcallowip=1.2.3.4/24 @@ -109,7 +109,7 @@ # Listen for RPC connections on this TCP port: #rpcport=8332 -# You can use Bitcoin or bitcoind to send commands to Bitcoin/bitcoind +# You can use NYC3 or bitcoind to send commands to NYC3/bitcoind # running on another host using this option: #rpcconnect=127.0.0.1 @@ -137,7 +137,7 @@ # User interface options -# Start Bitcoin minimized +# Start NYC3 minimized #min=1 # Minimize to the system tray diff --git a/share/genbuild.sh b/share/genbuild.sh index 38c9ba176..7148e20d7 100755 --- a/share/genbuild.sh +++ b/share/genbuild.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2012-2016 The Bitcoin Core developers +# Copyright (c) 2012-2016 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in index 3cd130ce4..190a88bbe 100644 --- a/share/qt/Info.plist.in +++ b/share/qt/Info.plist.in @@ -11,7 +11,7 @@ CFBundleIconFile - bitcoin.icns + nyc3.icns CFBundlePackageType APPL @@ -29,16 +29,16 @@ ???? CFBundleExecutable - Bitcoin-Qt + NYC3-Qt CFBundleName - Bitcoin-Qt + NYC3-Qt LSHasLocalizedDisplayName CFBundleIdentifier - org.bitcoinfoundation.Bitcoin-Qt + org.bitcoinfoundation.NYC3-Qt CFBundleURLTypes @@ -46,7 +46,7 @@ CFBundleTypeRole Editor CFBundleURLName - org.bitcoin.BitcoinPayment + org.bitcoin.NYC3Payment CFBundleURLSchemes bitcoin @@ -60,7 +60,7 @@ UTTypeIdentifier org.bitcoin.paymentrequest UTTypeDescription - Bitcoin payment request + NYC3 payment request UTTypeConformsTo public.data diff --git a/share/qt/extract_strings_qt.py b/share/qt/extract_strings_qt.py index 76ef12eee..11a1a7931 100755 --- a/share/qt/extract_strings_qt.py +++ b/share/qt/extract_strings_qt.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2012-2018 The Bitcoin Core developers +# Copyright (c) 2012-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' diff --git a/share/rpcauth/rpcauth.py b/share/rpcauth/rpcauth.py index b14c80171..9a1b87769 100755 --- a/share/rpcauth/rpcauth.py +++ b/share/rpcauth/rpcauth.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/share/setup.nsi.in b/share/setup.nsi.in index acf9e8666..853554d03 100644 --- a/share/setup.nsi.in +++ b/share/setup.nsi.in @@ -50,9 +50,9 @@ Var StartMenuGroup # Installer attributes OutFile @abs_top_srcdir@/@PACKAGE_TARNAME@-@PACKAGE_VERSION@-win@WINDOWS_BITS@-setup.exe !if "@WINDOWS_BITS@" == "64" -InstallDir $PROGRAMFILES64\Bitcoin +InstallDir $PROGRAMFILES64\NYC3 !else -InstallDir $PROGRAMFILES\Bitcoin +InstallDir $PROGRAMFILES\NYC3 !endif CRCCheck on XPStyle on @@ -106,7 +106,7 @@ Section -post SEC0001 WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1 WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1 WriteRegStr HKCR "@PACKAGE_TARNAME@" "URL Protocol" "" - WriteRegStr HKCR "@PACKAGE_TARNAME@" "" "URL:Bitcoin" + WriteRegStr HKCR "@PACKAGE_TARNAME@" "" "URL:NYC3" WriteRegStr HKCR "@PACKAGE_TARNAME@\DefaultIcon" "" $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@ WriteRegStr HKCR "@PACKAGE_TARNAME@\shell\open\command" "" '"$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "%1"' SectionEnd @@ -139,7 +139,7 @@ Section -un.post UNSEC0001 Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet, @WINDOWS_BITS@-bit).lnk" - Delete /REBOOTOK "$SMSTARTUP\Bitcoin.lnk" + Delete /REBOOTOK "$SMSTARTUP\NYC3.lnk" Delete /REBOOTOK $INSTDIR\uninstall.exe Delete /REBOOTOK $INSTDIR\debug.log Delete /REBOOTOK $INSTDIR\db.log diff --git a/src/Makefile.am b/src/Makefile.am index cefb91c17..3b841146a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (c) 2013-2016 The Bitcoin Core developers +# Copyright (c) 2013-2016 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include index 5e787ca22..fb29c142a 100644 --- a/src/Makefile.bench.include +++ b/src/Makefile.bench.include @@ -1,4 +1,4 @@ -# Copyright (c) 2015-2016 The Bitcoin Core developers +# Copyright (c) 2015-2016 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/Makefile.leveldb.include b/src/Makefile.leveldb.include index bd08bcb4e..3e3fe65f6 100644 --- a/src/Makefile.leveldb.include +++ b/src/Makefile.leveldb.include @@ -1,4 +1,4 @@ -# Copyright (c) 2016 The Bitcoin Core developers +# Copyright (c) 2016 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 267b80ecb..da6aaad70 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -1,4 +1,4 @@ -# Copyright (c) 2013-2016 The Bitcoin Core developers +# Copyright (c) 2013-2016 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include index 61977b50c..6e1ee5cb0 100644 --- a/src/Makefile.qttest.include +++ b/src/Makefile.qttest.include @@ -1,4 +1,4 @@ -# Copyright (c) 2013-2016 The Bitcoin Core developers +# Copyright (c) 2013-2016 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/Makefile.test.include b/src/Makefile.test.include index db6b27022..ed403f13c 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -1,4 +1,4 @@ -# Copyright (c) 2013-2016 The Bitcoin Core developers +# Copyright (c) 2013-2016 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/addrdb.cpp b/src/addrdb.cpp index c6083f555..a8cc97014 100644 --- a/src/addrdb.cpp +++ b/src/addrdb.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/addrdb.h b/src/addrdb.h index 290b63dd1..8a90c8b05 100644 --- a/src/addrdb.h +++ b/src/addrdb.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/addrman.cpp b/src/addrman.cpp index 8a5f78d1c..146825ca0 100644 --- a/src/addrman.cpp +++ b/src/addrman.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2012 Pieter Wuille -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/addrman.h b/src/addrman.h index e54184ce3..23002a0eb 100644 --- a/src/addrman.h +++ b/src/addrman.h @@ -1,5 +1,5 @@ // Copyright (c) 2012 Pieter Wuille -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/amount.h b/src/amount.h index 0f4358ab4..892b1d1b7 100644 --- a/src/amount.h +++ b/src/amount.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -15,7 +15,7 @@ static const CAmount COIN = 100000000; /** No amount larger than this (in satoshi) is valid. * - * Note that this constant is *not* the total money supply, which in Bitcoin + * Note that this constant is *not* the total money supply, which in NYC3 * currently happens to be less than 21,000,000 BTC for various reasons, but * rather a sanity check. As this sanity check is used by consensus-critical * validation code, the exact value of the MAX_MONEY constant is consensus diff --git a/src/arith_uint256.cpp b/src/arith_uint256.cpp index aa66d1310..0dab1c4a5 100644 --- a/src/arith_uint256.cpp +++ b/src/arith_uint256.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/arith_uint256.h b/src/arith_uint256.h index bd0360087..16391dfe6 100644 --- a/src/arith_uint256.h +++ b/src/arith_uint256.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -271,7 +271,7 @@ public: * Thus 0x1234560000 is compact (0x05123456) * and 0xc0de000000 is compact (0x0600c0de) * - * Bitcoin only uses this "compact" format for encoding difficulty + * NYC3 only uses this "compact" format for encoding difficulty * targets, which are unsigned 256bit quantities. Thus, all the * complexities of the sign bit and using base 256 are probably an * implementation accident. diff --git a/src/attributes.h b/src/attributes.h index 45099bd8b..f69e9c06d 100644 --- a/src/attributes.h +++ b/src/attributes.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/banman.cpp b/src/banman.cpp index 47d64a8f3..3ec53f9a3 100644 --- a/src/banman.cpp +++ b/src/banman.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2017 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/banman.h b/src/banman.h index a1a00309d..f1d4b134c 100644 --- a/src/banman.h +++ b/src/banman.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2017 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_BANMAN_H diff --git a/src/base58.cpp b/src/base58.cpp index e3d285339..a1e698664 100644 --- a/src/base58.cpp +++ b/src/base58.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/base58.h b/src/base58.h index d6e0299a1..f83ad24cd 100644 --- a/src/base58.h +++ b/src/base58.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/base58.cpp b/src/bench/base58.cpp index e7702ec46..3f560b9fc 100644 --- a/src/bench/base58.cpp +++ b/src/bench/base58.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/bech32.cpp b/src/bench/bech32.cpp index 3c4b453a2..0952c5405 100644 --- a/src/bench/bech32.cpp +++ b/src/bench/bech32.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp index 966b99f6c..8e75e68a7 100644 --- a/src/bench/bench.cpp +++ b/src/bench/bench.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/bench.h b/src/bench/bench.h index 35eeab339..ad1419910 100644 --- a/src/bench/bench.h +++ b/src/bench/bench.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/bench_bitcoin.cpp b/src/bench/bench_bitcoin.cpp index d67b2c5bc..11084e6f6 100644 --- a/src/bench/bench_bitcoin.cpp +++ b/src/bench/bench_bitcoin.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/block_assemble.cpp b/src/bench/block_assemble.cpp index cd4543c01..4ab4095df 100644 --- a/src/bench/block_assemble.cpp +++ b/src/bench/block_assemble.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/ccoins_caching.cpp b/src/bench/ccoins_caching.cpp index 9cfd5d23e..adb3fba34 100644 --- a/src/bench/ccoins_caching.cpp +++ b/src/bench/ccoins_caching.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/checkblock.cpp b/src/bench/checkblock.cpp index e325333c0..3ae95b98c 100644 --- a/src/bench/checkblock.cpp +++ b/src/bench/checkblock.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/checkqueue.cpp b/src/bench/checkqueue.cpp index 6ab542067..7f1b0ff2b 100644 --- a/src/bench/checkqueue.cpp +++ b/src/bench/checkqueue.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/coin_selection.cpp b/src/bench/coin_selection.cpp index 74641191a..a97cc0150 100644 --- a/src/bench/coin_selection.cpp +++ b/src/bench/coin_selection.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/crypto_hash.cpp b/src/bench/crypto_hash.cpp index dc0b05442..f976603b4 100644 --- a/src/bench/crypto_hash.cpp +++ b/src/bench/crypto_hash.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/duplicate_inputs.cpp b/src/bench/duplicate_inputs.cpp index 1f6840d81..4d6295f91 100644 --- a/src/bench/duplicate_inputs.cpp +++ b/src/bench/duplicate_inputs.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/examples.cpp b/src/bench/examples.cpp index e7ddd5a93..f7be5e044 100644 --- a/src/bench/examples.cpp +++ b/src/bench/examples.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/gcs_filter.cpp b/src/bench/gcs_filter.cpp index 535ad3557..63596579f 100644 --- a/src/bench/gcs_filter.cpp +++ b/src/bench/gcs_filter.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/lockedpool.cpp b/src/bench/lockedpool.cpp index 0712eab4b..04520e675 100644 --- a/src/bench/lockedpool.cpp +++ b/src/bench/lockedpool.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/mempool_eviction.cpp b/src/bench/mempool_eviction.cpp index ac8a18235..7ccd61ddc 100644 --- a/src/bench/mempool_eviction.cpp +++ b/src/bench/mempool_eviction.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/merkle_root.cpp b/src/bench/merkle_root.cpp index bdb2bdbe3..319db3e95 100644 --- a/src/bench/merkle_root.cpp +++ b/src/bench/merkle_root.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/prevector.cpp b/src/bench/prevector.cpp index 00e5d7e7a..0886f8566 100644 --- a/src/bench/prevector.cpp +++ b/src/bench/prevector.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/rollingbloom.cpp b/src/bench/rollingbloom.cpp index 0a99ea318..e03d20488 100644 --- a/src/bench/rollingbloom.cpp +++ b/src/bench/rollingbloom.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/verify_script.cpp b/src/bench/verify_script.cpp index 312b66e38..d790f7894 100644 --- a/src/bench/verify_script.cpp +++ b/src/bench/verify_script.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp index 10f51931f..5c6906254 100644 --- a/src/blockencodings.cpp +++ b/src/blockencodings.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/blockencodings.h b/src/blockencodings.h index 0c2b83ebc..dd615dfe7 100644 --- a/src/blockencodings.h +++ b/src/blockencodings.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/blockfilter.cpp b/src/blockfilter.cpp index bcf24047f..74803ccf9 100644 --- a/src/blockfilter.cpp +++ b/src/blockfilter.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/blockfilter.h b/src/blockfilter.h index 4d1f51dd6..61e3766f6 100644 --- a/src/blockfilter.h +++ b/src/blockfilter.h @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bloom.cpp b/src/bloom.cpp index 7732cee27..39123c8de 100644 --- a/src/bloom.cpp +++ b/src/bloom.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bloom.h b/src/bloom.h index 7d3aa878b..877f12026 100644 --- a/src/bloom.h +++ b/src/bloom.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/chain.cpp b/src/chain.cpp index d462f94ab..fffb9a2e8 100644 --- a/src/chain.cpp +++ b/src/chain.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/chain.h b/src/chain.h index e5ed7b1ec..b9e5d0d40 100644 --- a/src/chain.h +++ b/src/chain.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/chainparams.cpp b/src/chainparams.cpp index f7fdfb1a3..461cec546 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/chainparams.h b/src/chainparams.h index 6ff3dbb7e..d156661c9 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -39,7 +39,7 @@ struct ChainTxData { /** * CChainParams defines various tweakable parameters of a given instance of the - * Bitcoin system. There are three: the main network on which people trade goods + * NYC3 system. There are three: the main network on which people trade goods * and services, the public test network which gets reset from time to time and * a regression test mode which is intended for private networks only. It has * minimal difficulty to ensure that blocks can be found instantly. diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index f0559a319..6d14de497 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h index 355df043d..157c240c6 100644 --- a/src/chainparamsbase.h +++ b/src/chainparamsbase.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -11,7 +11,7 @@ /** * CBaseChainParams defines the base parameters (shared between bitcoin-cli and bitcoind) - * of a given instance of the Bitcoin system. + * of a given instance of the NYC3 system. */ class CBaseChainParams { diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index ad5edfeb3..e01e40f50 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/checkpoints.h b/src/checkpoints.h index a25e97e46..bfe45e374 100644 --- a/src/checkpoints.h +++ b/src/checkpoints.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/checkqueue.h b/src/checkqueue.h index 978e23a7c..aa608bddf 100644 --- a/src/checkqueue.h +++ b/src/checkqueue.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/clientversion.cpp b/src/clientversion.cpp index 5d9eaea6d..e458de880 100644 --- a/src/clientversion.cpp +++ b/src/clientversion.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/clientversion.h b/src/clientversion.h index 363094b69..b7bf72a24 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/coins.cpp b/src/coins.cpp index 3ef9e0463..372941ecc 100644 --- a/src/coins.cpp +++ b/src/coins.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/coins.h b/src/coins.h index d39ebf906..5b26f23cc 100644 --- a/src/coins.h +++ b/src/coins.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat.h b/src/compat.h index 4d6ff8335..a193d9b7c 100644 --- a/src/compat.h +++ b/src/compat.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/assumptions.h b/src/compat/assumptions.h index 820c9b93d..d46eaa249 100644 --- a/src/compat/assumptions.h +++ b/src/compat/assumptions.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2019 The Bitcoin Core developers +// Copyright (c) 2009-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -14,7 +14,7 @@ // Example(s): We use assert(...) extensively with the assumption of it never // being a noop at runtime. #if defined(NDEBUG) -# error "Bitcoin cannot be compiled without assertions." +# error "NYC3 cannot be compiled without assertions." #endif // Assumption: We assume the floating-point types to fulfill the requirements of diff --git a/src/compat/byteswap.h b/src/compat/byteswap.h index fe47f4899..950d4ef24 100644 --- a/src/compat/byteswap.h +++ b/src/compat/byteswap.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/endian.h b/src/compat/endian.h index c5cf7a46c..2e58d7dbe 100644 --- a/src/compat/endian.h +++ b/src/compat/endian.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/glibc_compat.cpp b/src/compat/glibc_compat.cpp index 4de4fd7f4..c1aab08ec 100644 --- a/src/compat/glibc_compat.cpp +++ b/src/compat/glibc_compat.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/glibc_sanity.cpp b/src/compat/glibc_sanity.cpp index 1ef66e27b..daae94fb5 100644 --- a/src/compat/glibc_sanity.cpp +++ b/src/compat/glibc_sanity.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/glibcxx_sanity.cpp b/src/compat/glibcxx_sanity.cpp index e6e6208e4..ac40d7236 100644 --- a/src/compat/glibcxx_sanity.cpp +++ b/src/compat/glibcxx_sanity.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/sanity.h b/src/compat/sanity.h index 909c4f6da..07ea52b38 100644 --- a/src/compat/sanity.h +++ b/src/compat/sanity.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2014 The Bitcoin Core developers +// Copyright (c) 2009-2014 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/strnlen.cpp b/src/compat/strnlen.cpp index 93a034a66..970437004 100644 --- a/src/compat/strnlen.cpp +++ b/src/compat/strnlen.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compressor.cpp b/src/compressor.cpp index a2d9af880..becb28226 100644 --- a/src/compressor.cpp +++ b/src/compressor.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compressor.h b/src/compressor.h index c1eda503c..23d7af743 100644 --- a/src/compressor.h +++ b/src/compressor.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h index 00a734851..a62f34597 100644 --- a/src/consensus/consensus.h +++ b/src/consensus/consensus.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/merkle.cpp b/src/consensus/merkle.cpp index b47d9774c..c029cccb6 100644 --- a/src/consensus/merkle.cpp +++ b/src/consensus/merkle.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/merkle.h b/src/consensus/merkle.h index 7675877de..e93db1f69 100644 --- a/src/consensus/merkle.h +++ b/src/consensus/merkle.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/params.h b/src/consensus/params.h index 673a81625..04f869f00 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp index 0a7eacfb9..c40e65660 100644 --- a/src/consensus/tx_verify.cpp +++ b/src/consensus/tx_verify.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/tx_verify.h b/src/consensus/tx_verify.h index 0519cef8c..cb35a7a50 100644 --- a/src/consensus/tx_verify.h +++ b/src/consensus/tx_verify.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/validation.h b/src/consensus/validation.h index f2e2c3585..a922a286b 100644 --- a/src/consensus/validation.h +++ b/src/consensus/validation.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/core_io.h b/src/core_io.h index ae377eb6e..6a8669d2f 100644 --- a/src/core_io.h +++ b/src/core_io.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/core_memusage.h b/src/core_memusage.h index 6f1ace998..41fa60891 100644 --- a/src/core_memusage.h +++ b/src/core_memusage.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/core_read.cpp b/src/core_read.cpp index 536a7f4f1..9a32514c5 100644 --- a/src/core_read.cpp +++ b/src/core_read.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/core_write.cpp b/src/core_write.cpp index 765a17030..b94554db7 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp index 919ea593b..c62250acd 100644 --- a/src/crypto/aes.cpp +++ b/src/crypto/aes.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/aes.h b/src/crypto/aes.h index fdad70c59..4da98a381 100644 --- a/src/crypto/aes.h +++ b/src/crypto/aes.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. // diff --git a/src/crypto/chacha20.cpp b/src/crypto/chacha20.cpp index ac4470f04..332d63022 100644 --- a/src/crypto/chacha20.cpp +++ b/src/crypto/chacha20.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017 The Bitcoin Core developers +// Copyright (c) 2017 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/chacha20.h b/src/crypto/chacha20.h index a305977bc..1c48f636e 100644 --- a/src/crypto/chacha20.h +++ b/src/crypto/chacha20.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017 The Bitcoin Core developers +// Copyright (c) 2017 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/common.h b/src/crypto/common.h index e7bb020a1..509502b54 100644 --- a/src/crypto/common.h +++ b/src/crypto/common.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/hmac_sha256.cpp b/src/crypto/hmac_sha256.cpp index 0ba99ae27..4ddfd5963 100644 --- a/src/crypto/hmac_sha256.cpp +++ b/src/crypto/hmac_sha256.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/hmac_sha256.h b/src/crypto/hmac_sha256.h index d31fda1dd..fe3c86eec 100644 --- a/src/crypto/hmac_sha256.h +++ b/src/crypto/hmac_sha256.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/hmac_sha512.cpp b/src/crypto/hmac_sha512.cpp index d70aee843..272d8474f 100644 --- a/src/crypto/hmac_sha512.cpp +++ b/src/crypto/hmac_sha512.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/hmac_sha512.h b/src/crypto/hmac_sha512.h index 1ea9a3671..31fec1eb4 100644 --- a/src/crypto/hmac_sha512.h +++ b/src/crypto/hmac_sha512.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/ripemd160.cpp b/src/crypto/ripemd160.cpp index a00331dcb..36d10d7a8 100644 --- a/src/crypto/ripemd160.cpp +++ b/src/crypto/ripemd160.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/ripemd160.h b/src/crypto/ripemd160.h index 38ea375c1..f50e48649 100644 --- a/src/crypto/ripemd160.h +++ b/src/crypto/ripemd160.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2016 The Bitcoin Core developers +// Copyright (c) 2014-2016 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha1.cpp b/src/crypto/sha1.cpp index 5c601c54a..fb7d40893 100644 --- a/src/crypto/sha1.cpp +++ b/src/crypto/sha1.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha1.h b/src/crypto/sha1.h index 8b4568ee1..786f49deb 100644 --- a/src/crypto/sha1.h +++ b/src/crypto/sha1.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2016 The Bitcoin Core developers +// Copyright (c) 2014-2016 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha256.cpp b/src/crypto/sha256.cpp index cab37e032..ebbbb362d 100644 --- a/src/crypto/sha256.cpp +++ b/src/crypto/sha256.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha256.h b/src/crypto/sha256.h index 028ee1434..a90d60281 100644 --- a/src/crypto/sha256.h +++ b/src/crypto/sha256.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha256_shani.cpp b/src/crypto/sha256_shani.cpp index e561da42c..6d1d219c0 100644 --- a/src/crypto/sha256_shani.cpp +++ b/src/crypto/sha256_shani.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. // diff --git a/src/crypto/sha256_sse4.cpp b/src/crypto/sha256_sse4.cpp index 89f529a3a..8625d779e 100644 --- a/src/crypto/sha256_sse4.cpp +++ b/src/crypto/sha256_sse4.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017 The Bitcoin Core developers +// Copyright (c) 2017 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. // diff --git a/src/crypto/sha512.cpp b/src/crypto/sha512.cpp index bc64135ca..e3a25d4ea 100644 --- a/src/crypto/sha512.cpp +++ b/src/crypto/sha512.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha512.h b/src/crypto/sha512.h index 4118ac1b1..12a6d92a2 100644 --- a/src/crypto/sha512.h +++ b/src/crypto/sha512.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2016 The Bitcoin Core developers +// Copyright (c) 2014-2016 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/siphash.cpp b/src/crypto/siphash.cpp index e81957111..702b9c41b 100644 --- a/src/crypto/siphash.cpp +++ b/src/crypto/siphash.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/siphash.h b/src/crypto/siphash.h index b312f913f..928715ad0 100644 --- a/src/crypto/siphash.h +++ b/src/crypto/siphash.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp index 58d8cc2c9..439178a92 100644 --- a/src/dbwrapper.cpp +++ b/src/dbwrapper.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -14,7 +14,7 @@ #include #include -class CBitcoinLevelDBLogger : public leveldb::Logger { +class CNYC3LevelDBLogger : public leveldb::Logger { public: // This code is adapted from posix_logger.h, which is why it is using vsprintf. // Please do not do this in normal code @@ -104,7 +104,7 @@ static leveldb::Options GetOptions(size_t nCacheSize) options.write_buffer_size = nCacheSize / 4; // up to two write buffers may be held in memory simultaneously options.filter_policy = leveldb::NewBloomFilterPolicy(10); options.compression = leveldb::kNoCompression; - options.info_log = new CBitcoinLevelDBLogger(); + options.info_log = new CNYC3LevelDBLogger(); if (leveldb::kMajorVersion > 1 || (leveldb::kMajorVersion == 1 && leveldb::kMinorVersion >= 16)) { // LevelDB versions before 1.16 consider short writes to be corruption. Only trigger error // on corruption in later versions. diff --git a/src/dbwrapper.h b/src/dbwrapper.h index 416f5e839..d728d0779 100644 --- a/src/dbwrapper.h +++ b/src/dbwrapper.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/dummywallet.cpp b/src/dummywallet.cpp index 8a76021a5..a17cfe866 100644 --- a/src/dummywallet.cpp +++ b/src/dummywallet.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/fs.h b/src/fs.h index 8af81f173..3ed744d1c 100644 --- a/src/fs.h +++ b/src/fs.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/hash.cpp b/src/hash.cpp index 26150e5ca..8e3165a35 100644 --- a/src/hash.cpp +++ b/src/hash.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2013-2018 The Bitcoin Core developers +// Copyright (c) 2013-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/hash.h b/src/hash.h index aa17a4bc3..c1acc800c 100644 --- a/src/hash.h +++ b/src/hash.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -19,7 +19,7 @@ typedef uint256 ChainCode; -/** A hasher class for Bitcoin's 256-bit hash (double SHA-256). */ +/** A hasher class for NYC3's 256-bit hash (double SHA-256). */ class CHash256 { private: CSHA256 sha; @@ -43,7 +43,7 @@ public: } }; -/** A hasher class for Bitcoin's 160-bit hash (SHA-256 + RIPEMD-160). */ +/** A hasher class for NYC3's 160-bit hash (SHA-256 + RIPEMD-160). */ class CHash160 { private: CSHA256 sha; diff --git a/src/httprpc.cpp b/src/httprpc.cpp index fcf760a4c..2005781d0 100644 --- a/src/httprpc.cpp +++ b/src/httprpc.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/httprpc.h b/src/httprpc.h index 2230a8ca4..5b865b23c 100644 --- a/src/httprpc.h +++ b/src/httprpc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/httpserver.cpp b/src/httpserver.cpp index b9ca037c9..8783b3ec5 100644 --- a/src/httpserver.cpp +++ b/src/httpserver.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/httpserver.h b/src/httpserver.h index 63f96734f..08af2cff3 100644 --- a/src/httpserver.h +++ b/src/httpserver.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/index/base.cpp b/src/index/base.cpp index f6f59572c..8fc22350c 100644 --- a/src/index/base.cpp +++ b/src/index/base.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/index/base.h b/src/index/base.h index 04ee6e6cc..491ceda0a 100644 --- a/src/index/base.h +++ b/src/index/base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/index/txindex.cpp b/src/index/txindex.cpp index 10bc8419d..4cf91efaf 100644 --- a/src/index/txindex.cpp +++ b/src/index/txindex.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/index/txindex.h b/src/index/txindex.h index 8202c3c95..b51358b82 100644 --- a/src/index/txindex.h +++ b/src/index/txindex.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/indirectmap.h b/src/indirectmap.h index 76da4a6bd..3b3de17a7 100644 --- a/src/indirectmap.h +++ b/src/indirectmap.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016 The Bitcoin Core developers +// Copyright (c) 2016 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/init.cpp b/src/init.cpp index e7b24895a..1201f9810 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -733,7 +733,7 @@ static void ThreadImport(std::vector vImportFiles) } /** Sanity checks - * Ensure that Bitcoin is running in a usable environment with all + * Ensure that NYC3 is running in a usable environment with all * necessary library support. */ static bool InitSanityCheck() @@ -1178,7 +1178,7 @@ bool AppInitParameterInteraction() static bool LockDataDirectory(bool probeOnly) { - // Make sure only a single Bitcoin process is using the data directory. + // Make sure only a single NYC3 process is using the data directory. fs::path datadir = GetDataDir(); if (!DirIsWritable(datadir)) { return InitError(strprintf(_("Cannot write to data directory '%s'; check permissions."), datadir.string())); diff --git a/src/init.h b/src/init.h index 1c59ca069..ef929c151 100644 --- a/src/init.h +++ b/src/init.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -59,7 +59,7 @@ bool AppInitSanityChecks(); */ bool AppInitLockDataDirectory(); /** - * Bitcoin core main initialization. + * NYC3 core main initialization. * @note This should only be done after daemonization. Call Shutdown() if this function fails. * @pre Parameters should be parsed and config file should be read, AppInitLockDataDirectory should have been called. */ diff --git a/src/interfaces/chain.cpp b/src/interfaces/chain.cpp index d3d9e86e8..86f0b967c 100644 --- a/src/interfaces/chain.cpp +++ b/src/interfaces/chain.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/interfaces/chain.h b/src/interfaces/chain.h index 57e970375..ac9e1b1c8 100644 --- a/src/interfaces/chain.h +++ b/src/interfaces/chain.h @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/interfaces/handler.cpp b/src/interfaces/handler.cpp index 92601fc4e..66c34fb8e 100644 --- a/src/interfaces/handler.cpp +++ b/src/interfaces/handler.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/interfaces/handler.h b/src/interfaces/handler.h index c4c674cac..2f67e022b 100644 --- a/src/interfaces/handler.h +++ b/src/interfaces/handler.h @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp index 96bde7e9f..02071665f 100644 --- a/src/interfaces/node.cpp +++ b/src/interfaces/node.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/interfaces/node.h b/src/interfaces/node.h index 76b93af23..6607b9ed9 100644 --- a/src/interfaces/node.h +++ b/src/interfaces/node.h @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp index 0dac75834..4191833b9 100644 --- a/src/interfaces/wallet.cpp +++ b/src/interfaces/wallet.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h index a931e5faf..027d3dea8 100644 --- a/src/interfaces/wallet.h +++ b/src/interfaces/wallet.h @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/key.cpp b/src/key.cpp index 9d982fc44..1d01d5512 100644 --- a/src/key.cpp +++ b/src/key.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Copyright (c) 2017 The Zcash developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -229,7 +229,7 @@ bool CKey::VerifyPubKey(const CPubKey& pubkey) const { return false; } unsigned char rnd[8]; - std::string str = "Bitcoin key verification\n"; + std::string str = "NYC3 key verification\n"; GetRandBytes(rnd, sizeof(rnd)); uint256 hash; CHash256().Write((unsigned char*)str.data(), str.size()).Write(rnd, sizeof(rnd)).Finalize(hash.begin()); diff --git a/src/key.h b/src/key.h index 0f695c07b..914c4e205 100644 --- a/src/key.h +++ b/src/key.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Copyright (c) 2017 The Zcash developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/key_io.cpp b/src/key_io.cpp index 1d53a5e07..9f74b68ce 100644 --- a/src/key_io.cpp +++ b/src/key_io.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -75,7 +75,7 @@ CTxDestination DecodeDestination(const std::string& str, const CChainParams& par std::vector data; uint160 hash; if (DecodeBase58Check(str, data)) { - // base58-encoded Bitcoin addresses. + // base58-encoded NYC3 addresses. // Public-key-hash-addresses have version 0 (or 111 testnet). // The data vector contains RIPEMD160(SHA256(pubkey)), where pubkey is the serialized public key. const std::vector& pubkey_prefix = params.Base58Prefix(CChainParams::PUBKEY_ADDRESS); diff --git a/src/key_io.h b/src/key_io.h index d80c08f49..2cb399740 100644 --- a/src/key_io.h +++ b/src/key_io.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/keystore.cpp b/src/keystore.cpp index 148979cf3..fb82bc858 100644 --- a/src/keystore.cpp +++ b/src/keystore.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/keystore.h b/src/keystore.h index 4bd99e255..1a633c69e 100644 --- a/src/keystore.h +++ b/src/keystore.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/limitedmap.h b/src/limitedmap.h index 7d66964e3..1986d6d92 100644 --- a/src/limitedmap.h +++ b/src/limitedmap.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/logging.cpp b/src/logging.cpp index 36cad6573..89b4953e1 100644 --- a/src/logging.cpp +++ b/src/logging.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/logging.h b/src/logging.h index ac9d0dc0c..235ba6b07 100644 --- a/src/logging.h +++ b/src/logging.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/memusage.h b/src/memusage.h index 3ae9face1..c55db6be4 100644 --- a/src/memusage.h +++ b/src/memusage.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp index a54268d65..a4716a151 100644 --- a/src/merkleblock.cpp +++ b/src/merkleblock.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/merkleblock.h b/src/merkleblock.h index e641c8aa9..24f694bf6 100644 --- a/src/merkleblock.h +++ b/src/merkleblock.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/miner.cpp b/src/miner.cpp index 0b9c1dd20..d29b19006 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2019 The Bitcoin Core developers +// Copyright (c) 2009-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/miner.h b/src/miner.h index 8b072bfe7..004e82341 100644 --- a/src/miner.h +++ b/src/miner.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2019 The Bitcoin Core developers +// Copyright (c) 2009-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/net.cpp b/src/net.cpp index 2378713ca..4bfbe6aa8 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2019 The Bitcoin Core developers +// Copyright (c) 2009-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -543,7 +543,7 @@ void CNode::copyStats(CNodeStats &stats) nPingUsecWait = GetTimeMicros() - nPingUsecStart; } - // Raw ping time is in microseconds, but show it to user as whole seconds (Bitcoin users should be well used to small numbers with many decimal places by now :) + // Raw ping time is in microseconds, but show it to user as whole seconds (NYC3 users should be well used to small numbers with many decimal places by now :) stats.dPingTime = (((double)nPingUsecTime) / 1e6); stats.dMinPing = (((double)nMinPingUsecTime) / 1e6); stats.dPingWait = (((double)nPingUsecWait) / 1e6); @@ -1445,7 +1445,7 @@ static void ThreadMapPort() } } - std::string strDesc = "Bitcoin " + FormatFullVersion(); + std::string strDesc = "NYC3 " + FormatFullVersion(); do { #ifndef UPNPDISCOVER_SUCCESS diff --git a/src/net.h b/src/net.h index db44ec633..c5d67a406 100644 --- a/src/net.h +++ b/src/net.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2019 The Bitcoin Core developers +// Copyright (c) 2009-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/net_processing.cpp b/src/net_processing.cpp index d524d626c..4c0050df6 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -33,7 +33,7 @@ #include #if defined(NDEBUG) -# error "Bitcoin cannot be compiled without assertions." +# error "NYC3 cannot be compiled without assertions." #endif /** Expiration time for orphan transactions in seconds */ diff --git a/src/net_processing.h b/src/net_processing.h index 4189debe4..9883a0425 100644 --- a/src/net_processing.h +++ b/src/net_processing.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/netaddress.cpp b/src/netaddress.cpp index 58e45c2c0..34f143f02 100644 --- a/src/netaddress.cpp +++ b/src/netaddress.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/netaddress.h b/src/netaddress.h index ca435d17d..e63f3cf60 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/netbase.cpp b/src/netbase.cpp index 6c386a9ad..bbbd8ccf1 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/netbase.h b/src/netbase.h index 708df5b8e..df844bf76 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/netmessagemaker.h b/src/netmessagemaker.h index 2efb384a7..b605fcf2f 100644 --- a/src/netmessagemaker.h +++ b/src/netmessagemaker.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/node/transaction.cpp b/src/node/transaction.cpp index 7b9b4310e..a26cf6db2 100644 --- a/src/node/transaction.cpp +++ b/src/node/transaction.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/node/transaction.h b/src/node/transaction.h index 3457ececa..f72ea9944 100644 --- a/src/node/transaction.h +++ b/src/node/transaction.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2019 The Bitcoin Core developers +// Copyright (c) 2017-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/noui.cpp b/src/noui.cpp index c7d8fee0b..49df1703c 100644 --- a/src/noui.cpp +++ b/src/noui.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/noui.h b/src/noui.h index 79a79a9af..0028b0aa0 100644 --- a/src/noui.h +++ b/src/noui.h @@ -1,4 +1,4 @@ -// Copyright (c) 2013-2018 The Bitcoin Core developers +// Copyright (c) 2013-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/nyc3-cli-res.rc b/src/nyc3-cli-res.rc index 58f8f1e8a..6e78113a4 100644 --- a/src/nyc3-cli-res.rc +++ b/src/nyc3-cli-res.rc @@ -16,7 +16,7 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Bitcoin" + VALUE "CompanyName", "NYC3" VALUE "FileDescription", "bitcoin-cli (JSON-RPC client for " PACKAGE_NAME ")" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "bitcoin-cli" diff --git a/src/nyc3-cli.cpp b/src/nyc3-cli.cpp index b0e1f67d9..9acb732e0 100644 --- a/src/nyc3-cli.cpp +++ b/src/nyc3-cli.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/nyc3-tx-res.rc b/src/nyc3-tx-res.rc index 3e49b820b..5051bffd7 100644 --- a/src/nyc3-tx-res.rc +++ b/src/nyc3-tx-res.rc @@ -16,8 +16,8 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Bitcoin" - VALUE "FileDescription", "bitcoin-tx (CLI Bitcoin transaction editor utility)" + VALUE "CompanyName", "NYC3" + VALUE "FileDescription", "bitcoin-tx (CLI NYC3 transaction editor utility)" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "bitcoin-tx" VALUE "LegalCopyright", COPYRIGHT_STR diff --git a/src/nyc3-tx.cpp b/src/nyc3-tx.cpp index 4be89aab6..1c753788a 100644 --- a/src/nyc3-tx.cpp +++ b/src/nyc3-tx.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -33,7 +33,7 @@ static const int CONTINUE_EXECUTION=-1; const std::function G_TRANSLATION_FUN = nullptr; -static void SetupBitcoinTxArgs() +static void SetupNYC3TxArgs() { SetupHelpOptions(gArgs); @@ -78,7 +78,7 @@ static int AppInitRawTx(int argc, char* argv[]) // // Parameters // - SetupBitcoinTxArgs(); + SetupNYC3TxArgs(); std::string error; if (!gArgs.ParseParameters(argc, argv, error)) { fprintf(stderr, "Error parsing command line arguments: %s\n", error.c_str()); diff --git a/src/nyc3-wallet-res.rc b/src/nyc3-wallet-res.rc index e9fa2dbb4..6a6b95a4f 100644 --- a/src/nyc3-wallet-res.rc +++ b/src/nyc3-wallet-res.rc @@ -16,7 +16,7 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Bitcoin" + VALUE "CompanyName", "NYC3" VALUE "FileDescription", "bitcoin-wallet (CLI tool for " PACKAGE_NAME " wallets)" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "bitcoin-wallet" diff --git a/src/nyc3-wallet.cpp b/src/nyc3-wallet.cpp index 515d44d17..ee1107e0e 100644 --- a/src/nyc3-wallet.cpp +++ b/src/nyc3-wallet.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/nyc3d-res.rc b/src/nyc3d-res.rc index 3a64acd5d..e4e611eea 100644 --- a/src/nyc3d-res.rc +++ b/src/nyc3d-res.rc @@ -16,8 +16,8 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Bitcoin" - VALUE "FileDescription", "bitcoind (Bitcoin node with a JSON-RPC server)" + VALUE "CompanyName", "NYC3" + VALUE "FileDescription", "bitcoind (NYC3 node with a JSON-RPC server)" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "bitcoind" VALUE "LegalCopyright", COPYRIGHT_STR diff --git a/src/nyc3d.cpp b/src/nyc3d.cpp index dde75c1b1..63ec7c65b 100644 --- a/src/nyc3d.cpp +++ b/src/nyc3d.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -32,8 +32,8 @@ const std::function G_TRANSLATION_FUN = nullptr; * * \section intro_sec Introduction * - * This is the developer documentation of the reference client for an experimental new digital currency called Bitcoin, - * which enables instant payments to anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate + * This is the developer documentation of the reference client for an experimental new digital currency called NYC3, + * which enables instant payments to anyone, anywhere in the world. NYC3 uses peer-to-peer technology to operate * with no central authority: managing transactions and issuing money are carried out collectively by the network. * * The software is a community-driven open source project, released under the MIT license. @@ -147,7 +147,7 @@ static bool AppInit(int argc, char* argv[]) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif - fprintf(stdout, "Bitcoin server starting\n"); + fprintf(stdout, "NYC3 server starting\n"); // Daemonize if (daemon(1, 0)) { // don't chdir (1), do close FDs (0) diff --git a/src/optional.h b/src/optional.h index 95a3b24d0..8c6989bfc 100644 --- a/src/optional.h +++ b/src/optional.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017 The Bitcoin Core developers +// Copyright (c) 2017 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/outputtype.cpp b/src/outputtype.cpp index 7e5690dfc..82f957c2f 100644 --- a/src/outputtype.cpp +++ b/src/outputtype.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/outputtype.h b/src/outputtype.h index 6c30fd195..78ce5ac93 100644 --- a/src/outputtype.h +++ b/src/outputtype.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/feerate.cpp b/src/policy/feerate.cpp index 14be6192f..c73ce118f 100644 --- a/src/policy/feerate.cpp +++ b/src/policy/feerate.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/feerate.h b/src/policy/feerate.h index 85d7d22b4..a59ccee10 100644 --- a/src/policy/feerate.h +++ b/src/policy/feerate.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp index c49b9fa36..595a98a2d 100644 --- a/src/policy/fees.cpp +++ b/src/policy/fees.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/fees.h b/src/policy/fees.h index c8472a12f..44458600a 100644 --- a/src/policy/fees.h +++ b/src/policy/fees.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_POLICY_FEES_H diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp index d4cc53849..2ad5361ef 100644 --- a/src/policy/policy.cpp +++ b/src/policy/policy.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/policy.h b/src/policy/policy.h index 3d47ac126..92174a659 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/rbf.cpp b/src/policy/rbf.cpp index 0dc130d10..b00172ce6 100644 --- a/src/policy/rbf.cpp +++ b/src/policy/rbf.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/rbf.h b/src/policy/rbf.h index 581f489e1..f2c7a58e7 100644 --- a/src/policy/rbf.h +++ b/src/policy/rbf.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/pow.cpp b/src/pow.cpp index bd7e0a094..6243e9543 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/pow.h b/src/pow.h index 1d802cd01..d21ac52b6 100644 --- a/src/pow.h +++ b/src/pow.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/prevector.h b/src/prevector.h index 99e575163..b6429c033 100644 --- a/src/prevector.h +++ b/src/prevector.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp index ac00ef899..e113b5a6c 100644 --- a/src/primitives/block.cpp +++ b/src/primitives/block.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/primitives/block.h b/src/primitives/block.h index 9bc06ad6b..50a7f0273 100644 --- a/src/primitives/block.h +++ b/src/primitives/block.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp index 28c145f71..9ea732574 100644 --- a/src/primitives/transaction.cpp +++ b/src/primitives/transaction.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index f6f8e3136..998351178 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/protocol.cpp b/src/protocol.cpp index bdf236c2c..e918ee87d 100644 --- a/src/protocol.cpp +++ b/src/protocol.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/protocol.h b/src/protocol.h index 43dee2be9..e140626b8 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -61,7 +61,7 @@ public: }; /** - * Bitcoin protocol message types. When adding new message types, don't forget + * NYC3 protocol message types. When adding new message types, don't forget * to update allNetMessageTypes in protocol.cpp. */ namespace NetMsgType { @@ -251,7 +251,7 @@ enum ServiceFlags : uint64_t { // set by all NYC3 non pruned nodes, and is unset by SPV clients or other light clients. NODE_NETWORK = (1 << 0), // NODE_GETUTXO means the node is capable of responding to the getutxo protocol request. - // NYC3 does not support this but a patch set called Bitcoin XT does. + // NYC3 does not support this but a patch set called NYC3 XT does. // See BIP 64 for details on how this is implemented. NODE_GETUTXO = (1 << 1), // NODE_BLOOM means the node is capable and willing to handle bloom-filtered connections. diff --git a/src/psbt.cpp b/src/psbt.cpp index 0fb7d49d7..82ec20da9 100644 --- a/src/psbt.cpp +++ b/src/psbt.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/psbt.h b/src/psbt.h index c889dad36..041cb036d 100644 --- a/src/psbt.h +++ b/src/psbt.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2019 The Bitcoin Core developers +// Copyright (c) 2009-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -386,7 +386,7 @@ struct PartiallySignedTransaction bool IsNull() const; /** Merge psbt into this. The two psbts must have the same underlying CTransaction (i.e. the - * same actual Bitcoin transaction.) Returns true if the merge succeeded, false otherwise. */ + * same actual NYC3 transaction.) Returns true if the merge succeeded, false otherwise. */ NODISCARD bool Merge(const PartiallySignedTransaction& psbt); bool IsSane() const; bool AddInput(const CTxIn& txin, PSBTInput& psbtin); diff --git a/src/pubkey.cpp b/src/pubkey.cpp index d38df716b..561a3d70b 100644 --- a/src/pubkey.cpp +++ b/src/pubkey.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Copyright (c) 2017 The Zcash developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -20,7 +20,7 @@ secp256k1_context* secp256k1_context_verify = nullptr; * * Supported violations include negative integers, excessive padding, garbage * at the end, and overly long length descriptors. This is safe to use in - * Bitcoin because since the activation of BIP66, signatures are verified to be + * NYC3 because since the activation of BIP66, signatures are verified to be * strict DER before being passed to this module, and we know it supports all * violations present in the blockchain before that point. */ @@ -178,7 +178,7 @@ bool CPubKey::Verify(const uint256 &hash, const std::vector& vchS return false; } /* libsecp256k1's ECDSA verification requires lower-S signatures, which have - * not historically been enforced in Bitcoin, so normalize them first. */ + * not historically been enforced in NYC3, so normalize them first. */ secp256k1_ecdsa_signature_normalize(secp256k1_context_verify, &sig, &sig); return secp256k1_ecdsa_verify(secp256k1_context_verify, &sig, hash.begin(), &pubkey); } diff --git a/src/pubkey.h b/src/pubkey.h index 089324ffd..bbd00612f 100644 --- a/src/pubkey.h +++ b/src/pubkey.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Copyright (c) 2017 The Zcash developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/README.md b/src/qt/README.md index 0eb18f7cd..4aee9267f 100644 --- a/src/qt/README.md +++ b/src/qt/README.md @@ -1,4 +1,4 @@ -This directory contains the BitcoinQT graphical user interface (GUI). It uses the cross-platform framework [Qt](https://www1.qt.io/developers/). +This directory contains the NYC3QT graphical user interface (GUI). It uses the cross-platform framework [Qt](https://www1.qt.io/developers/). The current precise version for Qt 5 is specified in [qt.mk](/depends/packages/qt.mk). @@ -32,7 +32,7 @@ Tests. ### bitcoingui.(h/cpp) -Represents the main window of the Bitcoin UI. +Represents the main window of the NYC3 UI. ### \*model.(h/cpp) @@ -58,7 +58,7 @@ Represents the view to a single wallet. ### Other .h/cpp files -* UI elements like BitcoinAmountField, which inherit from QWidget. +* UI elements like NYC3AmountField, which inherit from QWidget. * `bitcoinstrings.cpp`: automatically generated * `bitcoinunits.(h/cpp)`: BTC / mBTC / etc handling * `callback.h` diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index 9b3cc3d19..094b08dd2 100644 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -102,12 +102,12 @@ AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode, switch(tab) { case SendingTab: - ui->labelExplanation->setText(tr("These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.")); + ui->labelExplanation->setText(tr("These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins.")); ui->deleteAddress->setVisible(true); ui->newAddress->setVisible(true); break; case ReceivingTab: - ui->labelExplanation->setText(tr("These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.")); + ui->labelExplanation->setText(tr("These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction.")); ui->deleteAddress->setVisible(false); ui->newAddress->setVisible(false); break; diff --git a/src/qt/addressbookpage.h b/src/qt/addressbookpage.h index 6394d2680..d8e260a57 100644 --- a/src/qt/addressbookpage.h +++ b/src/qt/addressbookpage.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp index c3143e948..6151974dd 100644 --- a/src/qt/addresstablemodel.cpp +++ b/src/qt/addresstablemodel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -332,7 +332,7 @@ QModelIndex AddressTableModel::index(int row, int column, const QModelIndex &par void AddressTableModel::updateEntry(const QString &address, const QString &label, bool isMine, const QString &purpose, int status) { - // Update address book model from Bitcoin core + // Update address book model from NYC3 core priv->updateEntry(address, label, isMine, purpose, status); } diff --git a/src/qt/addresstablemodel.h b/src/qt/addresstablemodel.h index 94c9dc4f8..c73998b00 100644 --- a/src/qt/addresstablemodel.h +++ b/src/qt/addresstablemodel.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index a89a15bc9..175ddf234 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/askpassphrasedialog.h b/src/qt/askpassphrasedialog.h index ac31569f6..33ac06d74 100644 --- a/src/qt/askpassphrasedialog.h +++ b/src/qt/askpassphrasedialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bantablemodel.cpp b/src/qt/bantablemodel.cpp index 00c446cc6..12172816b 100644 --- a/src/qt/bantablemodel.cpp +++ b/src/qt/bantablemodel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bantablemodel.h b/src/qt/bantablemodel.h index 9dec5fa6a..a64b7918c 100644 --- a/src/qt/bantablemodel.h +++ b/src/qt/bantablemodel.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index 27b4c182f..bb0b3aa6e 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h index 95f4521f0..1bb4f6e89 100644 --- a/src/qt/clientmodel.h +++ b/src/qt/clientmodel.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -40,7 +40,7 @@ enum NumConnections { CONNECTIONS_ALL = (CONNECTIONS_IN | CONNECTIONS_OUT), }; -/** Model for Bitcoin network client. */ +/** Model for NYC3 network client. */ class ClientModel : public QObject { Q_OBJECT diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index f36303506..fb63c14a1 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -230,7 +230,7 @@ void CoinControlDialog::showMenu(const QPoint &point) // context menu action: copy amount void CoinControlDialog::copyAmount() { - GUIUtil::setClipboard(BitcoinUnits::removeSpaces(contextMenuItem->text(COLUMN_AMOUNT))); + GUIUtil::setClipboard(NYC3Units::removeSpaces(contextMenuItem->text(COLUMN_AMOUNT))); } // context menu action: copy label @@ -532,7 +532,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) } // actually update labels - int nDisplayUnit = BitcoinUnits::NYC3; + int nDisplayUnit = NYC3Units::NYC3; if (model && model->getOptionsModel()) nDisplayUnit = model->getOptionsModel()->getDisplayUnit(); @@ -552,12 +552,12 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) // stats l1->setText(QString::number(nQuantity)); // Quantity - l2->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nAmount)); // Amount - l3->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nPayFee)); // Fee - l4->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nAfterFee)); // After Fee + l2->setText(NYC3Units::formatWithUnit(nDisplayUnit, nAmount)); // Amount + l3->setText(NYC3Units::formatWithUnit(nDisplayUnit, nPayFee)); // Fee + l4->setText(NYC3Units::formatWithUnit(nDisplayUnit, nAfterFee)); // After Fee l5->setText(((nBytes > 0) ? ASYMP_UTF8 : "") + QString::number(nBytes)); // Bytes l7->setText(fDust ? tr("yes") : tr("no")); // Dust - l8->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nChange)); // Change + l8->setText(NYC3Units::formatWithUnit(nDisplayUnit, nChange)); // Change if (nPayFee > 0) { l3->setText(ASYMP_UTF8 + l3->text()); @@ -679,7 +679,7 @@ void CoinControlDialog::updateView() } // amount - itemOutput->setText(COLUMN_AMOUNT, BitcoinUnits::format(nDisplayUnit, out.txout.nValue)); + itemOutput->setText(COLUMN_AMOUNT, NYC3Units::format(nDisplayUnit, out.txout.nValue)); itemOutput->setData(COLUMN_AMOUNT, Qt::UserRole, QVariant((qlonglong)out.txout.nValue)); // padding so that sorting works correctly // date @@ -713,7 +713,7 @@ void CoinControlDialog::updateView() if (treeMode) { itemWalletAddress->setText(COLUMN_CHECKBOX, "(" + QString::number(nChildren) + ")"); - itemWalletAddress->setText(COLUMN_AMOUNT, BitcoinUnits::format(nDisplayUnit, nSum)); + itemWalletAddress->setText(COLUMN_AMOUNT, NYC3Units::format(nDisplayUnit, nSum)); itemWalletAddress->setData(COLUMN_AMOUNT, Qt::UserRole, QVariant((qlonglong)nSum)); } } diff --git a/src/qt/coincontroldialog.h b/src/qt/coincontroldialog.h index efc06a765..305db3adc 100644 --- a/src/qt/coincontroldialog.h +++ b/src/qt/coincontroldialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/coincontroltreewidget.cpp b/src/qt/coincontroltreewidget.cpp index 4ffbd832e..0239e51ec 100644 --- a/src/qt/coincontroltreewidget.cpp +++ b/src/qt/coincontroltreewidget.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/coincontroltreewidget.h b/src/qt/coincontroltreewidget.h index 88fc8b704..c26948add 100644 --- a/src/qt/coincontroltreewidget.h +++ b/src/qt/coincontroltreewidget.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2014 The Bitcoin Core developers +// Copyright (c) 2011-2014 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/csvmodelwriter.cpp b/src/qt/csvmodelwriter.cpp index 656afb6e8..707b96549 100644 --- a/src/qt/csvmodelwriter.cpp +++ b/src/qt/csvmodelwriter.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/csvmodelwriter.h b/src/qt/csvmodelwriter.h index e8611bea3..29f127b9e 100644 --- a/src/qt/csvmodelwriter.h +++ b/src/qt/csvmodelwriter.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2014 The Bitcoin Core developers +// Copyright (c) 2011-2014 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp index 2fc174be5..71a1730bc 100644 --- a/src/qt/editaddressdialog.cpp +++ b/src/qt/editaddressdialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/editaddressdialog.h b/src/qt/editaddressdialog.h index 4d0e0709b..19b977023 100644 --- a/src/qt/editaddressdialog.h +++ b/src/qt/editaddressdialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index 240a7a7e9..dda9a2ad5 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -252,7 +252,7 @@ - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. Map port using &UPnP @@ -272,7 +272,7 @@ - Connect to the Bitcoin network through a SOCKS5 proxy. + Connect to the NYC3 network through a SOCKS5 proxy. &Connect through SOCKS5 proxy (default proxy): @@ -459,7 +459,7 @@ - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. Use separate SOCKS&5 proxy to reach peers via Tor hidden services: @@ -757,7 +757,7 @@ - + Open the %1 configuration file from the working directory. diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index 710801ee9..0e434d627 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -73,7 +73,7 @@ - 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. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. @@ -459,7 +459,7 @@ - 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. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. diff --git a/src/qt/forms/receivecoinsdialog.ui b/src/qt/forms/receivecoinsdialog.ui index 9aa815ff2..d7666bbd0 100644 --- a/src/qt/forms/receivecoinsdialog.ui +++ b/src/qt/forms/receivecoinsdialog.ui @@ -47,7 +47,7 @@ - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. &Message: @@ -93,7 +93,7 @@ - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui index 6c750c985..83bdb61d7 100644 --- a/src/qt/forms/sendcoinsentry.ui +++ b/src/qt/forms/sendcoinsentry.ui @@ -199,7 +199,7 @@ - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. Qt::PlainText diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h index 736ff13a4..3c92ce624 100644 --- a/src/qt/guiconstants.h +++ b/src/qt/guiconstants.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -11,7 +11,7 @@ static const int MODEL_UPDATE_DELAY = 250; /* AskPassphraseDialog -- Maximum passphrase length */ static const int MAX_PASSPHRASE_SIZE = 1024; -/* BitcoinGUI -- Size of icons in status bar */ +/* NYC3GUI -- Size of icons in status bar */ static const int STATUSBAR_ICONSIZE = 16; static const bool DEFAULT_SPLASHSCREEN = true; @@ -46,11 +46,11 @@ static const int MAX_URI_LENGTH = 255; /* Number of frames in spinner animation */ #define SPINNER_FRAMES 36 -#define QAPP_ORG_NAME "Bitcoin" +#define QAPP_ORG_NAME "NYC3" #define QAPP_ORG_DOMAIN "bitcoin.org" -#define QAPP_APP_NAME_DEFAULT "Bitcoin-Qt" -#define QAPP_APP_NAME_TESTNET "Bitcoin-Qt-testnet" -#define QAPP_APP_NAME_REGTEST "Bitcoin-Qt-regtest" +#define QAPP_APP_NAME_DEFAULT "NYC3-Qt" +#define QAPP_APP_NAME_TESTNET "NYC3-Qt-testnet" +#define QAPP_APP_NAME_REGTEST "NYC3-Qt-regtest" /* One gigabyte (GB) in bytes */ static constexpr uint64_t GB_BYTES{1000000000}; diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 2c355ca29..bc6667782 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -106,11 +106,11 @@ void setupAddressWidget(QValidatedLineEdit *widget, QWidget *parent) // and this is the only place, where this address is supplied. widget->setPlaceholderText(QObject::tr("Enter a NYC3 address (e.g. %1)").arg( QString::fromStdString(DummyAddress(Params())))); - widget->setValidator(new BitcoinAddressEntryValidator(parent)); - widget->setCheckValidator(new BitcoinAddressCheckValidator(parent)); + widget->setValidator(new NYC3AddressEntryValidator(parent)); + widget->setCheckValidator(new NYC3AddressCheckValidator(parent)); } -bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out) +bool parseNYC3URI(const QUrl &uri, SendCoinsRecipient *out) { // return if URI is not valid or is no bitcoin: URI if(!uri.isValid() || uri.scheme() != QString("bitcoin")) @@ -149,7 +149,7 @@ bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out) { if(!i->second.isEmpty()) { - if(!BitcoinUnits::parse(BitcoinUnits::NYC3, i->second, &rv.amount)) + if(!NYC3Units::parse(NYC3Units::NYC3, i->second, &rv.amount)) { return false; } @@ -167,20 +167,20 @@ bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out) return true; } -bool parseBitcoinURI(QString uri, SendCoinsRecipient *out) +bool parseNYC3URI(QString uri, SendCoinsRecipient *out) { QUrl uriInstance(uri); - return parseBitcoinURI(uriInstance, out); + return parseNYC3URI(uriInstance, out); } -QString formatBitcoinURI(const SendCoinsRecipient &info) +QString formatNYC3URI(const SendCoinsRecipient &info) { QString ret = QString("bitcoin:%1").arg(info.address); int paramCount = 0; if (info.amount) { - ret += QString("?amount=%1").arg(BitcoinUnits::format(BitcoinUnits::NYC3, info.amount, false, BitcoinUnits::separatorNever)); + ret += QString("?amount=%1").arg(NYC3Units::format(NYC3Units::NYC3, info.amount, false, NYC3Units::separatorNever)); paramCount++; } @@ -379,7 +379,7 @@ void openDebugLogfile() QDesktopServices::openUrl(QUrl::fromLocalFile(boostPathToQString(pathDebug))); } -bool openBitcoinConf() +bool openNYC3Conf() { fs::path pathConfig = GetConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME)); @@ -539,15 +539,15 @@ fs::path static StartupShortcutPath() { std::string chain = gArgs.GetChainName(); if (chain == CBaseChainParams::MAIN) - return GetSpecialFolderPath(CSIDL_STARTUP) / "Bitcoin.lnk"; + return GetSpecialFolderPath(CSIDL_STARTUP) / "NYC3.lnk"; if (chain == CBaseChainParams::TESTNET) // Remove this special case when CBaseChainParams::TESTNET = "testnet4" - return GetSpecialFolderPath(CSIDL_STARTUP) / "Bitcoin (testnet).lnk"; - return GetSpecialFolderPath(CSIDL_STARTUP) / strprintf("Bitcoin (%s).lnk", chain); + return GetSpecialFolderPath(CSIDL_STARTUP) / "NYC3 (testnet).lnk"; + return GetSpecialFolderPath(CSIDL_STARTUP) / strprintf("NYC3 (%s).lnk", chain); } bool GetStartOnSystemStartup() { - // check for Bitcoin*.lnk + // check for NYC3*.lnk return fs::exists(StartupShortcutPath()); } @@ -667,9 +667,9 @@ bool SetStartOnSystemStartup(bool fAutoStart) optionFile << "[Desktop Entry]\n"; optionFile << "Type=Application\n"; if (chain == CBaseChainParams::MAIN) - optionFile << "Name=Bitcoin\n"; + optionFile << "Name=NYC3\n"; else - optionFile << strprintf("Name=Bitcoin (%s)\n", chain); + optionFile << strprintf("Name=NYC3 (%s)\n", chain); optionFile << "Exec=" << pszExePath << strprintf(" -min -testnet=%d -regtest=%d\n", gArgs.GetBoolArg("-testnet", false), gArgs.GetBoolArg("-regtest", false)); optionFile << "Terminal=false\n"; optionFile << "Hidden=false\n"; diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h index cbec73a88..5a57df613 100644 --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -36,7 +36,7 @@ class QUrl; class QWidget; QT_END_NAMESPACE -/** Utility functions used by the Bitcoin Qt UI. +/** Utility functions used by the NYC3 Qt UI. */ namespace GUIUtil { @@ -51,9 +51,9 @@ namespace GUIUtil void setupAddressWidget(QValidatedLineEdit *widget, QWidget *parent); // Parse "bitcoin:" URI into recipient object, return true on successful parsing - bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out); - bool parseBitcoinURI(QString uri, SendCoinsRecipient *out); - QString formatBitcoinURI(const SendCoinsRecipient &info); + bool parseNYC3URI(const QUrl &uri, SendCoinsRecipient *out); + bool parseNYC3URI(QString uri, SendCoinsRecipient *out); + QString formatNYC3URI(const SendCoinsRecipient &info); // Returns true if given address+amount meets "dust" definition bool isDust(interfaces::Node& node, const QString& address, const CAmount& amount); @@ -123,7 +123,7 @@ namespace GUIUtil void openDebugLogfile(); // Open the config file - bool openBitcoinConf(); + bool openNYC3Conf(); /** Qt event filter that intercepts ToolTipChange events, and replaces the tooltip with a rich text representation if needed. This assures that Qt can word-wrap long tooltip messages. diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 499af9fa0..136d97695 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -126,7 +126,7 @@ Intro::Intro(QWidget *parent, uint64_t blockchain_size, uint64_t chain_state_siz .arg(tr(PACKAGE_NAME)) .arg(m_blockchain_size) .arg(2009) - .arg(tr("Bitcoin")) + .arg(tr("NYC3")) ); ui->lblExplanation2->setText(ui->lblExplanation2->text().arg(tr(PACKAGE_NAME))); @@ -145,7 +145,7 @@ Intro::Intro(QWidget *parent, uint64_t blockchain_size, uint64_t chain_state_siz } requiredSpace += m_chain_state_size; ui->sizeWarningLabel->setText( - tr("%1 will download and store a copy of the Bitcoin block chain.").arg(tr(PACKAGE_NAME)) + " " + + tr("%1 will download and store a copy of the NYC3 block chain.").arg(tr(PACKAGE_NAME)) + " " + storageRequiresMsg.arg(requiredSpace) + " " + tr("The wallet will also be stored in this directory.") ); diff --git a/src/qt/intro.h b/src/qt/intro.h index b537c94f7..05ad15f82 100644 --- a/src/qt/intro.h +++ b/src/qt/intro.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/locale/nyc3_af.ts b/src/qt/locale/nyc3_af.ts index e95796eee..a1b11e916 100644 --- a/src/qt/locale/nyc3_af.ts +++ b/src/qt/locale/nyc3_af.ts @@ -62,12 +62,12 @@ Ontvanger adresse - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Hierdie is die adresse vanwaar u Bitcoin betalings stuur. U moet altyd die bedrag en die adres van die ontvanger nagaan voordat u enige munte stuur. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Hierdie is die adresse vanwaar u NYC3 betalings stuur. U moet altyd die bedrag en die adres van die ontvanger nagaan voordat u enige munte stuur. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Hierdie is die adresse waar u Bitcoins sal ontvang. Ons beveel aan dat u 'n nuwe adres kies vir elke transaksie + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Hierdie is die adresse waar u NYC3s sal ontvang. Ons beveel aan dat u 'n nuwe adres kies vir elke transaksie &Copy Address @@ -232,7 +232,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Teken &boodskap... @@ -323,7 +323,7 @@ Send coins to a NYC3 address - Stuur munte na 'n Bitcoin adres + Stuur munte na 'n NYC3 adres Backup wallet to another location @@ -346,8 +346,8 @@ &Verifieer boodskap... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -370,12 +370,12 @@ Kodifiseer die private sleutes wat aan jou beursie gekoppel is. - Sign messages with your Bitcoin addresses to prove you own them - Onderteken boodskappe met u Bitcoin adresse om u eienaarskap te bewys + Sign messages with your NYC3 addresses to prove you own them + Onderteken boodskappe met u NYC3 adresse om u eienaarskap te bewys - Verify messages to ensure they were signed with specified Bitcoin addresses - Verifieër boodskappe om seker te maak dat dit met die gespesifiseerde Bitcoin adresse + Verify messages to ensure they were signed with specified NYC3 addresses + Verifieër boodskappe om seker te maak dat dit met die gespesifiseerde NYC3 adresse &File @@ -504,8 +504,8 @@ Inkomende transaksie - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - 'N fatale fout het voorgekom. Bitcoin kan nie meer veilig voortgaan nie en sal nou toemaak. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + 'N fatale fout het voorgekom. NYC3 kan nie meer veilig voortgaan nie en sal nou toemaak. @@ -695,7 +695,7 @@ The entered address "%1" is not a valid NYC3 address. - Die ingevoerde adres "%1" is nie 'n geldige Bitcoin adres nie. + Die ingevoerde adres "%1" is nie 'n geldige NYC3 adres nie. Could not unlock wallet. @@ -767,8 +767,8 @@ Gebruik 'n persoonlike data gids: - Bitcoin - Bitcoin + NYC3 + NYC3 The wallet will also be stored in this directory. @@ -1121,7 +1121,7 @@ Enter a NYC3 address (e.g. %1) - Voer in 'n Bitcoin adres (bv. %1) + Voer in 'n NYC3 adres (bv. %1) %1 d @@ -1698,7 +1698,7 @@ transaksievertragingsrisiko. Warning: Invalid NYC3 address - Waarskuwing: Ongeldige Bitcoinadres + Waarskuwing: Ongeldige NYC3adres The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure? @@ -1731,7 +1731,7 @@ Is u seker? The NYC3 address to send the payment to - Die Bitcoinadres waarheen die betaling gestuur word + Die NYC3adres waarheen die betaling gestuur word Alt+A @@ -2040,7 +2040,7 @@ word die fooi eweredig verdeel. bitcoin-core NYC3 - Bitcoin Kern + NYC3 Kern Error loading %s diff --git a/src/qt/locale/nyc3_af_ZA.ts b/src/qt/locale/nyc3_af_ZA.ts index 5bb0b0c2e..2c7f84199 100644 --- a/src/qt/locale/nyc3_af_ZA.ts +++ b/src/qt/locale/nyc3_af_ZA.ts @@ -62,12 +62,12 @@ Ontvang adresse - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Dit is jou Bitcoin-adresse vir die stuur van betalings. Kontroleer altyd die bedrag en die ontvangsadres voordat u munte stuur. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Dit is jou NYC3-adresse vir die stuur van betalings. Kontroleer altyd die bedrag en die ontvangsadres voordat u munte stuur. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Dit is jou Bitcoin-adresse vir die stuur van betalings. Kontroleer altyd die bedrag en die ontvangsadres voordat jy munte stuur. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Dit is jou NYC3-adresse vir die stuur van betalings. Kontroleer altyd die bedrag en die ontvangsadres voordat jy munte stuur. &Copy Address @@ -232,7 +232,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Teken &Boodskap @@ -327,7 +327,7 @@ Send coins to a NYC3 address - Stuur muntstukke na 'n Bitcoin adres + Stuur muntstukke na 'n NYC3 adres Backup wallet to another location @@ -350,8 +350,8 @@ &Verifieer boodskap... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -374,12 +374,12 @@ Versleutel die private sleutels wat aan u beursie behoort - Sign messages with your Bitcoin addresses to prove you own them - Teken boodskappe met u Bitcoin adresse om te bewys dat u hul besit + Sign messages with your NYC3 addresses to prove you own them + Teken boodskappe met u NYC3 adresse om te bewys dat u hul besit - Verify messages to ensure they were signed with specified Bitcoin addresses - Bevestig boodskappe om te verseker dat hulle geteken was met gespesifiseerde Bitcoin adresse + Verify messages to ensure they were signed with specified NYC3 addresses + Bevestig boodskappe om te verseker dat hulle geteken was met gespesifiseerde NYC3 adresse &File @@ -454,8 +454,8 @@ Op datum - Show the %1 help message to get a list with possible Bitcoin command-line options - Wys die %1 hulpboodskap om 'n lys met moontlike Bitcoin bevel-lyn opsies te verkry + Show the %1 help message to get a list with possible NYC3 command-line options + Wys die %1 hulpboodskap om 'n lys met moontlike NYC3 bevel-lyn opsies te verkry &Window @@ -528,8 +528,8 @@ Beursie is <b>versleutel</b> en is tans <b>gesluit</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - 'n Noodlottige fout het voorgekom. Bitcoin kan nie langer voortgaan nie en sal afsluit. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + 'n Noodlottige fout het voorgekom. NYC3 kan nie langer voortgaan nie en sal afsluit. @@ -719,7 +719,7 @@ The entered address "%1" is not a valid NYC3 address. - Die ingeskrewe adres "%1" is nie 'n geldige Bitcoin adres nie. + Die ingeskrewe adres "%1" is nie 'n geldige NYC3 adres nie. Could not unlock wallet. @@ -783,8 +783,8 @@ Welkom by %1. - Bitcoin - Bitcoin + NYC3 + NYC3 The wallet will also be stored in this directory. diff --git a/src/qt/locale/nyc3_am.ts b/src/qt/locale/nyc3_am.ts index 1dcc09a13..790c014cd 100644 --- a/src/qt/locale/nyc3_am.ts +++ b/src/qt/locale/nyc3_am.ts @@ -62,11 +62,11 @@ የመቀበያ አድራሻዎች - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. እነኚ የቢትኮይን ክፍያ የመላኪያ አድራሻዎችዎ ናቸው:: ገንዘብ/ኮይኖች ከመላክዎ በፊት መጠኑን እና የመቀበያ አድራሻውን ሁልጊዜ ያረጋግጡ:: - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. እነኚ የቢትኮይን ክፍያ የመቀበያ አድራሻዎችዎ ናቸው:: ለእያንዳንዱ ግብይት አዲስ የመቀበያ አድራሻ እንዲጠቀሙ ይመከራል::  @@ -228,7 +228,7 @@ - BitcoinGUI + NYC3GUI Sign &message... ምልክትና መልእክት... diff --git a/src/qt/locale/nyc3_ar.ts b/src/qt/locale/nyc3_ar.ts index 8fc691234..91994f797 100644 --- a/src/qt/locale/nyc3_ar.ts +++ b/src/qt/locale/nyc3_ar.ts @@ -66,12 +66,12 @@ عناوين الاستقبال - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - هذه هي عناوين Bitcoin التابعة لك من أجل إرسال الدفعات. تحقق دائما من المبلغ و عنوان المرسل المستقبل قبل إرسال العملات + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + هذه هي عناوين NYC3 التابعة لك من أجل إرسال الدفعات. تحقق دائما من المبلغ و عنوان المرسل المستقبل قبل إرسال العملات - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - هذه هي عناوين Bitcoin التابعة لك من أجل إستقبال الدفعات. ينصح استخدام عنوان جديد من أجل كل صفقة + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + هذه هي عناوين NYC3 التابعة لك من أجل إستقبال الدفعات. ينصح استخدام عنوان جديد من أجل كل صفقة &Copy Address @@ -236,7 +236,7 @@ - BitcoinGUI + NYC3GUI Sign &message... التوقيع و الرسائل @@ -358,7 +358,7 @@ &التحقق من الرسالة... - Bitcoin + NYC3 بتكوين @@ -382,12 +382,12 @@ تشفير المفتاح الخاص بمحفظتك - Sign messages with your Bitcoin addresses to prove you own them - وقَع الرسائل بواسطة ال: Bitcoin الخاص بك لإثبات امتلاكك لهم + Sign messages with your NYC3 addresses to prove you own them + وقَع الرسائل بواسطة ال: NYC3 الخاص بك لإثبات امتلاكك لهم - Verify messages to ensure they were signed with specified Bitcoin addresses - تحقق من الرسائل للتأكد من أنَها وُقعت برسائل Bitcoin محدَدة + Verify messages to ensure they were signed with specified NYC3 addresses + تحقق من الرسائل للتأكد من أنَها وُقعت برسائل NYC3 محدَدة &File @@ -419,7 +419,7 @@ Open a bitcoin: URI or payment request - فتح URI : Bitcoin أو طلب دفع + فتح URI : NYC3 أو طلب دفع &Command-line options @@ -470,7 +470,7 @@ &عناوين الإستقبال - Show the %1 help message to get a list with possible Bitcoin command-line options + Show the %1 help message to get a list with possible NYC3 command-line options بين اشارة المساعدة %1 للحصول على قائمة من خيارات اوامر البت كوين المحتملة @@ -562,7 +562,7 @@ المحفظة <b>مشفرة</b> و <b>مقفلة</b> حاليا - A fatal error occurred. Bitcoin can no longer continue safely and will quit. + A fatal error occurred. NYC3 can no longer continue safely and will quit. خطأ فادح حدث . لا يمكن اتمام بيتكوين بامان سيتم الخروج @@ -833,7 +833,7 @@ استخدام دليل بيانات مخصص: - Bitcoin + NYC3 بتكوين @@ -845,7 +845,7 @@ سيتم تخزين %1 جيجابايت تقريباً من البيانات في هذا الدليل. - %1 will download and store a copy of the Bitcoin block chain. + %1 will download and store a copy of the NYC3 block chain. سيقوم %1 بتنزيل نسخة من سلسلة كتل بتكوين وتخزينها. @@ -1026,7 +1026,7 @@ السماح بالاتصالات الواردة. - Connect to the Bitcoin network through a SOCKS5 proxy. + Connect to the NYC3 network through a SOCKS5 proxy. الاتصال بشبكة البتكوين عبر وكيل SOCKS5. @@ -1062,7 +1062,7 @@ تور - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. قم بالاتصال بشبكة بتكوين عبر وكيل SOCKS5 منفصل لخدمات تور المخفية. @@ -1161,7 +1161,7 @@ نمودج - 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. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. قد تكون المعلومات المعروضة قديمة. تتزامن محفظتك تلقائيًا مع شبكة البتكوين بعد إنشاء الاتصال، ولكن هذه العملية لم تكتمل بعد. @@ -1742,7 +1742,7 @@ &رسالة: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. رسالة اختيارية لإرفاقها بطلب الدفع، والتي سيتم عرضها عند فتح الطلب. ملاحظة: لن يتم إرسال الرسالة مع الدفعة عبر شبكة البتكوين. @@ -2214,7 +2214,7 @@ أدخل تسمية لهذا العنوان لإضافته إلى قائمة العناوين المستخدمة - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. الرسالة التي تم إرفاقها مع البتكوين: العنوان الذي سيتم تخزينه مع المعاملة للرجوع إليه. ملاحظة: لن يتم إرسال هذه الرسالة عبر شبكة البتكوين. diff --git a/src/qt/locale/nyc3_be_BY.ts b/src/qt/locale/nyc3_be_BY.ts index c87544eb1..a74905260 100644 --- a/src/qt/locale/nyc3_be_BY.ts +++ b/src/qt/locale/nyc3_be_BY.ts @@ -66,11 +66,11 @@ адрасы Прымання - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. Тут знаходзяцца Біткойн-адрасы для высылання плацяжоў. Заўсёды спраўджвайце колькасць і адрас прызначэння перад здзяйсненнем транзакцыі. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. Тут знаходзяцца Біткойн-адрасы для прымання плацяжоў. Пажадана выкарыстоўваць новы адрас для кожнай транзакцыі. @@ -224,7 +224,7 @@ BanTableModel - BitcoinGUI + NYC3GUI Sign &message... Падпісаць паведамленне... @@ -314,7 +314,7 @@ Праверыць паведамленне... - Bitcoin + NYC3 Біткойн @@ -338,11 +338,11 @@ Зашыфраваць прыватныя ключы, якия належаць вашаму гаманцу - Sign messages with your Bitcoin addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them Падпісаць паведамленне з дапамогай Біткойн-адраса каб даказаць, што яно належыць вам - Verify messages to ensure they were signed with specified Bitcoin addresses + Verify messages to ensure they were signed with specified NYC3 addresses Спраўдзіць паведамленне з дапамогай Біткойн-адраса каб даказаць, што яно належыць вам @@ -643,7 +643,7 @@ Вітаем - Bitcoin + NYC3 Біткойн diff --git a/src/qt/locale/nyc3_bg.ts b/src/qt/locale/nyc3_bg.ts index 6948c9b9d..3adecadde 100644 --- a/src/qt/locale/nyc3_bg.ts +++ b/src/qt/locale/nyc3_bg.ts @@ -66,11 +66,11 @@ Получаване на адреси - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. Това са адресите на получателите на плащания. Винаги проверявайте размера на сумата и адреса на получателя, преди да изпратите монети. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. Това са Вашите Биткойн адреси,благодарение на които ще получавате плащания.Препоръчително е да използвате нови адреси за получаване на всяка транзакция. @@ -236,7 +236,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Подписване на &съобщение... @@ -358,7 +358,7 @@ &Проверка на съобщение... - Bitcoin + NYC3 Биткоин @@ -382,11 +382,11 @@ Шифроване на личните ключове,които принадлежат на портфейла Ви. - Sign messages with your Bitcoin addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them Пишете съобщения със своя Биткойн адрес за да докажете,че е ваш. - Verify messages to ensure they were signed with specified Bitcoin addresses + Verify messages to ensure they were signed with specified NYC3 addresses Потвърждаване на съобщения за да се знае,че са написани с дадените Биткойн адреси. @@ -462,7 +462,7 @@ Синхронизиран - Show the %1 help message to get a list with possible Bitcoin command-line options + Show the %1 help message to get a list with possible NYC3 command-line options Покажи %1 помощно съобщение за да получиш лист с възможни Биткойн команди @@ -536,7 +536,7 @@ Портфейлът е <b>криптиран</b> и <b>заключен</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. + A fatal error occurred. NYC3 can no longer continue safely and will quit. Възникна фатална грешка. Биткойн не може да продължи безопасно и ще се изключи. @@ -795,7 +795,7 @@ Използване на директория ръчно - Bitcoin + NYC3 Биткоин @@ -900,8 +900,8 @@ &Похарчете непотвърденото ресто - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Автоматично отваряне на входящия Bitcoin порт. Работи само с рутери поддържащи UPnP. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Автоматично отваряне на входящия NYC3 порт. Работи само с рутери поддържащи UPnP. Map port using &UPnP @@ -916,7 +916,7 @@ Позволи входящи връзки - Connect to the Bitcoin network through a SOCKS5 proxy. + Connect to the NYC3 network through a SOCKS5 proxy. Свързване с Биткойн мрежата чрез SOCKS5 прокси. @@ -1023,7 +1023,7 @@ Формуляр - 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. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. Текущата информация на екрана може да не е актуална. Вашият портфейл ще се синхронизира автоматично с мрежата на Биткоин, щом поне една връзката с нея се установи; този процес все още не е приключил. diff --git a/src/qt/locale/nyc3_bg_BG.ts b/src/qt/locale/nyc3_bg_BG.ts index a26ef0ab7..c952cd02c 100644 --- a/src/qt/locale/nyc3_bg_BG.ts +++ b/src/qt/locale/nyc3_bg_BG.ts @@ -62,11 +62,11 @@ Адрес за получаване - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. Тези са вашите Биткойн адреси за изпращане на монети. Винаги проверявайте количеството и получаващия адрес преди изпращане. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. Това са вашите Биткойн адреси за получаване на монети. Препоръчително е да ползвате нов адрес на всяка транзакция. @@ -188,7 +188,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Подпиши съобщение... diff --git a/src/qt/locale/nyc3_ca.ts b/src/qt/locale/nyc3_ca.ts index dd658438f..19eb7646d 100644 --- a/src/qt/locale/nyc3_ca.ts +++ b/src/qt/locale/nyc3_ca.ts @@ -66,12 +66,12 @@ Adreces de recepció - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Aquestes són les vostres adreces de Bitcoin per enviar els pagaments. Sempre reviseu l'import i l'adreça del destinatari abans de transferir monedes. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Aquestes són les vostres adreces de NYC3 per enviar els pagaments. Sempre reviseu l'import i l'adreça del destinatari abans de transferir monedes. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Aquestes són les vostres adreces Bitcoin per rebre pagaments. Es recomana utilitzar una adreça nova de recepció per a cada transacció. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Aquestes són les vostres adreces NYC3 per rebre pagaments. Es recomana utilitzar una adreça nova de recepció per a cada transacció. &Copy Address @@ -236,7 +236,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Signa el &missatge... @@ -339,7 +339,7 @@ Send coins to a NYC3 address - Envia monedes a una adreça Bitcoin + Envia monedes a una adreça NYC3 Backup wallet to another location @@ -362,8 +362,8 @@ &Verifica el missatge... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -386,12 +386,12 @@ Encripta les claus privades pertanyents al moneder - Sign messages with your Bitcoin addresses to prove you own them - Signa el missatges amb la seva adreça de Bitcoin per provar que les poseeixes + Sign messages with your NYC3 addresses to prove you own them + Signa el missatges amb la seva adreça de NYC3 per provar que les poseeixes - Verify messages to ensure they were signed with specified Bitcoin addresses - Verifiqueu els missatges per assegurar-vos que han estat signats amb una adreça Bitcoin específica. + Verify messages to ensure they were signed with specified NYC3 addresses + Verifiqueu els missatges per assegurar-vos que han estat signats amb una adreça NYC3 específica. &File @@ -466,8 +466,8 @@ Al dia - Show the %1 help message to get a list with possible Bitcoin command-line options - Mostra el missatge d'ajuda del %1 per obtenir una llista amb les possibles opcions de línia d'ordres de Bitcoin + Show the %1 help message to get a list with possible NYC3 command-line options + Mostra el missatge d'ajuda del %1 per obtenir una llista amb les possibles opcions de línia d'ordres de NYC3 default wallet @@ -554,8 +554,8 @@ El moneder està <b>encriptat</b> i actualment <b>bloquejat</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - S'ha produït un error fatal. Bitcoin no pot continuar amb seguretat i finalitzarà. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + S'ha produït un error fatal. NYC3 no pot continuar amb seguretat i finalitzarà. @@ -745,7 +745,7 @@ The entered address "%1" is not a valid NYC3 address. - L'adreça introduïda «%1» no és una adreça de Bitcoin vàlida. + L'adreça introduïda «%1» no és una adreça de NYC3 vàlida. Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -841,8 +841,8 @@ Utilitza un directori de dades personalitzat: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -853,8 +853,8 @@ Aproximadament %1 GB de dades s'emmagatzemaran en aquest directori. - %1 will download and store a copy of the Bitcoin block chain. - %1 descarregarà i emmagatzemarà una còpia de la cadena de blocs Bitcoin. + %1 will download and store a copy of the NYC3 block chain. + %1 descarregarà i emmagatzemarà una còpia de la cadena de blocs NYC3. The wallet will also be stored in this directory. @@ -1054,8 +1054,8 @@ &Gasta el canvi sense confirmar - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Obre el port del client de Bitcoin al router de forma automàtica. Això només funciona quan el router implementa UPnP i l'opció està activada. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Obre el port del client de NYC3 al router de forma automàtica. Això només funciona quan el router implementa UPnP i l'opció està activada. Map port using &UPnP @@ -1070,8 +1070,8 @@ Permet connexions entrants - Connect to the Bitcoin network through a SOCKS5 proxy. - Connecta a la xarxa Bitcoin a través d'un proxy SOCKS5. + Connect to the NYC3 network through a SOCKS5 proxy. + Connecta a la xarxa NYC3 a través d'un proxy SOCKS5. &Connect through SOCKS5 proxy (default proxy): @@ -1106,8 +1106,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Conectar a la red de Bitcoin a través de un proxy SOCKS5 per als serveis ocults de Tor + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Conectar a la red de NYC3 a través de un proxy SOCKS5 per als serveis ocults de Tor &Window @@ -1213,8 +1213,8 @@ Formulari - 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. - La informació mostrada pot no estar al día. El teu moneder es sincronitza automàticament amb la xarxa Bitcoin un cop s'ha establert connexió, però aquest proces no s'ha completat encara. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + La informació mostrada pot no estar al día. El teu moneder es sincronitza automàticament amb la xarxa NYC3 un cop s'ha establert connexió, però aquest proces no s'ha completat encara. Watch-only: @@ -1309,7 +1309,7 @@ URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - L'URI no pot ser analitzat! Això pot ser a causa d'una adreça de Bitcoin no vàlida o per paràmetres URI amb mal format. + L'URI no pot ser analitzat! Això pot ser a causa d'una adreça de NYC3 no vàlida o per paràmetres URI amb mal format. Payment request file handling @@ -1411,7 +1411,7 @@ Enter a NYC3 address (e.g. %1) - Introduïu una adreça de Bitcoin (p. ex. %1) + Introduïu una adreça de NYC3 (p. ex. %1) %1 d @@ -1830,8 +1830,8 @@ &Missatge: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Un missatge opcional que s'adjuntarà a la sol·licitud de pagament, que es mostrarà quan s'obri la sol·licitud. Nota: El missatge no s'enviarà amb el pagament per la xarxa Bitcoin. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Un missatge opcional que s'adjuntarà a la sol·licitud de pagament, que es mostrarà quan s'obri la sol·licitud. Nota: El missatge no s'enviarà amb el pagament per la xarxa NYC3. An optional label to associate with the new receiving address. @@ -2232,7 +2232,7 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1 Warning: Invalid NYC3 address - Avís: adreça Bitcoin no vàlida + Avís: adreça NYC3 no vàlida Warning: Unknown change address @@ -2275,7 +2275,7 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1 The NYC3 address to send the payment to - L'adreça Bitcoin on enviar el pagament + L'adreça NYC3 on enviar el pagament Alt+A @@ -2318,8 +2318,8 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1 Introduïu una etiqueta per a aquesta adreça per afegir-la a la llista d'adreces utilitzades - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Un missatge que s'ha adjuntat al bitcoin: URI que s'emmagatzemarà amb la transacció per a la vostra referència. Nota: el missatge no s'enviarà a través de la xarxa Bitcoin. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Un missatge que s'ha adjuntat al bitcoin: URI que s'emmagatzemarà amb la transacció per a la vostra referència. Nota: el missatge no s'enviarà a través de la xarxa NYC3. Pay To: @@ -2368,7 +2368,7 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1 The NYC3 address to sign the message with - L'adreça Bitcoin amb què signar el missatge + L'adreça NYC3 amb què signar el missatge Choose previously used address @@ -2400,7 +2400,7 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1 Sign the message to prove you own this NYC3 address - Signa el missatge per provar que ets propietari d'aquesta adreça Bitcoin + Signa el missatge per provar que ets propietari d'aquesta adreça NYC3 Sign &Message @@ -2424,11 +2424,11 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1 The NYC3 address the message was signed with - L'adreça Bitcoin amb què va ser signat el missatge + L'adreça NYC3 amb què va ser signat el missatge Verify the message to ensure it was signed with the specified NYC3 address - Verificar el missatge per assegurar-se que ha estat signat amb una adreça Bitcoin específica + Verificar el missatge per assegurar-se que ha estat signat amb una adreça NYC3 específica Verify &Message diff --git a/src/qt/locale/nyc3_ca@valencia.ts b/src/qt/locale/nyc3_ca@valencia.ts index ba833b4f5..a52201309 100644 --- a/src/qt/locale/nyc3_ca@valencia.ts +++ b/src/qt/locale/nyc3_ca@valencia.ts @@ -66,12 +66,12 @@ S'estan rebent les adreces - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Estes són les vostres adreces de Bitcoin per enviar els pagaments. Sempre reviseu l'import i l'adreça del destinatari abans de transferir monedes. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Estes són les vostres adreces de NYC3 per enviar els pagaments. Sempre reviseu l'import i l'adreça del destinatari abans de transferir monedes. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Estes són les vostres adreces Bitcoin per rebre pagaments. Es recomana utilitzar una adreça nova de recepció per a cada transacció. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Estes són les vostres adreces NYC3 per rebre pagaments. Es recomana utilitzar una adreça nova de recepció per a cada transacció. &Copy Address @@ -224,7 +224,7 @@ BanTableModel - BitcoinGUI + NYC3GUI Sign &message... Signa el &missatge... @@ -291,7 +291,7 @@ Send coins to a NYC3 address - Envia monedes a una adreça Bitcoin + Envia monedes a una adreça NYC3 Backup wallet to another location @@ -314,8 +314,8 @@ &Verifica el missatge... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -338,12 +338,12 @@ Encripta les claus privades pertanyents al moneder - Sign messages with your Bitcoin addresses to prove you own them - Signa el missatges amb la seua adreça de Bitcoin per provar que les poseeixes + Sign messages with your NYC3 addresses to prove you own them + Signa el missatges amb la seua adreça de NYC3 per provar que les poseeixes - Verify messages to ensure they were signed with specified Bitcoin addresses - Verifiqueu els missatges per assegurar-vos que han estat signats amb una adreça Bitcoin específica. + Verify messages to ensure they were signed with specified NYC3 addresses + Verifiqueu els missatges per assegurar-vos que han estat signats amb una adreça NYC3 específica. &File @@ -464,8 +464,8 @@ El moneder està <b>encriptat</b> i actualment <b>bloquejat</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Ha tingut lloc un error fatal. Bitcoin no pot continuar executant-se de manera segura i es tancará. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Ha tingut lloc un error fatal. NYC3 no pot continuar executant-se de manera segura i es tancará. @@ -651,7 +651,7 @@ The entered address "%1" is not a valid NYC3 address. - L'adreça introduïda «%1» no és una adreça de Bitcoin vàlida. + L'adreça introduïda «%1» no és una adreça de NYC3 vàlida. Could not unlock wallet. @@ -715,8 +715,8 @@ Utilitza un directori de dades personalitzat: - Bitcoin - Bitcoin + NYC3 + NYC3 Error: Specified data directory "%1" cannot be created. @@ -832,16 +832,16 @@ &Gasta el canvi sense confirmar - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Obri el port del client de Bitcoin al router de forma automàtica. Això només funciona quan el router implementa UPnP i l'opció està activada. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Obri el port del client de NYC3 al router de forma automàtica. Això només funciona quan el router implementa UPnP i l'opció està activada. Map port using &UPnP Port obert amb &UPnP - Connect to the Bitcoin network through a SOCKS5 proxy. - Connecta a la xarxa Bitcoin a través d'un proxy SOCKS5. + Connect to the NYC3 network through a SOCKS5 proxy. + Connecta a la xarxa NYC3 a través d'un proxy SOCKS5. &Connect through SOCKS5 proxy (default proxy): @@ -943,8 +943,8 @@ Formulari - 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. - La informació mostrada pot no estar al día. El teu moneder es sincronitza automàticament amb la xarxa Bitcoin un cop s'ha establit connexió, però este proces no s'ha completat encara. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + La informació mostrada pot no estar al día. El teu moneder es sincronitza automàticament amb la xarxa NYC3 un cop s'ha establit connexió, però este proces no s'ha completat encara. Watch-only: @@ -1035,7 +1035,7 @@ URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - L'URI no pot ser analitzat! Això pot ser a causa d'una adreça de Bitcoin no vàlida o per paràmetres URI amb mal format. + L'URI no pot ser analitzat! Això pot ser a causa d'una adreça de NYC3 no vàlida o per paràmetres URI amb mal format. Payment request file handling @@ -1129,7 +1129,7 @@ Enter a NYC3 address (e.g. %1) - Introduïu una adreça de Bitcoin (p. ex. %1) + Introduïu una adreça de NYC3 (p. ex. %1) %1 d @@ -1396,8 +1396,8 @@ &Missatge: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Un missatge opcional que s'adjuntarà a la sol·licitud de pagament, que es mostrarà quan s'òbriga la sol·licitud. Nota: El missatge no s'enviarà amb el pagament per la xarxa Bitcoin. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Un missatge opcional que s'adjuntarà a la sol·licitud de pagament, que es mostrarà quan s'òbriga la sol·licitud. Nota: El missatge no s'enviarà amb el pagament per la xarxa NYC3. An optional label to associate with the new receiving address. @@ -1738,7 +1738,7 @@ Warning: Invalid NYC3 address - Avís: adreça Bitcoin no vàlida + Avís: adreça NYC3 no vàlida Warning: Unknown change address @@ -1773,7 +1773,7 @@ The NYC3 address to send the payment to - L'adreça Bitcoin on enviar el pagament + L'adreça NYC3 on enviar el pagament Alt+A @@ -1816,8 +1816,8 @@ Introduïu una etiqueta per a esta adreça per afegir-la a la llista d'adreces utilitzades - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Un missatge que s'ha adjuntat al bitcoin: URI que s'emmagatzemarà amb la transacció per a la vostra referència. Nota: el missatge no s'enviarà a través de la xarxa Bitcoin. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Un missatge que s'ha adjuntat al bitcoin: URI que s'emmagatzemarà amb la transacció per a la vostra referència. Nota: el missatge no s'enviarà a través de la xarxa NYC3. Pay To: @@ -1862,7 +1862,7 @@ The NYC3 address to sign the message with - L'adreça Bitcoin amb què signar el missatge + L'adreça NYC3 amb què signar el missatge Choose previously used address @@ -1894,7 +1894,7 @@ Sign the message to prove you own this NYC3 address - Signa el missatge per provar que ets propietari d'esta adreça Bitcoin + Signa el missatge per provar que ets propietari d'esta adreça NYC3 Sign &Message @@ -1918,11 +1918,11 @@ The NYC3 address the message was signed with - L'adreça Bitcoin amb què va ser signat el missatge + L'adreça NYC3 amb què va ser signat el missatge Verify the message to ensure it was signed with the specified NYC3 address - Verificar el missatge per assegurar-se que ha estat signat amb una adreça Bitcoin específica + Verificar el missatge per assegurar-se que ha estat signat amb una adreça NYC3 específica Verify &Message diff --git a/src/qt/locale/nyc3_ca_ES.ts b/src/qt/locale/nyc3_ca_ES.ts index 2a3ba06d1..48a4ad8f7 100644 --- a/src/qt/locale/nyc3_ca_ES.ts +++ b/src/qt/locale/nyc3_ca_ES.ts @@ -66,12 +66,12 @@ Adreces de recepció - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Aquestes són les vostres adreces de Bitcoin per enviar els pagaments. Sempre reviseu l'import i l'adreça del destinatari abans de transferir monedes. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Aquestes són les vostres adreces de NYC3 per enviar els pagaments. Sempre reviseu l'import i l'adreça del destinatari abans de transferir monedes. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Aquestes són les vostres adreces Bitcoin per rebre pagaments. Es recomana utilitzar una adreça nova de recepció per a cada transacció. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Aquestes són les vostres adreces NYC3 per rebre pagaments. Es recomana utilitzar una adreça nova de recepció per a cada transacció. &Copy Address @@ -232,7 +232,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Signa el &missatge... @@ -327,7 +327,7 @@ Send coins to a NYC3 address - Envia monedes a una adreça Bitcoin + Envia monedes a una adreça NYC3 Backup wallet to another location @@ -350,8 +350,8 @@ &Verifica el missatge... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -374,12 +374,12 @@ Encripta les claus privades pertanyents al moneder - Sign messages with your Bitcoin addresses to prove you own them - Signa el missatges amb la seva adreça de Bitcoin per provar que les poseeixes + Sign messages with your NYC3 addresses to prove you own them + Signa el missatges amb la seva adreça de NYC3 per provar que les poseeixes - Verify messages to ensure they were signed with specified Bitcoin addresses - Verifiqueu els missatges per assegurar-vos que han estat signats amb una adreça Bitcoin específica. + Verify messages to ensure they were signed with specified NYC3 addresses + Verifiqueu els missatges per assegurar-vos que han estat signats amb una adreça NYC3 específica. &File @@ -454,8 +454,8 @@ Al dia - Show the %1 help message to get a list with possible Bitcoin command-line options - Mostra el missatge d'ajuda del %1 per obtenir una llista amb les possibles opcions de línia d'ordres de Bitcoin + Show the %1 help message to get a list with possible NYC3 command-line options + Mostra el missatge d'ajuda del %1 per obtenir una llista amb les possibles opcions de línia d'ordres de NYC3 &Window @@ -532,8 +532,8 @@ El moneder està <b>encriptat</b> i actualment <b>bloquejat</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - S'ha produït un error fatal. Bitcoin no pot continuar amb seguretat i finalitzarà. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + S'ha produït un error fatal. NYC3 no pot continuar amb seguretat i finalitzarà. @@ -723,7 +723,7 @@ The entered address "%1" is not a valid NYC3 address. - L'adreça introduïda «%1» no és una adreça de Bitcoin vàlida. + L'adreça introduïda «%1» no és una adreça de NYC3 vàlida. Could not unlock wallet. @@ -799,8 +799,8 @@ Utilitza un directori de dades personalitzat: - Bitcoin - Bitcoin + NYC3 + NYC3 Approximately %1 GB of data will be stored in this directory. @@ -952,16 +952,16 @@ &Gasta el canvi sense confirmar - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Obre el port del client de Bitcoin al router de forma automàtica. Això només funciona quan el router implementa UPnP i l'opció està activada. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Obre el port del client de NYC3 al router de forma automàtica. Això només funciona quan el router implementa UPnP i l'opció està activada. Map port using &UPnP Port obert amb &UPnP - Connect to the Bitcoin network through a SOCKS5 proxy. - Connecta a la xarxa Bitcoin a través d'un proxy SOCKS5. + Connect to the NYC3 network through a SOCKS5 proxy. + Connecta a la xarxa NYC3 a través d'un proxy SOCKS5. &Connect through SOCKS5 proxy (default proxy): @@ -996,8 +996,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Conectar a la red de Bitcoin a través de un proxy SOCKS5 per als serveis ocults de Tor + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Conectar a la red de NYC3 a través de un proxy SOCKS5 per als serveis ocults de Tor &Window @@ -1095,8 +1095,8 @@ Formulari - 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. - La informació mostrada pot no estar al día. El teu moneder es sincronitza automàticament amb la xarxa Bitcoin un cop s'ha establert connexió, però aquest proces no s'ha completat encara. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + La informació mostrada pot no estar al día. El teu moneder es sincronitza automàticament amb la xarxa NYC3 un cop s'ha establert connexió, però aquest proces no s'ha completat encara. Watch-only: @@ -1187,7 +1187,7 @@ URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - L'URI no pot ser analitzat! Això pot ser a causa d'una adreça de Bitcoin no vàlida o per paràmetres URI amb mal format. + L'URI no pot ser analitzat! Això pot ser a causa d'una adreça de NYC3 no vàlida o per paràmetres URI amb mal format. Payment request file handling @@ -1281,7 +1281,7 @@ Enter a NYC3 address (e.g. %1) - Introduïu una adreça de Bitcoin (p. ex. %1) + Introduïu una adreça de NYC3 (p. ex. %1) %1 d @@ -1616,8 +1616,8 @@ &Missatge: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Un missatge opcional que s'adjuntarà a la sol·licitud de pagament, que es mostrarà quan s'obri la sol·licitud. Nota: El missatge no s'enviarà amb el pagament per la xarxa Bitcoin. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Un missatge opcional que s'adjuntarà a la sol·licitud de pagament, que es mostrarà quan s'obri la sol·licitud. Nota: El missatge no s'enviarà amb el pagament per la xarxa NYC3. An optional label to associate with the new receiving address. @@ -1970,7 +1970,7 @@ Warning: Invalid NYC3 address - Avís: adreça Bitcoin no vàlida + Avís: adreça NYC3 no vàlida Warning: Unknown change address @@ -2005,7 +2005,7 @@ The NYC3 address to send the payment to - L'adreça Bitcoin on enviar el pagament + L'adreça NYC3 on enviar el pagament Alt+A @@ -2048,8 +2048,8 @@ Introduïu una etiqueta per a aquesta adreça per afegir-la a la llista d'adreces utilitzades - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Un missatge que s'ha adjuntat al bitcoin: URI que s'emmagatzemarà amb la transacció per a la vostra referència. Nota: el missatge no s'enviarà a través de la xarxa Bitcoin. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Un missatge que s'ha adjuntat al bitcoin: URI que s'emmagatzemarà amb la transacció per a la vostra referència. Nota: el missatge no s'enviarà a través de la xarxa NYC3. Pay To: @@ -2094,7 +2094,7 @@ The NYC3 address to sign the message with - L'adreça Bitcoin amb què signar el missatge + L'adreça NYC3 amb què signar el missatge Choose previously used address @@ -2126,7 +2126,7 @@ Sign the message to prove you own this NYC3 address - Signa el missatge per provar que ets propietari d'aquesta adreça Bitcoin + Signa el missatge per provar que ets propietari d'aquesta adreça NYC3 Sign &Message @@ -2150,11 +2150,11 @@ The NYC3 address the message was signed with - L'adreça Bitcoin amb què va ser signat el missatge + L'adreça NYC3 amb què va ser signat el missatge Verify the message to ensure it was signed with the specified NYC3 address - Verificar el missatge per assegurar-se que ha estat signat amb una adreça Bitcoin específica + Verificar el missatge per assegurar-se que ha estat signat amb una adreça NYC3 específica Verify &Message diff --git a/src/qt/locale/nyc3_cs.ts b/src/qt/locale/nyc3_cs.ts index 7557636ad..76b54147b 100644 --- a/src/qt/locale/nyc3_cs.ts +++ b/src/qt/locale/nyc3_cs.ts @@ -66,11 +66,11 @@ Přijímací adresy - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. Tohle jsou tvé bitcoinové adresy pro posílání plateb. Před odesláním mincí si vždy zkontroluj částku a cílovou adresu. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. Tohle jsou tvé bitcoinové adresy pro příjem plateb. Nezapomeň si pro každou transakci vždy vygenerovat novou adresu. @@ -240,7 +240,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Po&depiš zprávu... @@ -366,8 +366,8 @@ &Ověř zprávu... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -390,11 +390,11 @@ Zašifruj soukromé klíče ve své peněžence - Sign messages with your Bitcoin addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them Podepiš zprávy svými bitcoinovými adresami, čímž prokážeš, že jsi jejich vlastníkem - Verify messages to ensure they were signed with specified Bitcoin addresses + Verify messages to ensure they were signed with specified NYC3 addresses Ověř zprávy, aby ses ujistil, že byly podepsány danými bitcoinovými adresami @@ -434,7 +434,7 @@ Ar&gumenty příkazové řádky - %n active connection(s) to Bitcoin network + %n active connection(s) to NYC3 network %n aktivní spojení do bitcoinové sítě%n aktivní spojení do bitcoinové sítě%n aktivních spojení do bitcoinové sítě%n aktivních spojení do bitcoinové sítě @@ -502,8 +502,8 @@ Zavřít peněženku - Show the %1 help message to get a list with possible Bitcoin command-line options - Seznam argumentů Bitcoinu pro příkazovou řádku získáš v nápovědě %1 + Show the %1 help message to get a list with possible NYC3 command-line options + Seznam argumentů NYC3u pro příkazovou řádku získáš v nápovědě %1 default wallet @@ -614,8 +614,8 @@ Peněženka je <b>zašifrovaná</b> a momentálně <b>zamčená</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Stala se fatální chyba. Bitcoin nemůže bezpečně pokračovat v činnosti, a proto skončí. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Stala se fatální chyba. NYC3 nemůže bezpečně pokračovat v činnosti, a proto skončí. @@ -901,8 +901,8 @@ Použij tento adresář pro data: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -913,7 +913,7 @@ Bude proto potřebovat do tohoto adresáře uložit přibližně %1 GB dat. - %1 will download and store a copy of the Bitcoin block chain. + %1 will download and store a copy of the NYC3 block chain. %1 bude stahovat kopii blockchainu. @@ -1130,7 +1130,7 @@ &Utrácet i ještě nepotvrzené drobné - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. Automaticky otevře potřebný port na routeru. Tohle funguje jen za předpokladu, že tvůj router podporuje UPnP a že je UPnP povolené. @@ -1146,7 +1146,7 @@ Přijí&mat příchozí spojení - Connect to the Bitcoin network through a SOCKS5 proxy. + Connect to the NYC3 network through a SOCKS5 proxy. Připojí se do bitcoinové sítě přes SOCKS5 proxy. @@ -1182,7 +1182,7 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. Připojí se do bitcoinové sítě přes SOCKS5 proxy vyhrazenou pro skryté služby v Tor síti. @@ -1293,7 +1293,7 @@ Formulář - 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. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. Zobrazené informace nemusí být aktuální. Tvá peněženka se automaticky sesynchronizuje s bitcoinovou sítí, jakmile se s ní spojí. Zatím ale ještě není synchronizace dokončena. @@ -1954,7 +1954,7 @@ &Zpráva: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. Volitelná zpráva, která se připojí k platebnímu požadavku a která se zobrazí, když se požadavek otevře. Poznámka: tahle zpráva se neposílá s platbou po bitcoinové síti. @@ -2427,7 +2427,7 @@ Poznámka: Jelikož je poplatek počítaný za bajt, poplatek o hodnotě "100 sa The NYC3 address to send the payment to - Bitcoinová adresa příjemce + NYC3ová adresa příjemce Alt+A @@ -2474,7 +2474,7 @@ Poznámka: Jelikož je poplatek počítaný za bajt, poplatek o hodnotě "100 sa Zadej označení této adresy; obojí se ti pak uloží do adresáře - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. Zpráva, která byla připojena k bitcoin: URI a která se ti pro přehled uloží k transakci. Poznámka: Tahle zpráva se neposílá s platbou po bitcoinové síti. @@ -2524,7 +2524,7 @@ Poznámka: Jelikož je poplatek počítaný za bajt, poplatek o hodnotě "100 sa The NYC3 address to sign the message with - Bitcoinová adresa, kterou se zpráva podepíše + NYC3ová adresa, kterou se zpráva podepíše Choose previously used address @@ -2580,7 +2580,7 @@ Poznámka: Jelikož je poplatek počítaný za bajt, poplatek o hodnotě "100 sa The NYC3 address the message was signed with - Bitcoinová adresa, kterou je zpráva podepsána + NYC3ová adresa, kterou je zpráva podepsána Verify the message to ensure it was signed with the specified NYC3 address diff --git a/src/qt/locale/nyc3_cy.ts b/src/qt/locale/nyc3_cy.ts index a5023c7e1..7b31aabba 100644 --- a/src/qt/locale/nyc3_cy.ts +++ b/src/qt/locale/nyc3_cy.ts @@ -62,12 +62,12 @@ Derbyn cyfeiriadau - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Rhain ydi eich cyfeiriadau Bitcoin ar gyfer gyrru taliadau. Gwnewch yn sicr o'r swm a'r cyfeiriad derbyn cyn gyrru arian. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Rhain ydi eich cyfeiriadau NYC3 ar gyfer gyrru taliadau. Gwnewch yn sicr o'r swm a'r cyfeiriad derbyn cyn gyrru arian. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Dyma eich cyfeiriadau Bitcoin ar gyfer derbyn taliadau. Argymhellwn ddefnyddio cyfeiriad derbyn newydd ar gyfer bob trafodyn. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Dyma eich cyfeiriadau NYC3 ar gyfer derbyn taliadau. Argymhellwn ddefnyddio cyfeiriad derbyn newydd ar gyfer bob trafodyn. &Copy Address @@ -224,7 +224,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Arwyddo &neges... @@ -319,7 +319,7 @@ Send coins to a NYC3 address - Anfon arian i gyfeiriad Bitcoin + Anfon arian i gyfeiriad NYC3 Backup wallet to another location @@ -338,8 +338,8 @@ &Gwirio neges... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -362,12 +362,12 @@ Amgryptio'r allweddi preifat sy'n perthyn i'ch waled - Sign messages with your Bitcoin addresses to prove you own them - Arwyddo negeseuon gyda eich cyfeiriadau Bitcoin i brofi mae chi sy'n berchen arnynt + Sign messages with your NYC3 addresses to prove you own them + Arwyddo negeseuon gyda eich cyfeiriadau NYC3 i brofi mae chi sy'n berchen arnynt - Verify messages to ensure they were signed with specified Bitcoin addresses - Gwirio negeseuon i sicrhau eu bod wedi eu harwyddo gyda cyfeiriadau Bitcoin penodol + Verify messages to ensure they were signed with specified NYC3 addresses + Gwirio negeseuon i sicrhau eu bod wedi eu harwyddo gyda cyfeiriadau NYC3 penodol &File @@ -399,7 +399,7 @@ Open a bitcoin: URI or payment request - Agor Bitcoin: URI neu ofyn taliad + Agor NYC3: URI neu ofyn taliad &Command-line options @@ -508,8 +508,8 @@ Mae'r waled <b>wedi'i amgryptio</b> ac <b>ar glo</b> ar hyn o bryd - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Mae gwall angheuol wedi digwydd. Ni all Bitcoin barhau'n ddiogel ac mae'n cau lawr. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Mae gwall angheuol wedi digwydd. Ni all NYC3 barhau'n ddiogel ac mae'n cau lawr. @@ -615,8 +615,8 @@ Croeso - Bitcoin - Bitcoin + NYC3 + NYC3 Error @@ -1026,7 +1026,7 @@ bitcoin-core NYC3 - Craidd Bitcoin + Craidd NYC3 Information diff --git a/src/qt/locale/nyc3_da.ts b/src/qt/locale/nyc3_da.ts index 2e90b0c59..0b6372857 100644 --- a/src/qt/locale/nyc3_da.ts +++ b/src/qt/locale/nyc3_da.ts @@ -66,12 +66,12 @@ Modtagelsesadresser - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Disse er dine Bitcoin-adresser til afsendelse af betalinger. Tjek altid beløb og modtagelsesadresse, inden du sender bitcoins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Disse er dine NYC3-adresser til afsendelse af betalinger. Tjek altid beløb og modtagelsesadresse, inden du sender bitcoins. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Dette er dine Bitcoin-adresser til modtagelse af betalinger. Det anbefales at bruge en ny modtagelsesadresse for hver transaktion. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Dette er dine NYC3-adresser til modtagelse af betalinger. Det anbefales at bruge en ny modtagelsesadresse for hver transaktion. &Copy Address @@ -240,7 +240,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Signér &besked… @@ -343,7 +343,7 @@ Send coins to a NYC3 address - Send bitcoins til en Bitcoin-adresse + Send bitcoins til en NYC3-adresse Backup wallet to another location @@ -366,8 +366,8 @@ &Verificér besked… - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -390,12 +390,12 @@ Kryptér de private nøgler, der hører til din tegnebog - Sign messages with your Bitcoin addresses to prove you own them - Signér beskeder med dine Bitcoin-adresser for at bevise, at de tilhører dig + Sign messages with your NYC3 addresses to prove you own them + Signér beskeder med dine NYC3-adresser for at bevise, at de tilhører dig - Verify messages to ensure they were signed with specified Bitcoin addresses - Verificér beskeder for at sikre, at de er signeret med de angivne Bitcoin-adresser + Verify messages to ensure they were signed with specified NYC3 addresses + Verificér beskeder for at sikre, at de er signeret med de angivne NYC3-adresser &File @@ -434,8 +434,8 @@ Tilvalg for &kommandolinje - %n active connection(s) to Bitcoin network - %n aktiv forbindelse til Bitcoin-netværket%n aktive forbindelser til Bitcoin-netværket + %n active connection(s) to NYC3 network + %n aktiv forbindelse til NYC3-netværket%n aktive forbindelser til NYC3-netværket Indexing blocks on disk... @@ -486,8 +486,8 @@ &Modtageradresser - Show the %1 help message to get a list with possible Bitcoin command-line options - Vis %1 hjælpebesked for at få en liste over mulige tilvalg for Bitcoin kommandolinje + Show the %1 help message to get a list with possible NYC3 command-line options + Vis %1 hjælpebesked for at få en liste over mulige tilvalg for NYC3 kommandolinje default wallet @@ -590,8 +590,8 @@ Tegnebog er <b>krypteret</b> og i øjeblikket <b>låst</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Der opstod en fatal fejl. Bitcoin kan ikke længere fortsætte sikkert og vil afslutte. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Der opstod en fatal fejl. NYC3 kan ikke længere fortsætte sikkert og vil afslutte. @@ -781,7 +781,7 @@ The entered address "%1" is not a valid NYC3 address. - Den indtastede adresse “%1” er ikke en gyldig Bitcoin-adresse. + Den indtastede adresse “%1” er ikke en gyldig NYC3-adresse. Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -877,8 +877,8 @@ Brug tilpasset mappe for data: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -889,8 +889,8 @@ Omtrent %1 GB data vil blive gemt i denne mappe. - %1 will download and store a copy of the Bitcoin block chain. - %1 vil downloade og gemme en kopi af Bitcoin-blokkæden. + %1 will download and store a copy of the NYC3 block chain. + %1 vil downloade og gemme en kopi af NYC3-blokkæden. The wallet will also be stored in this directory. @@ -1102,8 +1102,8 @@ &Brug ubekræftede byttepenge - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Åbn automatisk Bitcoin-klientens port på routeren. Dette virker kun, når din router understøtter UPnP, og UPnP er aktiveret. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Åbn automatisk NYC3-klientens port på routeren. Dette virker kun, når din router understøtter UPnP, og UPnP er aktiveret. Map port using &UPnP @@ -1118,8 +1118,8 @@ Tillad &indkommende forbindelser - Connect to the Bitcoin network through a SOCKS5 proxy. - Forbind til Bitcoin-netværket gennem en SOCKS5-proxy. + Connect to the NYC3 network through a SOCKS5 proxy. + Forbind til NYC3-netværket gennem en SOCKS5-proxy. &Connect through SOCKS5 proxy (default proxy): @@ -1154,8 +1154,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Forbind til Bitcoin-netværket gennem en separat SOCKS5-proxy for Tors skjulte tjenester. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Forbind til NYC3-netværket gennem en separat SOCKS5-proxy for Tors skjulte tjenester. &Window @@ -1265,8 +1265,8 @@ Formular - 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. - Den viste information kan være forældet. Din tegnebog synkroniserer automatisk med Bitcoin-netværket, når en forbindelse etableres, men denne proces er ikke gennemført endnu. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Den viste information kan være forældet. Din tegnebog synkroniserer automatisk med NYC3-netværket, når en forbindelse etableres, men denne proces er ikke gennemført endnu. Watch-only: @@ -1369,7 +1369,7 @@ URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - URI kan ikke tolkes! Dette kan skyldes en ugyldig Bitcoin-adresse eller forkert udformede URL-parametre. + URI kan ikke tolkes! Dette kan skyldes en ugyldig NYC3-adresse eller forkert udformede URL-parametre. Payment request file handling @@ -1471,7 +1471,7 @@ Enter a NYC3 address (e.g. %1) - Indtast en Bitcoin-adresse (fx %1) + Indtast en NYC3-adresse (fx %1) %1 d @@ -1926,8 +1926,8 @@ &Besked: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - En valgfri besked, der føjes til betalingsanmodningen, og som vil vises, når anmodningen åbnes. Bemærk: Beskeden vil ikke sendes sammen med betalingen over Bitcoin-netværket. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + En valgfri besked, der føjes til betalingsanmodningen, og som vil vises, når anmodningen åbnes. Bemærk: Beskeden vil ikke sendes sammen med betalingen over NYC3-netværket. An optional label to associate with the new receiving address. @@ -2356,7 +2356,7 @@ Note: Siden gebyret er kalkuleret på en per-byte basis, et gebyr på "100 satos Warning: Invalid NYC3 address - Advarsel: Ugyldig Bitcoin-adresse + Advarsel: Ugyldig NYC3-adresse Warning: Unknown change address @@ -2399,7 +2399,7 @@ Note: Siden gebyret er kalkuleret på en per-byte basis, et gebyr på "100 satos The NYC3 address to send the payment to - Bitcoin-adresse, som betalingen skal sendes til + NYC3-adresse, som betalingen skal sendes til Alt+A @@ -2446,8 +2446,8 @@ Note: Siden gebyret er kalkuleret på en per-byte basis, et gebyr på "100 satos Indtast et mærkat for denne adresse for at føje den til listen over brugte adresser - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - En besked, som blev føjet til “bitcon:”-URI'en, som vil gemmes med transaktionen til din reference. Bemærk: Denne besked vil ikke blive sendt over Bitcoin-netværket. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + En besked, som blev føjet til “bitcon:”-URI'en, som vil gemmes med transaktionen til din reference. Bemærk: Denne besked vil ikke blive sendt over NYC3-netværket. Pay To: @@ -2496,7 +2496,7 @@ Note: Siden gebyret er kalkuleret på en per-byte basis, et gebyr på "100 satos The NYC3 address to sign the message with - Bitcoin-adresse, som beskeden skal signeres med + NYC3-adresse, som beskeden skal signeres med Choose previously used address @@ -2528,7 +2528,7 @@ Note: Siden gebyret er kalkuleret på en per-byte basis, et gebyr på "100 satos Sign the message to prove you own this NYC3 address - Signér denne besked for at bevise, at Bitcoin-adressen tilhører dig + Signér denne besked for at bevise, at NYC3-adressen tilhører dig Sign &Message @@ -2552,11 +2552,11 @@ Note: Siden gebyret er kalkuleret på en per-byte basis, et gebyr på "100 satos The NYC3 address the message was signed with - Bitcoin-adressen, som beskeden blev signeret med + NYC3-adressen, som beskeden blev signeret med Verify the message to ensure it was signed with the specified NYC3 address - Verificér beskeden for at sikre, at den er signeret med den angivne Bitcoin-adresse + Verificér beskeden for at sikre, at den er signeret med den angivne NYC3-adresse Verify &Message diff --git a/src/qt/locale/nyc3_de.ts b/src/qt/locale/nyc3_de.ts index 527d320bd..bb50dd7b9 100644 --- a/src/qt/locale/nyc3_de.ts +++ b/src/qt/locale/nyc3_de.ts @@ -47,11 +47,11 @@ Choose the address to send coins to - Wählen Sie die Adresse aus, an die Sie Bitcoins senden möchten + Wählen Sie die Adresse aus, an die Sie NYC3s senden möchten Choose the address to receive coins with - Wählen Sie die Adresse aus, mit der Sie Bitcoins empfangen wollen + Wählen Sie die Adresse aus, mit der Sie NYC3s empfangen wollen C&hoose @@ -66,12 +66,12 @@ Empfängeradressen - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Dies sind Ihre Bitcoin-Adressen zum Tätigen von Überweisungen. Bitte prüfen Sie den Betrag und die Adresse des Empfängers, bevor Sie Bitcoins überweisen. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Dies sind Ihre NYC3-Adressen zum Tätigen von Überweisungen. Bitte prüfen Sie den Betrag und die Adresse des Empfängers, bevor Sie NYC3s überweisen. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Dies sind Ihre Bitcoin-Adressen zum Empfangen von Zahlungen. Es wird empfohlen, für jede Transaktion eine neue Empfangsadresse zu verwenden. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Dies sind Ihre NYC3-Adressen zum Empfangen von Zahlungen. Es wird empfohlen, für jede Transaktion eine neue Empfangsadresse zu verwenden. &Copy Address @@ -177,7 +177,7 @@ Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! - Warnung: Wenn Sie Ihre Brieftasche verschlüsseln und Ihre Passphrase verlieren, werden Sie <b>alle Ihre Bitcoins verlieren</b>! + Warnung: Wenn Sie Ihre Brieftasche verschlüsseln und Ihre Passphrase verlieren, werden Sie <b>alle Ihre NYC3s verlieren</b>! Are you sure you wish to encrypt your wallet? @@ -189,7 +189,7 @@ Your wallet is now encrypted. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer. - Ihre Brieftasche ist jetzt verschlüsselt. Denken Sie daran, dass auch eine Verschlüsselung ihre Bitcoins nicht vollkommen vor Diebstahl schützen kann, sollte ihr PC mit Malware infiziert sein. + Ihre Brieftasche ist jetzt verschlüsselt. Denken Sie daran, dass auch eine Verschlüsselung ihre NYC3s nicht vollkommen vor Diebstahl schützen kann, sollte ihr PC mit Malware infiziert sein. 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. @@ -240,7 +240,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Nachricht s&ignieren... @@ -343,7 +343,7 @@ Send coins to a NYC3 address - Bitcoins an eine Bitcoin-Adresse überweisen + NYC3s an eine NYC3-Adresse überweisen Backup wallet to another location @@ -366,8 +366,8 @@ Nachricht &verifizieren... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -390,12 +390,12 @@ Verschlüsselt die zu Ihrer Wallet gehörenden privaten Schlüssel - Sign messages with your Bitcoin addresses to prove you own them - Nachrichten signieren, um den Besitz Ihrer Bitcoin-Adressen zu beweisen + Sign messages with your NYC3 addresses to prove you own them + Nachrichten signieren, um den Besitz Ihrer NYC3-Adressen zu beweisen - Verify messages to ensure they were signed with specified Bitcoin addresses - Nachrichten verifizieren, um sicherzustellen, dass diese mit den angegebenen Bitcoin-Adressen signiert wurden + Verify messages to ensure they were signed with specified NYC3 addresses + Nachrichten verifizieren, um sicherzustellen, dass diese mit den angegebenen NYC3-Adressen signiert wurden &File @@ -434,8 +434,8 @@ &Kommandozeilenoptionen - %n active connection(s) to Bitcoin network - %n aktive Verbindung zum Bitcoin-Netzwerk%n aktive Verbindungen zum Bitcoin-Netzwerk + %n active connection(s) to NYC3 network + %n aktive Verbindung zum NYC3-Netzwerk%n aktive Verbindungen zum NYC3-Netzwerk Indexing blocks on disk... @@ -502,7 +502,7 @@ Wallet schließen - Show the %1 help message to get a list with possible Bitcoin command-line options + Show the %1 help message to get a list with possible NYC3 command-line options Zeige den "%1"-Hilfetext, um eine Liste mit möglichen Kommandozeilenoptionen zu erhalten @@ -614,8 +614,8 @@ Wallet ist <b>verschlüsselt</b> und aktuell <b>gesperrt</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Ein schwerer Fehler ist aufgetreten. Bitcoin kann nicht stabil weiter ausgeführt werden und wird beendet. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Ein schwerer Fehler ist aufgetreten. NYC3 kann nicht stabil weiter ausgeführt werden und wird beendet. @@ -805,7 +805,7 @@ The entered address "%1" is not a valid NYC3 address. - Die eingegebene Adresse "%1" ist keine gültige Bitcoin-Adresse. + Die eingegebene Adresse "%1" ist keine gültige NYC3-Adresse. Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -901,8 +901,8 @@ Ein benutzerdefiniertes Datenverzeichnis verwenden: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -913,8 +913,8 @@ Etwa %1 GB Daten werden in diesem Verzeichnis gespeichert. - %1 will download and store a copy of the Bitcoin block chain. - %1 wird heruntergeladen und als eine Kopie von dem Bitcoin Blockchain gespeichert. + %1 will download and store a copy of the NYC3 block chain. + %1 wird heruntergeladen und als eine Kopie von dem NYC3 Blockchain gespeichert. The wallet will also be stored in this directory. @@ -945,11 +945,11 @@ Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below. - Neueste Transaktionen werden eventuell noch nicht angezeigt, daher könnte Ihr Kontostand veraltet sein. Er wird korrigiert, sobald Ihr Wallet die Synchronisation mit dem Bitcoin-Netzwerk erfolgreich abgeschlossen hat. Details dazu finden sich weiter unten. + Neueste Transaktionen werden eventuell noch nicht angezeigt, daher könnte Ihr Kontostand veraltet sein. Er wird korrigiert, sobald Ihr Wallet die Synchronisation mit dem NYC3-Netzwerk erfolgreich abgeschlossen hat. Details dazu finden sich weiter unten. Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network. - Versuche, Bitcoins aus noch nicht angezeigten Transaktionen auszugeben, werden vom Netzwerk nicht akzeptiert. + Versuche, NYC3s aus noch nicht angezeigten Transaktionen auszugeben, werden vom Netzwerk nicht akzeptiert. Number of blocks left @@ -1126,8 +1126,8 @@ &Unbestätigtes Wechselgeld darf ausgegeben werden - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Automatisch den Bitcoin-Clientport auf dem Router öffnen. Dies funktioniert nur, wenn Ihr Router UPnP unterstützt und dies aktiviert ist. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Automatisch den NYC3-Clientport auf dem Router öffnen. Dies funktioniert nur, wenn Ihr Router UPnP unterstützt und dies aktiviert ist. Map port using &UPnP @@ -1142,8 +1142,8 @@ Erlaube eingehende Verbindungen - Connect to the Bitcoin network through a SOCKS5 proxy. - Über einen SOCKS5-Proxy mit dem Bitcoin-Netzwerk verbinden. + Connect to the NYC3 network through a SOCKS5 proxy. + Über einen SOCKS5-Proxy mit dem NYC3-Netzwerk verbinden. &Connect through SOCKS5 proxy (default proxy): @@ -1178,8 +1178,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Über einen separaten SOCKS5 Proxy für Tor Services mit dem Bitcoin Netzwerk verbinden. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Über einen separaten SOCKS5 Proxy für Tor Services mit dem NYC3 Netzwerk verbinden. &Window @@ -1215,7 +1215,7 @@ Choose the default subdivision unit to show in the interface and when sending coins. - Wählen Sie die standardmäßige Untereinheit, die in der Benutzeroberfläche und beim Überweisen von Bitcoins angezeigt werden soll. + Wählen Sie die standardmäßige Untereinheit, die in der Benutzeroberfläche und beim Überweisen von NYC3s angezeigt werden soll. Whether to show coin control features or not. @@ -1289,8 +1289,8 @@ Formular - 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. - Die angezeigten Informationen sind möglicherweise nicht mehr aktuell. Ihre Wallet wird automatisch synchronisiert, nachdem eine Verbindung zum Bitcoin-Netzwerk hergestellt wurde. Dieser Prozess ist jedoch derzeit noch nicht abgeschlossen. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Die angezeigten Informationen sind möglicherweise nicht mehr aktuell. Ihre Wallet wird automatisch synchronisiert, nachdem eine Verbindung zum NYC3-Netzwerk hergestellt wurde. Dieser Prozess ist jedoch derzeit noch nicht abgeschlossen. Watch-only: @@ -1365,7 +1365,7 @@ Cannot start bitcoin: click-to-pay handler - Kann Bitcoin nicht starten: Klicken-zum-Bezahlen-Handler + Kann NYC3 nicht starten: Klicken-zum-Bezahlen-Handler URI handling @@ -1393,7 +1393,7 @@ URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - URI kann nicht analysiert werden! Dies kann durch eine ungültige Bitcoin-Adresse oder fehlerhafte URI-Parameter verursacht werden. + URI kann nicht analysiert werden! Dies kann durch eine ungültige NYC3-Adresse oder fehlerhafte URI-Parameter verursacht werden. Payment request file handling @@ -1495,7 +1495,7 @@ Enter a NYC3 address (e.g. %1) - Bitcoin-Adresse eingeben (z.B. %1) + NYC3-Adresse eingeben (z.B. %1) %1 d @@ -1950,8 +1950,8 @@ &Nachricht: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Eine optionale Nachricht, die an die Zahlungsanforderung angehängt wird. Sie wird angezeigt, wenn die Anforderung geöffnet wird. Hinweis: Diese Nachricht wird nicht mit der Zahlung über das Bitcoin-Netzwerk gesendet. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Eine optionale Nachricht, die an die Zahlungsanforderung angehängt wird. Sie wird angezeigt, wenn die Anforderung geöffnet wird. Hinweis: Diese Nachricht wird nicht mit der Zahlung über das NYC3-Netzwerk gesendet. An optional label to associate with the new receiving address. @@ -2116,7 +2116,7 @@ SendCoinsDialog Send Coins - Bitcoins überweisen + NYC3s überweisen Coin Control Features @@ -2232,7 +2232,7 @@ Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktio When there is less transaction volume than space in the blocks, miners as well as relaying nodes may enforce a minimum fee. Paying only this minimum fee is just fine, but be aware that this can result in a never confirming transaction once there is more demand for bitcoin transactions than the network can process. - Nur die minimale Gebühr zu bezahlen ist so lange in Ordnung, wie weniger Transaktionsvolumen als Platz in den Blöcken vorhanden ist. Aber Vorsicht, diese Option kann dazu führen, dass Transaktionen nicht bestätigt werden, wenn mehr Bedarf an Bitcoin-Transaktionen besteht als das Netzwerk verarbeiten kann. + Nur die minimale Gebühr zu bezahlen ist so lange in Ordnung, wie weniger Transaktionsvolumen als Platz in den Blöcken vorhanden ist. Aber Vorsicht, diese Option kann dazu führen, dass Transaktionen nicht bestätigt werden, wenn mehr Bedarf an NYC3-Transaktionen besteht als das Netzwerk verarbeiten kann. A too low fee might result in a never confirming transaction (read the tooltip) @@ -2380,7 +2380,7 @@ Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktio Warning: Invalid NYC3 address - Warnung: Ungültige Bitcoin-Adresse + Warnung: Ungültige NYC3-Adresse Warning: Unknown change address @@ -2443,7 +2443,7 @@ Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktio The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally. - Die Gebühr wird vom zu überweisenden Betrag abgezogen. Der Empfänger wird also weniger Bitcoins erhalten, als Sie im Betrags-Feld eingegeben haben. Falls mehrere Empfänger ausgewählt wurden, wird die Gebühr gleichmäßig verteilt. + Die Gebühr wird vom zu überweisenden Betrag abgezogen. Der Empfänger wird also weniger NYC3s erhalten, als Sie im Betrags-Feld eingegeben haben. Falls mehrere Empfänger ausgewählt wurden, wird die Gebühr gleichmäßig verteilt. S&ubtract fee from amount @@ -2470,8 +2470,8 @@ Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktio Adressbezeichnung eingeben, die dann zusammen mit der Adresse der Liste bereits verwendeter Adressen hinzugefügt wird. - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Eine an die "bitcoin:"-URI angefügte Nachricht, die zusammen mit der Transaktion gespeichert wird. Hinweis: Diese Nachricht wird nicht über das Bitcoin-Netzwerk gesendet. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Eine an die "bitcoin:"-URI angefügte Nachricht, die zusammen mit der Transaktion gespeichert wird. Hinweis: Diese Nachricht wird nicht über das NYC3-Netzwerk gesendet. Pay To: @@ -2516,11 +2516,11 @@ Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktio You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to. - Sie können Nachrichten/Vereinbarungen mit Hilfe Ihrer Adressen signieren, um zu beweisen, dass Sie Bitcoins empfangen können, die an diese Adressen überwiesen werden. Seien Sie vorsichtig und signieren Sie nichts Vages oder Willkürliches, um Ihre Indentität vor Phishingangriffen zu schützen. Signieren Sie nur vollständig-detaillierte Aussagen, mit denen Sie auch einverstanden sind. + Sie können Nachrichten/Vereinbarungen mit Hilfe Ihrer Adressen signieren, um zu beweisen, dass Sie NYC3s empfangen können, die an diese Adressen überwiesen werden. Seien Sie vorsichtig und signieren Sie nichts Vages oder Willkürliches, um Ihre Indentität vor Phishingangriffen zu schützen. Signieren Sie nur vollständig-detaillierte Aussagen, mit denen Sie auch einverstanden sind. The NYC3 address to sign the message with - Die Bitcoin-Adresse mit der die Nachricht signiert wird + Die NYC3-Adresse mit der die Nachricht signiert wird Choose previously used address @@ -2552,7 +2552,7 @@ Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktio Sign the message to prove you own this NYC3 address - Die Nachricht signieren, um den Besitz dieser Bitcoin-Adresse zu beweisen + Die Nachricht signieren, um den Besitz dieser NYC3-Adresse zu beweisen Sign &Message @@ -2576,11 +2576,11 @@ Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktio The NYC3 address the message was signed with - Die Bitcoin-Adresse mit der die Nachricht signiert wurde + Die NYC3-Adresse mit der die Nachricht signiert wurde Verify the message to ensure it was signed with the specified NYC3 address - Die Nachricht verifizieren, um sicherzustellen, dass diese mit der angegebenen Bitcoin-Adresse signiert wurde + Die Nachricht verifizieren, um sicherzustellen, dass diese mit der angegebenen NYC3-Adresse signiert wurde Verify &Message @@ -2797,7 +2797,7 @@ Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktio Generated coins must mature %1 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. - Erzeugte Bitcoins müssen %1 Blöcke lang reifen, bevor sie ausgegeben werden können. Als Sie diesen Block erzeugten, wurde er an das Netzwerk übertragen, um ihn der Blockkette hinzuzufügen. Falls dies fehlschlägt wird der Status in "nicht angenommen" geändert und Sie werden keine Bitcoins gutgeschrieben bekommen. Das kann gelegentlich passieren, wenn ein anderer Knoten einen Block fast zeitgleich erzeugt. + Erzeugte NYC3s müssen %1 Blöcke lang reifen, bevor sie ausgegeben werden können. Als Sie diesen Block erzeugten, wurde er an das Netzwerk übertragen, um ihn der Blockkette hinzuzufügen. Falls dies fehlschlägt wird der Status in "nicht angenommen" geändert und Sie werden keine NYC3s gutgeschrieben bekommen. Das kann gelegentlich passieren, wenn ein anderer Knoten einen Block fast zeitgleich erzeugt. Debug information @@ -3134,7 +3134,7 @@ Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktio WalletModel Send Coins - Bitcoins überweisen + NYC3s überweisen Fee bump error diff --git a/src/qt/locale/nyc3_el.ts b/src/qt/locale/nyc3_el.ts index 0aff98c0f..8048fb508 100644 --- a/src/qt/locale/nyc3_el.ts +++ b/src/qt/locale/nyc3_el.ts @@ -32,7 +32,7 @@ BanTableModel - BitcoinGUI + NYC3GUI Quit application Κλείσιμο εφαρμογής diff --git a/src/qt/locale/nyc3_el_GR.ts b/src/qt/locale/nyc3_el_GR.ts index 4e18dd15e..5bb19e212 100644 --- a/src/qt/locale/nyc3_el_GR.ts +++ b/src/qt/locale/nyc3_el_GR.ts @@ -66,12 +66,12 @@ Διευθύνσεις λήψης - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Αυτές είναι οι Bitcoin διευθύνσεις σας για να στέλνετε πληρωμές. Να ελέγχετε πάντα το ποσό, καθώς και τη διεύθυνση παραλήπτη πριν στείλετε νομίσματα. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Αυτές είναι οι NYC3 διευθύνσεις σας για να στέλνετε πληρωμές. Να ελέγχετε πάντα το ποσό, καθώς και τη διεύθυνση παραλήπτη πριν στείλετε νομίσματα. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Αυτές είναι οι Bitcoin διευθύνσεις σας για να λαμβάνετε πληρωμές. Προτείνετε να χρησιμοποιείτε μια νέα διεύθυνση παραλήπτη για κάθε συναλλαγή. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Αυτές είναι οι NYC3 διευθύνσεις σας για να λαμβάνετε πληρωμές. Προτείνετε να χρησιμοποιείτε μια νέα διεύθυνση παραλήπτη για κάθε συναλλαγή. &Copy Address @@ -236,7 +236,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Υπογραφή &μηνύματος... @@ -358,8 +358,8 @@ &Επιβεβαίωση μηνύματος - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -382,12 +382,12 @@ Κρυπτογραφήστε τα ιδιωτικά κλειδιά που ανήκουν στο πορτοφόλι σας - Sign messages with your Bitcoin addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them Υπογράψτε ένα μήνυμα για να βεβαιώσετε πως είστε ο κάτοχος αυτής της διεύθυνσης - Verify messages to ensure they were signed with specified Bitcoin addresses - Υπογράψτε ένα μήνυμα για ν' αποδείξετε πως ανήκει μια συγκεκριμένη διεύθυνση Bitcoin + Verify messages to ensure they were signed with specified NYC3 addresses + Υπογράψτε ένα μήνυμα για ν' αποδείξετε πως ανήκει μια συγκεκριμένη διεύθυνση NYC3 &File @@ -677,7 +677,7 @@ The entered address "%1" is not a valid NYC3 address. - Η διεύθυνση "%1" δεν είναι έγκυρη Bitcoin διεύθυνση. + Η διεύθυνση "%1" δεν είναι έγκυρη NYC3 διεύθυνση. Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -753,8 +753,8 @@ Προσαρμογή του φακέλου δεδομένων: - Bitcoin - Bitcoin + NYC3 + NYC3 Error: Specified data directory "%1" cannot be created. @@ -886,16 +886,16 @@ &Ξόδεμα μη επικυρωμένων ρέστων - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Αυτόματο άνοιγμα των θυρών Bitcoin στον δρομολογητή. Λειτουργεί μόνο αν ο δρομολογητής σας υποστηρίζει τη λειτουργία UPnP. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Αυτόματο άνοιγμα των θυρών NYC3 στον δρομολογητή. Λειτουργεί μόνο αν ο δρομολογητής σας υποστηρίζει τη λειτουργία UPnP. Map port using &UPnP Απόδοση θυρών με χρήστη &UPnP - Connect to the Bitcoin network through a SOCKS5 proxy. - Σύνδεση στο δίκτυο Bitcoin μέσω διαμεσολαβητή SOCKS5 (π.χ. για σύνδεση μέσω Tor) + Connect to the NYC3 network through a SOCKS5 proxy. + Σύνδεση στο δίκτυο NYC3 μέσω διαμεσολαβητή SOCKS5 (π.χ. για σύνδεση μέσω Tor) &Connect through SOCKS5 proxy (default proxy): @@ -1005,8 +1005,8 @@ Φόρμα - 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. - Οι πληροφορίες που εμφανίζονται μπορεί να είναι ξεπερασμένες. Το πορτοφόλι σας συγχρονίζεται αυτόματα με το δίκτυο Bitcoin μετά από μια σύνδεση, αλλά αυτή η διαδικασία δεν έχει ακόμη ολοκληρωθεί. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Οι πληροφορίες που εμφανίζονται μπορεί να είναι ξεπερασμένες. Το πορτοφόλι σας συγχρονίζεται αυτόματα με το δίκτυο NYC3 μετά από μια σύνδεση, αλλά αυτή η διαδικασία δεν έχει ακόμη ολοκληρωθεί. Watch-only: @@ -1115,7 +1115,7 @@ Enter a NYC3 address (e.g. %1) - Εισάγετε μια διεύθυνση Bitcoin (π.χ. %1) + Εισάγετε μια διεύθυνση NYC3 (π.χ. %1) %1 d @@ -1639,7 +1639,7 @@ The NYC3 address to send the payment to - Η διεύθυνση Bitcoin που θα σταλεί η πληρωμή + Η διεύθυνση NYC3 που θα σταλεί η πληρωμή Alt+A @@ -1700,7 +1700,7 @@ The NYC3 address to sign the message with - Διεύθυνση Bitcoin που θα σταλεί το μήνυμα + Διεύθυνση NYC3 που θα σταλεί το μήνυμα Choose previously used address @@ -1732,7 +1732,7 @@ Sign the message to prove you own this NYC3 address - Υπογράψτε το μήνυμα για να αποδείξετε πως σας ανήκει η συγκεκριμένη διεύθυνση Bitcoin + Υπογράψτε το μήνυμα για να αποδείξετε πως σας ανήκει η συγκεκριμένη διεύθυνση NYC3 Sign &Message @@ -1752,11 +1752,11 @@ The NYC3 address the message was signed with - Διεύθυνση Bitcoin με την οποία έχει υπογραφεί το μήνυμα + Διεύθυνση NYC3 με την οποία έχει υπογραφεί το μήνυμα Verify the message to ensure it was signed with the specified NYC3 address - Επαληθεύστε το μήνυμα για να αποδείξετε πως υπογράφθηκε από τη συγκεκριμένη διεύθυνση Bitcoin + Επαληθεύστε το μήνυμα για να αποδείξετε πως υπογράφθηκε από τη συγκεκριμένη διεύθυνση NYC3 Verify &Message diff --git a/src/qt/locale/nyc3_en.ts b/src/qt/locale/nyc3_en.ts index 5bf398612..b503346ef 100644 --- a/src/qt/locale/nyc3_en.ts +++ b/src/qt/locale/nyc3_en.ts @@ -85,12 +85,12 @@ - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. @@ -308,7 +308,7 @@ - BitcoinGUI + NYC3GUI Sign &message... @@ -466,8 +466,8 @@ - Bitcoin - Bitcoin + NYC3 + NYC3 @@ -496,13 +496,13 @@ - Sign messages with your Bitcoin addresses to prove you own them - Sign messages with your Bitcoin addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them - Verify messages to ensure they were signed with specified Bitcoin addresses - Verify messages to ensure they were signed with specified Bitcoin addresses + Verify messages to ensure they were signed with specified NYC3 addresses + Verify messages to ensure they were signed with specified NYC3 addresses @@ -551,10 +551,10 @@ - %n active connection(s) to Bitcoin network + %n active connection(s) to NYC3 network - %n active connection to Bitcoin network - %n active connections to Bitcoin network + %n active connection to NYC3 network + %n active connections to NYC3 network @@ -642,7 +642,7 @@ - Show the %1 help message to get a list with possible Bitcoin command-line options + Show the %1 help message to get a list with possible NYC3 command-line options @@ -773,7 +773,7 @@ - A fatal error occurred. Bitcoin can no longer continue safely and will quit. + A fatal error occurred. NYC3 can no longer continue safely and will quit. @@ -1131,8 +1131,8 @@ - Bitcoin - Bitcoin + NYC3 + NYC3 @@ -1146,7 +1146,7 @@ - %1 will download and store a copy of the Bitcoin block chain. + %1 will download and store a copy of the NYC3 block chain. @@ -1428,8 +1428,8 @@ - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. @@ -1448,7 +1448,7 @@ - Connect to the Bitcoin network through a SOCKS5 proxy. + Connect to the NYC3 network through a SOCKS5 proxy. @@ -1496,7 +1496,7 @@ - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. @@ -1636,8 +1636,8 @@ - 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. - 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. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. @@ -2535,7 +2535,7 @@ - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. @@ -3192,7 +3192,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. diff --git a/src/qt/locale/nyc3_en_GB.ts b/src/qt/locale/nyc3_en_GB.ts index b0dfbbfdd..73a6d3528 100644 --- a/src/qt/locale/nyc3_en_GB.ts +++ b/src/qt/locale/nyc3_en_GB.ts @@ -66,12 +66,12 @@ Receiving addresses - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. &Copy Address @@ -240,7 +240,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Sign &message... @@ -366,8 +366,8 @@ &Verify message... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -390,12 +390,12 @@ Encrypt the private keys that belong to your wallet - Sign messages with your Bitcoin addresses to prove you own them - Sign messages with your Bitcoin addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them - Verify messages to ensure they were signed with specified Bitcoin addresses - Verify messages to ensure they were signed with specified Bitcoin addresses + Verify messages to ensure they were signed with specified NYC3 addresses + Verify messages to ensure they were signed with specified NYC3 addresses &File @@ -434,8 +434,8 @@ &Command-line options - %n active connection(s) to Bitcoin network - %n active connection to Bitcoin network%n active connections to Bitcoin network + %n active connection(s) to NYC3 network + %n active connection to NYC3 network%n active connections to NYC3 network Indexing blocks on disk... @@ -486,8 +486,8 @@ &Receiving addresses - Show the %1 help message to get a list with possible Bitcoin command-line options - Show the %1 help message to get a list with possible Bitcoin command-line options + Show the %1 help message to get a list with possible NYC3 command-line options + Show the %1 help message to get a list with possible NYC3 command-line options default wallet @@ -590,8 +590,8 @@ Wallet is <b>encrypted</b> and currently <b>locked</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - A fatal error occurred. Bitcoin can no longer continue safely and will quit. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + A fatal error occurred. NYC3 can no longer continue safely and will quit. @@ -877,8 +877,8 @@ Use a custom data directory: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -889,8 +889,8 @@ Approximately %1 GB of data will be stored in this directory. - %1 will download and store a copy of the Bitcoin block chain. - %1 will download and store a copy of the Bitcoin block chain. + %1 will download and store a copy of the NYC3 block chain. + %1 will download and store a copy of the NYC3 block chain. The wallet will also be stored in this directory. @@ -921,11 +921,11 @@ Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below. - Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronising with the Bitcoin network, as detailed below. + Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronising with the NYC3 network, as detailed below. Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network. - Attempting to spend Bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network. + Attempting to spend NYC3s that are affected by not-yet-displayed transactions will not be accepted by the network. Number of blocks left @@ -1102,8 +1102,8 @@ &Spend unconfirmed change - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. Map port using &UPnP @@ -1118,8 +1118,8 @@ Allow incomin&g connections - Connect to the Bitcoin network through a SOCKS5 proxy. - Connect to the Bitcoin network through a SOCKS5 proxy. + Connect to the NYC3 network through a SOCKS5 proxy. + Connect to the NYC3 network through a SOCKS5 proxy. &Connect through SOCKS5 proxy (default proxy): @@ -1154,8 +1154,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. &Window @@ -1265,8 +1265,8 @@ Form - 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. - The displayed information may be out of date. Your Wallet automatically synchronises with the Bitcoin Network after a connection is established, but this process has not been completed yet. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + The displayed information may be out of date. Your Wallet automatically synchronises with the NYC3 Network after a connection is established, but this process has not been completed yet. Watch-only: @@ -1341,7 +1341,7 @@ Cannot start bitcoin: click-to-pay handler - Cannot start Bitcoin: click-to-pay handler + Cannot start NYC3: click-to-pay handler URI handling @@ -1926,8 +1926,8 @@ &Message: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. An optional label to associate with the new receiving address. @@ -2446,8 +2446,8 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p Enter a label for this address to add it to the list of used addresses - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. Pay To: diff --git a/src/qt/locale/nyc3_eo.ts b/src/qt/locale/nyc3_eo.ts index 8465b7b2f..68cfae095 100644 --- a/src/qt/locale/nyc3_eo.ts +++ b/src/qt/locale/nyc3_eo.ts @@ -66,11 +66,11 @@ Ricevaj adresoj - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. Jen viaj Bitmon-adresoj por sendi pagojn. Zorge kontrolu la sumon kaj la alsendan adreson antaŭ ol sendi. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. Jen viaj bitmonaj adresoj por ricevi pagojn. Estas konsilinde uzi apartan ricevan adreson por ĉiu transakcio. @@ -228,7 +228,7 @@ BanTableModel - BitcoinGUI + NYC3GUI Sign &message... Subskribi &mesaĝon... @@ -322,7 +322,7 @@ &Kontroli mesaĝon... - Bitcoin + NYC3 Bitmono @@ -346,11 +346,11 @@ Ĉifri la privatajn ŝlosilojn de via monujo - Sign messages with your Bitcoin addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them Subskribi mesaĝojn per via Bitmon-adresoj por pravigi, ke vi estas la posedanto - Verify messages to ensure they were signed with specified Bitcoin addresses + Verify messages to ensure they were signed with specified NYC3 addresses Kontroli mesaĝojn por kontroli ĉu ili estas subskribitaj per specifaj Bitmon-adresoj @@ -615,7 +615,7 @@ Uzi alian dosierujon por datumoj: - Bitcoin + NYC3 Bitmono @@ -692,7 +692,7 @@ Fakulo - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. Aŭtomate malfermi la kursilan pordon por Bitmono. Tio funkcias nur se via kursilo havas la UPnP-funkcion, kaj se tiu ĉi estas ŝaltita. @@ -791,7 +791,7 @@ Formularo - 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. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. Eblas, ke la informoj videblaj ĉi tie estas eksdataj. Via monujo aŭtomate sinkoniĝas kun la bitmona reto kiam ili konektiĝas, sed tiu procezo ankoraŭ ne finfariĝis. diff --git a/src/qt/locale/nyc3_es.ts b/src/qt/locale/nyc3_es.ts index 2f5544ea9..06448c11e 100644 --- a/src/qt/locale/nyc3_es.ts +++ b/src/qt/locale/nyc3_es.ts @@ -66,12 +66,12 @@ Direcciones de recepción - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Estas son sus direcciones Bitcoin para enviar pagos. Verifique siempre la cantidad y la dirección de recepción antes de enviar bitcoins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Estas son sus direcciones NYC3 para enviar pagos. Verifique siempre la cantidad y la dirección de recepción antes de enviar bitcoins. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Estas son sus direcciones Bitcoin para recibir pagos. Se recomienda utilizar una nueva dirección de recepción para cada transacción + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Estas son sus direcciones NYC3 para recibir pagos. Se recomienda utilizar una nueva dirección de recepción para cada transacción &Copy Address @@ -236,7 +236,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Firmar &mensaje... @@ -339,7 +339,7 @@ Send coins to a NYC3 address - Enviar bitcoins a una dirección Bitcoin + Enviar bitcoins a una dirección NYC3 Backup wallet to another location @@ -362,8 +362,8 @@ &Verificar mensaje... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -386,12 +386,12 @@ Cifrar las claves privadas de su monedero - Sign messages with your Bitcoin addresses to prove you own them - Firmar mensajes con sus direcciones Bitcoin para demostrar la propiedad + Sign messages with your NYC3 addresses to prove you own them + Firmar mensajes con sus direcciones NYC3 para demostrar la propiedad - Verify messages to ensure they were signed with specified Bitcoin addresses - Verificar mensajes comprobando que están firmados con direcciones Bitcoin concretas + Verify messages to ensure they were signed with specified NYC3 addresses + Verificar mensajes comprobando que están firmados con direcciones NYC3 concretas &File @@ -430,8 +430,8 @@ &Opciones de consola de comandos - %n active connection(s) to Bitcoin network - %n conexión activa hacia la red Bitcoin%n conexiones activas hacia la red Bitcoin + %n active connection(s) to NYC3 network + %n conexión activa hacia la red NYC3%n conexiones activas hacia la red NYC3 Indexing blocks on disk... @@ -498,8 +498,8 @@ Cerrar monedero - Show the %1 help message to get a list with possible Bitcoin command-line options - Mostrar el mensaje de ayuda %1 para obtener una lista de los posibles comandos de linea de comandos de Bitcoin + Show the %1 help message to get a list with possible NYC3 command-line options + Mostrar el mensaje de ayuda %1 para obtener una lista de los posibles comandos de linea de comandos de NYC3 default wallet @@ -605,8 +605,8 @@ El monedero está <b>cifrado</b> y actualmente <b>bloqueado</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Ha ocurrido un error fatal. Bitcoin no puede seguir seguro y se cerrará. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Ha ocurrido un error fatal. NYC3 no puede seguir seguro y se cerrará. @@ -796,7 +796,7 @@ The entered address "%1" is not a valid NYC3 address. - La dirección introducida "%1" no es una dirección Bitcoin válida. + La dirección introducida "%1" no es una dirección NYC3 válida. Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -892,8 +892,8 @@ Utilizar un directorio de datos personalizado: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -904,8 +904,8 @@ Se almacenará aproximadamente %1 GB de datos en este directorio. - %1 will download and store a copy of the Bitcoin block chain. - %1 descargará y almacenará una copia de la cadena de bloques de Bitcoin. + %1 will download and store a copy of the NYC3 block chain. + %1 descargará y almacenará una copia de la cadena de bloques de NYC3. The wallet will also be stored in this directory. @@ -1113,8 +1113,8 @@ &Gastar cambio no confirmado - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Abrir automáticamente el puerto del cliente Bitcoin en el router. Esta opción solo funciona si el router admite UPnP y está activado. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Abrir automáticamente el puerto del cliente NYC3 en el router. Esta opción solo funciona si el router admite UPnP y está activado. Map port using &UPnP @@ -1129,8 +1129,8 @@ Permitir conexiones entrantes - Connect to the Bitcoin network through a SOCKS5 proxy. - Conectarse a la red Bitcoin a través de un proxy SOCKS5. + Connect to the NYC3 network through a SOCKS5 proxy. + Conectarse a la red NYC3 a través de un proxy SOCKS5. &Connect through SOCKS5 proxy (default proxy): @@ -1165,8 +1165,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Conectar a la red Bitcoin mediante un proxy SOCKS5 por separado para los servicios ocultos de Tor. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Conectar a la red NYC3 mediante un proxy SOCKS5 por separado para los servicios ocultos de Tor. &Window @@ -1272,8 +1272,8 @@ Formulario - 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. - La información mostrada puede estar desactualizada. Su monedero se sincroniza automáticamente con la red Bitcoin después de que se haya establecido una conexión, pero este proceso aún no se ha completado. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + La información mostrada puede estar desactualizada. Su monedero se sincroniza automáticamente con la red NYC3 después de que se haya establecido una conexión, pero este proceso aún no se ha completado. Watch-only: @@ -1376,7 +1376,7 @@ URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - URI no puede ser analizado! Esto puede ser causado por una dirección Bitcoin inválida o parametros URI mal formados. + URI no puede ser analizado! Esto puede ser causado por una dirección NYC3 inválida o parametros URI mal formados. Payment request file handling @@ -1478,7 +1478,7 @@ Enter a NYC3 address (e.g. %1) - Introducir una dirección Bitcoin (p. ej. %1) + Introducir una dirección NYC3 (p. ej. %1) %1 d @@ -1921,8 +1921,8 @@ Mensaje: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Un mensaje opcional para adjuntar a la solicitud de pago, que se muestra cuando se abre la solicitud. Nota: El mensaje no se enviará con el pago por la red Bitcoin. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Un mensaje opcional para adjuntar a la solicitud de pago, que se muestra cuando se abre la solicitud. Nota: El mensaje no se enviará con el pago por la red NYC3. An optional label to associate with the new receiving address. @@ -2343,7 +2343,7 @@ Nota: Dado que la comisión se calcula por byte, una comisión de "100 satoshis Warning: Invalid NYC3 address - Alerta: dirección Bitcoin inválida + Alerta: dirección NYC3 inválida Warning: Unknown change address @@ -2386,7 +2386,7 @@ Nota: Dado que la comisión se calcula por byte, una comisión de "100 satoshis The NYC3 address to send the payment to - Dirección Bitcoin a la que enviar el pago + Dirección NYC3 a la que enviar el pago Alt+A @@ -2433,8 +2433,8 @@ Nota: Dado que la comisión se calcula por byte, una comisión de "100 satoshis Introduce una etiqueta para esta dirección para añadirla a la lista de direcciones utilizadas - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Un mensaje que se adjuntó a la bitcoin: URL que será almacenada con la transacción para su referencia. Nota: Este mensaje no se envía a través de la red Bitcoin. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Un mensaje que se adjuntó a la bitcoin: URL que será almacenada con la transacción para su referencia. Nota: Este mensaje no se envía a través de la red NYC3. Pay To: @@ -2483,7 +2483,7 @@ Nota: Dado que la comisión se calcula por byte, una comisión de "100 satoshis The NYC3 address to sign the message with - Dirección Bitcoin con la que firmar el mensaje + Dirección NYC3 con la que firmar el mensaje Choose previously used address @@ -2515,7 +2515,7 @@ Nota: Dado que la comisión se calcula por byte, una comisión de "100 satoshis Sign the message to prove you own this NYC3 address - Firmar el mensaje para demostrar que se posee esta dirección Bitcoin + Firmar el mensaje para demostrar que se posee esta dirección NYC3 Sign &Message @@ -2539,11 +2539,11 @@ Nota: Dado que la comisión se calcula por byte, una comisión de "100 satoshis The NYC3 address the message was signed with - La dirección Bitcoin con la que se firmó el mensaje + La dirección NYC3 con la que se firmó el mensaje Verify the message to ensure it was signed with the specified NYC3 address - Verificar el mensaje para comprobar que fue firmado con la dirección Bitcoin indicada + Verificar el mensaje para comprobar que fue firmado con la dirección NYC3 indicada Verify &Message diff --git a/src/qt/locale/nyc3_es_AR.ts b/src/qt/locale/nyc3_es_AR.ts index d9e31ba1a..5bcf9e9c2 100644 --- a/src/qt/locale/nyc3_es_AR.ts +++ b/src/qt/locale/nyc3_es_AR.ts @@ -62,8 +62,8 @@ Dirección destino - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Estas son tus direcciones Bitcoin para enviar pagos. Chequea siempre el monto y la dirección destino antes de mandar monedas. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Estas son tus direcciones NYC3 para enviar pagos. Chequea siempre el monto y la dirección destino antes de mandar monedas. @@ -170,7 +170,7 @@ BanTableModel - BitcoinGUI + NYC3GUI CoinControlDialog diff --git a/src/qt/locale/nyc3_es_CL.ts b/src/qt/locale/nyc3_es_CL.ts index fdb24e220..115f8c446 100644 --- a/src/qt/locale/nyc3_es_CL.ts +++ b/src/qt/locale/nyc3_es_CL.ts @@ -66,11 +66,11 @@ Recibiendo direcciones - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Estas son tus direcciones de Bitcoin para recibir pagos. Siempre revise el monto y la dirección de envío antes de enviar criptomonedas. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Estas son tus direcciones de NYC3 para recibir pagos. Siempre revise el monto y la dirección de envío antes de enviar criptomonedas. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. Estas son tus direcciones para recibir pagos. Es recomendable utilizar una nueva dirección para cada transacción. @@ -236,7 +236,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Firmar &Mensaje... @@ -354,8 +354,8 @@ Verificar mensaje.... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -378,12 +378,12 @@ Cifrar las claves privadas de su monedero - Sign messages with your Bitcoin addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them Firmar un mensaje para provar que usted es dueño de esta dirección - Verify messages to ensure they were signed with specified Bitcoin addresses - Verificar mensajes comprobando que están firmados con direcciones Bitcoin concretas + Verify messages to ensure they were signed with specified NYC3 addresses + Verificar mensajes comprobando que están firmados con direcciones NYC3 concretas &File @@ -422,8 +422,8 @@ &Opciones de linea de comando - %n active connection(s) to Bitcoin network - %n conexión activa hacia la red Bitcoin%n conexiones activas hacia la red Bitcoin + %n active connection(s) to NYC3 network + %n conexión activa hacia la red NYC3%n conexiones activas hacia la red NYC3 Indexing blocks on disk... @@ -466,8 +466,8 @@ Actualizado - Show the %1 help message to get a list with possible Bitcoin command-line options - Mostrar el mensaje de ayuda %1 para obtener una lista de los posibles comandos de Bitcoin + Show the %1 help message to get a list with possible NYC3 command-line options + Mostrar el mensaje de ayuda %1 para obtener una lista de los posibles comandos de NYC3 &Window @@ -541,8 +541,8 @@ La billetera esta <b>codificada</b> y actualmente <b>bloqueda</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Ha ocurrido un error fatal. Bitcoin no puede seguir seguro y se cerrará. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Ha ocurrido un error fatal. NYC3 no puede seguir seguro y se cerrará. @@ -733,7 +733,7 @@ The entered address "%1" is not a valid NYC3 address. - La dirección introducida "%1" no es una dirección Bitcoin valida. + La dirección introducida "%1" no es una dirección NYC3 valida. Could not unlock wallet. @@ -817,8 +817,8 @@ usar un directorio de datos personalizado: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -829,8 +829,8 @@ Aproximadamente %1 GB de información será almacenado en este directorio. - %1 will download and store a copy of the Bitcoin block chain. - %1 descargará y almacenará una copia del blockchain de Bitcoin. + %1 will download and store a copy of the NYC3 block chain. + %1 descargará y almacenará una copia del blockchain de NYC3. The wallet will also be stored in this directory. @@ -1002,8 +1002,8 @@ Gastar cambio sin confirmar - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Abre automáticamente el puerto del cliente Bitcoin en el router. Esto funciona solo cuando tu router es compatible con UPnP y está habilitado. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Abre automáticamente el puerto del cliente NYC3 en el router. Esto funciona solo cuando tu router es compatible con UPnP y está habilitado. Map port using &UPnP @@ -1014,8 +1014,8 @@ Aceptar conexiones externas. - Connect to the Bitcoin network through a SOCKS5 proxy. - Conectar a la red de Bitcoin a través de un proxy SOCKS5 + Connect to the NYC3 network through a SOCKS5 proxy. + Conectar a la red de NYC3 a través de un proxy SOCKS5 Proxy &IP: @@ -1046,8 +1046,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Conectar a la red de Bitcoin a través de un proxy SOCKS5 diferente para los servicios anónimos de Tor. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Conectar a la red de NYC3 a través de un proxy SOCKS5 diferente para los servicios anónimos de Tor. &Window @@ -1146,8 +1146,8 @@ Formulario - 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. - La información entregada puede estar desactualizada. Tu billetera se sincroniza automáticamente con la red de Bitcoin después de establecer una conexión, pero este proceso aún no se ha completado. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + La información entregada puede estar desactualizada. Tu billetera se sincroniza automáticamente con la red de NYC3 después de establecer una conexión, pero este proceso aún no se ha completado. Watch-only: @@ -1304,7 +1304,7 @@ Enter a NYC3 address (e.g. %1) - Ingresa una dirección de Bitcoin (Ejemplo: %1) + Ingresa una dirección de NYC3 (Ejemplo: %1) %1 d @@ -1684,8 +1684,8 @@ &mensaje - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Mensaje opcional adjunto a la solicitud de pago, que será mostrado cuando la solicitud sea abierta. Nota: Este mensaje no será enviado con el pago a través de la red Bitcoin. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Mensaje opcional adjunto a la solicitud de pago, que será mostrado cuando la solicitud sea abierta. Nota: Este mensaje no será enviado con el pago a través de la red NYC3. Use this form to request payments. All fields are <b>optional</b>. @@ -2031,7 +2031,7 @@ Warning: Invalid NYC3 address - Peligro: Dirección de Bitcoin inválida + Peligro: Dirección de NYC3 inválida Warning: Unknown change address @@ -2074,7 +2074,7 @@ The NYC3 address to send the payment to - Dirección Bitcoin a enviar el pago + Dirección NYC3 a enviar el pago Alt+A @@ -2155,7 +2155,7 @@ The NYC3 address to sign the message with - Dirección Bitcoin con la que firmar el mensaje + Dirección NYC3 con la que firmar el mensaje Choose previously used address @@ -2207,11 +2207,11 @@ The NYC3 address the message was signed with - La dirección Bitcoin con la que se firmó el mensaje + La dirección NYC3 con la que se firmó el mensaje Verify the message to ensure it was signed with the specified NYC3 address - Verifica el mensaje para asegurar que fue firmado con la dirección de Bitcoin especificada. + Verifica el mensaje para asegurar que fue firmado con la dirección de NYC3 especificada. Verify &Message diff --git a/src/qt/locale/nyc3_es_CO.ts b/src/qt/locale/nyc3_es_CO.ts index 769ce5650..15b8380b5 100644 --- a/src/qt/locale/nyc3_es_CO.ts +++ b/src/qt/locale/nyc3_es_CO.ts @@ -63,12 +63,12 @@ Exportar los datos en la pestaña actual a un archivo Recibiendo dirección - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Estas son sus direcciones de Bitcoin para enviar pagos. Siempre verifique el monto y la dirección de recepción antes de enviar monedas. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Estas son sus direcciones de NYC3 para enviar pagos. Siempre verifique el monto y la dirección de recepción antes de enviar monedas. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Estas son sus direcciones de Bitcoin para recibir pagos. Se recomienda utilizar una nueva dirección de recepción para cada transacción. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Estas son sus direcciones de NYC3 para recibir pagos. Se recomienda utilizar una nueva dirección de recepción para cada transacción. &Copy Address @@ -229,7 +229,7 @@ Exportar los datos en la pestaña actual a un archivo - BitcoinGUI + NYC3GUI Sign &message... Firma y mensaje ... @@ -308,7 +308,7 @@ Exportar los datos en la pestaña actual a un archivo Send coins to a NYC3 address - Enviando monedas a una dirección de Bitcoin + Enviando monedas a una dirección de NYC3 Backup wallet to another location @@ -331,8 +331,8 @@ Exportar los datos en la pestaña actual a un archivo &Verificar Mensaje... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -355,12 +355,12 @@ Exportar los datos en la pestaña actual a un archivo Encripta las claves privadas que pertenecen a tu billetera - Sign messages with your Bitcoin addresses to prove you own them - Firme mensajes con sus direcciones de Bitcoin para demostrar que los posee + Sign messages with your NYC3 addresses to prove you own them + Firme mensajes con sus direcciones de NYC3 para demostrar que los posee - Verify messages to ensure they were signed with specified Bitcoin addresses - Verifique los mensajes para asegurarse de que fueron firmados con las direcciones de Bitcoin especificadas + Verify messages to ensure they were signed with specified NYC3 addresses + Verifique los mensajes para asegurarse de que fueron firmados con las direcciones de NYC3 especificadas &File @@ -463,8 +463,8 @@ Exportar los datos en la pestaña actual a un archivo La billetera está <b> encriptada </ b> y actualmente está <b> bloqueada </ b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Se produjo un error fatal. Bitcoin ya no puede continuar de manera segura y no continuará + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Se produjo un error fatal. NYC3 ya no puede continuar de manera segura y no continuará @@ -710,8 +710,8 @@ Exportar los datos en la pestaña actual a un archivo Use un directorio de datos personalizado: - Bitcoin - Bitcoin + NYC3 + NYC3 The wallet will also be stored in this directory. @@ -875,8 +875,8 @@ Exportar los datos en la pestaña actual a un archivo & Gastar cambio no confirmado - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Abra automáticamente el puerto cliente de Bitcoin en el enrutador. Esto solo funciona cuando su enrutador admite UPnP y está habilitado. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Abra automáticamente el puerto cliente de NYC3 en el enrutador. Esto solo funciona cuando su enrutador admite UPnP y está habilitado. Map port using &UPnP @@ -891,8 +891,8 @@ Exportar los datos en la pestaña actual a un archivo Permitir conexiones entrantes - Connect to the Bitcoin network through a SOCKS5 proxy. - Conéctese a la red de Bitcoin a través de un proxy SOCKS5. + Connect to the NYC3 network through a SOCKS5 proxy. + Conéctese a la red de NYC3 a través de un proxy SOCKS5. &Connect through SOCKS5 proxy (default proxy): @@ -927,8 +927,8 @@ Exportar los datos en la pestaña actual a un archivo Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Conéctese a la red de Bitcoin a través de un proxy SOCKS5 separado para los servicios Tor ocultos. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Conéctese a la red de NYC3 a través de un proxy SOCKS5 separado para los servicios Tor ocultos. &Window @@ -1030,8 +1030,8 @@ Exportar los datos en la pestaña actual a un archivo Configurar - 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. - La información mostrada puede estar desactualizada. Su billetera se sincroniza automáticamente con la red de Bitcoin después de establecer una conexión, pero este proceso aún no se ha completado. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + La información mostrada puede estar desactualizada. Su billetera se sincroniza automáticamente con la red de NYC3 después de establecer una conexión, pero este proceso aún no se ha completado. Watch-only: @@ -1102,7 +1102,7 @@ Exportar los datos en la pestaña actual a un archivo Cannot start bitcoin: click-to-pay handler - No se puede iniciar Bitcoin: controlador de clic para pagar + No se puede iniciar NYC3: controlador de clic para pagar URI handling @@ -1110,7 +1110,7 @@ Exportar los datos en la pestaña actual a un archivo URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - ¡URI no puede ser analizado! Esto puede deberse a una dirección de Bitcoin no válida o a parámetros de URI mal formados. + ¡URI no puede ser analizado! Esto puede deberse a una dirección de NYC3 no válida o a parámetros de URI mal formados. Payment request file handling @@ -1563,8 +1563,8 @@ Exportar los datos en la pestaña actual a un archivo Mensaje: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Un mensaje opcional para adjuntar a la solicitud de pago, que se mostrará cuando se abra la solicitud. Nota: El mensaje no se enviará con el pago a través de la red de Bitcoin. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Un mensaje opcional para adjuntar a la solicitud de pago, que se mostrará cuando se abra la solicitud. Nota: El mensaje no se enviará con el pago a través de la red de NYC3. An optional label to associate with the new receiving address. diff --git a/src/qt/locale/nyc3_es_DO.ts b/src/qt/locale/nyc3_es_DO.ts index 951ee71f1..50925a956 100644 --- a/src/qt/locale/nyc3_es_DO.ts +++ b/src/qt/locale/nyc3_es_DO.ts @@ -62,12 +62,12 @@ Direcciones de recepción - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Estas son sus direcciones Bitcoin para enviar pagos. Compruebe siempre la cantidad y la dirección de recibo antes de transferir monedas. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Estas son sus direcciones NYC3 para enviar pagos. Compruebe siempre la cantidad y la dirección de recibo antes de transferir monedas. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Estas son sus direcciones de Bitcoin para recibir pagos. Se recomienda utilizar una nueva dirección de recepción para cada transacción. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Estas son sus direcciones de NYC3 para recibir pagos. Se recomienda utilizar una nueva dirección de recepción para cada transacción. Export Address List @@ -168,7 +168,7 @@ BanTableModel - BitcoinGUI + NYC3GUI Sign &message... Firmar &mensaje... @@ -235,7 +235,7 @@ Send coins to a NYC3 address - Enviar monedas a una dirección Bitcoin + Enviar monedas a una dirección NYC3 Backup wallet to another location @@ -258,8 +258,8 @@ &Verificar mensaje... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -282,12 +282,12 @@ Cifrar las claves privadas de su monedero - Sign messages with your Bitcoin addresses to prove you own them - Firmar mensajes con sus direcciones Bitcoin para demostrar la propiedad + Sign messages with your NYC3 addresses to prove you own them + Firmar mensajes con sus direcciones NYC3 para demostrar la propiedad - Verify messages to ensure they were signed with specified Bitcoin addresses - Verificar mensajes comprobando que están firmados con direcciones Bitcoin concretas + Verify messages to ensure they were signed with specified NYC3 addresses + Verificar mensajes comprobando que están firmados con direcciones NYC3 concretas &File @@ -307,7 +307,7 @@ Request payments (generates QR codes and bitcoin: URIs) - Solicitar pagos (genera codigo QR y URL's de Bitcoin) + Solicitar pagos (genera codigo QR y URL's de NYC3) Show the list of used sending addresses and labels @@ -505,8 +505,8 @@ Utilice un directorio de datos personalizado: - Bitcoin - Bitcoin + NYC3 + NYC3 Error @@ -578,8 +578,8 @@ Experto - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Abrir automáticamente el puerto del cliente Bitcoin en el router. Esta opción solo funciona si el router admite UPnP y está activado. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Abrir automáticamente el puerto del cliente NYC3 en el router. Esta opción solo funciona si el router admite UPnP y está activado. Map port using &UPnP @@ -677,8 +677,8 @@ Desde - 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. - La información mostrada puede estar desactualizada. Su monedero se sincroniza automáticamente con la red Bitcoin después de que se haya establecido una conexión, pero este proceso aún no se ha completado. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + La información mostrada puede estar desactualizada. Su monedero se sincroniza automáticamente con la red NYC3 después de que se haya establecido una conexión, pero este proceso aún no se ha completado. Your current spendable balance @@ -1112,7 +1112,7 @@ Sign the message to prove you own this NYC3 address - Firmar el mensaje para demostrar que se posee esta dirección Bitcoin + Firmar el mensaje para demostrar que se posee esta dirección NYC3 Sign &Message @@ -1132,7 +1132,7 @@ Verify the message to ensure it was signed with the specified NYC3 address - Verificar el mensaje para comprobar que fue firmado con la dirección Bitcoin indicada + Verificar el mensaje para comprobar que fue firmado con la dirección NYC3 indicada Verify &Message @@ -1212,7 +1212,7 @@ bitcoin-core NYC3 - Núcleo de Bitcoin + Núcleo de NYC3 Corrupted block database detected diff --git a/src/qt/locale/nyc3_es_ES.ts b/src/qt/locale/nyc3_es_ES.ts index 2ff7df7c3..2903e3789 100644 --- a/src/qt/locale/nyc3_es_ES.ts +++ b/src/qt/locale/nyc3_es_ES.ts @@ -66,12 +66,12 @@ Recibiendo direcciones - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Estas son sus direcciones Bitcoin para enviar pagos. Verifique siempre la cantidad y la dirección de recibimiento antes de enviar monedas. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Estas son sus direcciones NYC3 para enviar pagos. Verifique siempre la cantidad y la dirección de recibimiento antes de enviar monedas. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Estas son sus direcciones Bitcoin para recibir pagos. Se recomienda utilizar una nueva dirección de recibimiento para cada transacción + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Estas son sus direcciones NYC3 para recibir pagos. Se recomienda utilizar una nueva dirección de recibimiento para cada transacción &Copy Address @@ -236,7 +236,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Firmar &mensaje... @@ -335,7 +335,7 @@ Send coins to a NYC3 address - Enviar bitcoins a una dirección Bitcoin + Enviar bitcoins a una dirección NYC3 Backup wallet to another location @@ -358,8 +358,8 @@ &Verificar mensaje... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -382,12 +382,12 @@ Cifrar las claves privadas de su monedero - Sign messages with your Bitcoin addresses to prove you own them - Firmar mensajes con sus direcciones Bitcoin para demostrar la propiedad + Sign messages with your NYC3 addresses to prove you own them + Firmar mensajes con sus direcciones NYC3 para demostrar la propiedad - Verify messages to ensure they were signed with specified Bitcoin addresses - Verificar mensajes comprobando que están firmados con direcciones Bitcoin concretas + Verify messages to ensure they were signed with specified NYC3 addresses + Verificar mensajes comprobando que están firmados con direcciones NYC3 concretas &File @@ -426,8 +426,8 @@ &Opciones de consola de comandos - %n active connection(s) to Bitcoin network - %n conexión activa hacia la red Bitcoin%n conexiones activas hacia la red Bitcoin + %n active connection(s) to NYC3 network + %n conexión activa hacia la red NYC3%n conexiones activas hacia la red NYC3 Indexing blocks on disk... @@ -470,8 +470,8 @@ Actualizado - Show the %1 help message to get a list with possible Bitcoin command-line options - Mostrar el mensaje de ayuda %1 para obtener una lista de los posibles comandos de linea de comandos de Bitcoin + Show the %1 help message to get a list with possible NYC3 command-line options + Mostrar el mensaje de ayuda %1 para obtener una lista de los posibles comandos de linea de comandos de NYC3 &Window @@ -570,8 +570,8 @@ El monedero está <b>cifrado</b> y actualmente <b>bloqueado</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Ha ocurrido un error fatal. Bitcoin no puede continuar de manera segura y se cerrará. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Ha ocurrido un error fatal. NYC3 no puede continuar de manera segura y se cerrará. @@ -761,7 +761,7 @@ The entered address "%1" is not a valid NYC3 address. - La dirección introducida "%1" no es una dirección Bitcoin válida. + La dirección introducida "%1" no es una dirección NYC3 válida. Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -845,8 +845,8 @@ Utilizar un directorio de datos personalizado: - Bitcoin - Bitcoin + NYC3 + NYC3 Error: Specified data directory "%1" cannot be created. @@ -1006,16 +1006,16 @@ &Gastar cambio no confirmado - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Abrir automáticamente el puerto del cliente Bitcoin en el router. Esta opción solo funciona si el router admite UPnP y está activado. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Abrir automáticamente el puerto del cliente NYC3 en el router. Esta opción solo funciona si el router admite UPnP y está activado. Map port using &UPnP Mapear el puerto mediante &UPnP - Connect to the Bitcoin network through a SOCKS5 proxy. - Conectarse a la red Bitcoin a través de un proxy SOCKS5. + Connect to the NYC3 network through a SOCKS5 proxy. + Conectarse a la red NYC3 a través de un proxy SOCKS5. &Connect through SOCKS5 proxy (default proxy): @@ -1050,8 +1050,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Conectar a la red Bitcoin mediante un proxy SOCKS5 por separado para los servicios ocultos de Tor. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Conectar a la red NYC3 mediante un proxy SOCKS5 por separado para los servicios ocultos de Tor. &Window @@ -1145,8 +1145,8 @@ Formulario - 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. - La información mostrada puede estar desactualizada. Su monedero se sincroniza automáticamente con la red Bitcoin después de que se haya establecido una conexión, pero este proceso aún no se ha completado. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + La información mostrada puede estar desactualizada. Su monedero se sincroniza automáticamente con la red NYC3 después de que se haya establecido una conexión, pero este proceso aún no se ha completado. Watch-only: @@ -1237,7 +1237,7 @@ URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - URI no puede ser analizado! Esto puede ser causado por una dirección Bitcoin inválida o parametros URI mal formados. + URI no puede ser analizado! Esto puede ser causado por una dirección NYC3 inválida o parametros URI mal formados. Payment request file handling @@ -1339,7 +1339,7 @@ Enter a NYC3 address (e.g. %1) - Introducir una dirección Bitcoin (p. ej. %1) + Introducir una dirección NYC3 (p. ej. %1) %1 d @@ -1714,8 +1714,8 @@ Mensaje: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Un mensaje opcional para adjuntar a la solicitud de pago, que se muestra cuando se abre la solicitud. Nota: El mensaje no se enviará con el pago por la red Bitcoin. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Un mensaje opcional para adjuntar a la solicitud de pago, que se muestra cuando se abre la solicitud. Nota: El mensaje no se enviará con el pago por la red NYC3. An optional label to associate with the new receiving address. @@ -2076,7 +2076,7 @@ Warning: Invalid NYC3 address - Alerta: dirección Bitcoin inválida + Alerta: dirección NYC3 inválida Warning: Unknown change address @@ -2119,7 +2119,7 @@ The NYC3 address to send the payment to - Dirección Bitcoin a la que enviar el pago + Dirección NYC3 a la que enviar el pago Alt+A @@ -2162,8 +2162,8 @@ Introduce una etiqueta para esta dirección para añadirla a la lista de direcciones utilizadas - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Un mensaje que se adjuntó a la bitcoin: URL que será almacenada con la transacción para su referencia. Nota: Este mensaje no se envía a través de la red Bitcoin. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Un mensaje que se adjuntó a la bitcoin: URL que será almacenada con la transacción para su referencia. Nota: Este mensaje no se envía a través de la red NYC3. Pay To: @@ -2212,7 +2212,7 @@ The NYC3 address to sign the message with - Dirección Bitcoin con la que firmar el mensaje + Dirección NYC3 con la que firmar el mensaje Choose previously used address @@ -2244,7 +2244,7 @@ Sign the message to prove you own this NYC3 address - Firmar el mensaje para demostrar que se posee esta dirección Bitcoin + Firmar el mensaje para demostrar que se posee esta dirección NYC3 Sign &Message @@ -2268,11 +2268,11 @@ The NYC3 address the message was signed with - La dirección Bitcoin con la que se firmó el mensaje + La dirección NYC3 con la que se firmó el mensaje Verify the message to ensure it was signed with the specified NYC3 address - Verificar el mensaje para comprobar que fue firmado con la dirección Bitcoin indicada + Verificar el mensaje para comprobar que fue firmado con la dirección NYC3 indicada Verify &Message diff --git a/src/qt/locale/nyc3_es_MX.ts b/src/qt/locale/nyc3_es_MX.ts index e728c8fbb..7bb0cbf10 100644 --- a/src/qt/locale/nyc3_es_MX.ts +++ b/src/qt/locale/nyc3_es_MX.ts @@ -66,12 +66,12 @@ Direcciones de recibo - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Estas son tus direcciones de Bitcoin para enviar pagos. Siempre revisa el monto y la dirección de envío antes de enviar monedas. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Estas son tus direcciones de NYC3 para enviar pagos. Siempre revisa el monto y la dirección de envío antes de enviar monedas. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Estas son sus direcciones de Bitcoin para recibir pagos. Se recomienda utilizar una nueva dirección de recepción para cada transacción. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Estas son sus direcciones de NYC3 para recibir pagos. Se recomienda utilizar una nueva dirección de recepción para cada transacción. &Copy Address @@ -120,7 +120,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Firmar &mensaje @@ -187,7 +187,7 @@ Send coins to a NYC3 address - Enviar monedas a una dirección Bitcoin + Enviar monedas a una dirección NYC3 Backup wallet to another location @@ -210,8 +210,8 @@ &Verificar mensaje... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -361,8 +361,8 @@ Intro - Bitcoin - Bitcoin + NYC3 + NYC3 Error @@ -450,8 +450,8 @@ Mensaje: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Mensaje opcional para agregar a la solicitud de pago, el cual será mostrado cuando la solicitud este abierta. Nota: El mensaje no se manda con el pago a travéz de la red de Bitcoin. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Mensaje opcional para agregar a la solicitud de pago, el cual será mostrado cuando la solicitud este abierta. Nota: El mensaje no se manda con el pago a travéz de la red de NYC3. Use this form to request payments. All fields are <b>optional</b>. @@ -640,7 +640,7 @@ bitcoin-core NYC3 - nucleo Bitcoin + nucleo NYC3 Verifying blocks... diff --git a/src/qt/locale/nyc3_es_UY.ts b/src/qt/locale/nyc3_es_UY.ts index edd4fc8bd..873fc0e58 100644 --- a/src/qt/locale/nyc3_es_UY.ts +++ b/src/qt/locale/nyc3_es_UY.ts @@ -66,12 +66,12 @@ Direcciones de recepción - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Estás son tus direcciones de Bitcoin para enviar pagos. Verifica siempre el monto y la dirección de recepción antes de enviar monedas. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Estás son tus direcciones de NYC3 para enviar pagos. Verifica siempre el monto y la dirección de recepción antes de enviar monedas. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Estas son tus direcciones de Bitcoin para recibir pagos. Es recomendable usar una nueva dirección de recepción para cada transacción. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Estas son tus direcciones de NYC3 para recibir pagos. Es recomendable usar una nueva dirección de recepción para cada transacción. &Copy Address @@ -204,7 +204,7 @@ BanTableModel - BitcoinGUI + NYC3GUI Synchronizing with network... Sincronizando con la red... @@ -251,15 +251,15 @@ Send coins to a NYC3 address - Enviar monedas a una dirección Bitcoin + Enviar monedas a una dirección NYC3 Change the passphrase used for wallet encryption Cambie la clave utilizada para el cifrado del monedero - Bitcoin - Bitcoin + NYC3 + NYC3 &Show / Hide @@ -384,8 +384,8 @@ Intro - Bitcoin - Bitcoin + NYC3 + NYC3 Error diff --git a/src/qt/locale/nyc3_es_VE.ts b/src/qt/locale/nyc3_es_VE.ts index ddc9d0385..215ee95ff 100644 --- a/src/qt/locale/nyc3_es_VE.ts +++ b/src/qt/locale/nyc3_es_VE.ts @@ -62,12 +62,12 @@ Direcciones de recepción - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Estas son tus direcciones Bitcoin para realizar pagos. Verifica siempre el monto y la dirección de recepción antes de enviar monedas. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Estas son tus direcciones NYC3 para realizar pagos. Verifica siempre el monto y la dirección de recepción antes de enviar monedas. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Estas son tus direcciones Bitcoin para recibir pagos. Es recomendable usar una nueva dirección de recibo para cada transacción. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Estas son tus direcciones NYC3 para recibir pagos. Es recomendable usar una nueva dirección de recibo para cada transacción. &Copy Address @@ -170,7 +170,7 @@ BanTableModel - BitcoinGUI + NYC3GUI Sign &message... Firmar &mensaje... @@ -209,7 +209,7 @@ Send coins to a NYC3 address - Enviar monedas a una dirección Bitcoin + Enviar monedas a una dirección NYC3 Backup wallet to another location @@ -224,8 +224,8 @@ Abre la consola de depuración y diágnostico - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -248,12 +248,12 @@ Encriptar las llaves privadas que pertenecen a tu billetera - Sign messages with your Bitcoin addresses to prove you own them - Firma mensajes con tus direcciones Bitcoin para probar que eres dueño de ellas + Sign messages with your NYC3 addresses to prove you own them + Firma mensajes con tus direcciones NYC3 para probar que eres dueño de ellas - Verify messages to ensure they were signed with specified Bitcoin addresses - Verificar mensajes para asegurar que estaban firmados con direcciones Bitcoin especificas + Verify messages to ensure they were signed with specified NYC3 addresses + Verificar mensajes para asegurar que estaban firmados con direcciones NYC3 especificas &File @@ -491,8 +491,8 @@ Usa un directorio de datos personalizado: - Bitcoin - Bitcoin + NYC3 + NYC3 Error: Specified data directory "%1" cannot be created. diff --git a/src/qt/locale/nyc3_et.ts b/src/qt/locale/nyc3_et.ts index b049809af..67b520979 100644 --- a/src/qt/locale/nyc3_et.ts +++ b/src/qt/locale/nyc3_et.ts @@ -66,12 +66,12 @@ Vastuvõtvad aadressid - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Need on sinu Bitcoin aadressid maksete saatmiseks. Ennem müntide saatmist kontrolli alati summat ja makse saaja aadressi. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Need on sinu NYC3 aadressid maksete saatmiseks. Ennem müntide saatmist kontrolli alati summat ja makse saaja aadressi. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Need on sinu Bitcoin aadressid sisenevate maksete vastu võtmiseks. Soovitav on iga tehingu tarbeks kasutada uut aadressi. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Need on sinu NYC3 aadressid sisenevate maksete vastu võtmiseks. Soovitav on iga tehingu tarbeks kasutada uut aadressi. &Copy Address @@ -224,7 +224,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Signeeri &sõnum @@ -295,7 +295,7 @@ Send coins to a NYC3 address - Saada münte Bitcoini aadressile + Saada münte NYC3i aadressile Backup wallet to another location @@ -318,8 +318,8 @@ &Kontrolli sõnumit... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -342,12 +342,12 @@ Krüpteeri oma rahakoti privaatvõtmed - Sign messages with your Bitcoin addresses to prove you own them - Omandi tõestamiseks allkirjasta sõnumid oma Bitcoini aadressiga + Sign messages with your NYC3 addresses to prove you own them + Omandi tõestamiseks allkirjasta sõnumid oma NYC3i aadressiga - Verify messages to ensure they were signed with specified Bitcoin addresses - Kinnita sõnumid kindlustamaks et need allkirjastati määratud Bitcoini aadressiga + Verify messages to ensure they were signed with specified NYC3 addresses + Kinnita sõnumid kindlustamaks et need allkirjastati määratud NYC3i aadressiga &File @@ -378,8 +378,8 @@ Käsurea valikud - %n active connection(s) to Bitcoin network - %n aktiivne ühendus Bitcoini võrku%n aktiivset ühendust Bitcoini võrku + %n active connection(s) to NYC3 network + %n aktiivne ühendus NYC3i võrku%n aktiivset ühendust NYC3i võrku Indexing blocks on disk... @@ -627,7 +627,7 @@ The entered address "%1" is not a valid NYC3 address. - Sisestatud aadress "%1" ei ole korrektne Bitcoin aadress. + Sisestatud aadress "%1" ei ole korrektne NYC3 aadress. Could not unlock wallet. @@ -663,8 +663,8 @@ Teretulemast - Bitcoin - Bitcoin + NYC3 + NYC3 Error @@ -736,8 +736,8 @@ Ekspert - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Bitcoini kliendi pordi automaatne avamine ruuteris. Toimib, kui sinu ruuter aktsepteerib UPnP ühendust. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + NYC3i kliendi pordi automaatne avamine ruuteris. Toimib, kui sinu ruuter aktsepteerib UPnP ühendust. Map port using &UPnP @@ -835,7 +835,7 @@ Vorm - 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. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. Kuvatav info ei pruugi olla ajakohane. Ühenduse loomisel süngitakse sinu rahakott automaatselt Bitconi võrgustikuga, kuid see toiming on hetkel lõpetamata. @@ -1342,7 +1342,7 @@ Warning: Invalid NYC3 address - Hoiatus: Ebakorrektne Bitcoin aadress + Hoiatus: Ebakorrektne NYC3 aadress (no label) @@ -1426,7 +1426,7 @@ The NYC3 address to sign the message with - Bitcoin aadress millega sõnum allkirjastada + NYC3 aadress millega sõnum allkirjastada Choose previously used address @@ -1458,7 +1458,7 @@ Sign the message to prove you own this NYC3 address - Allkirjasta sõnum Bitcoini aadressi sulle kuulumise tõestamiseks + Allkirjasta sõnum NYC3i aadressi sulle kuulumise tõestamiseks Sign &Message @@ -1478,11 +1478,11 @@ The NYC3 address the message was signed with - Bitcoin aadress millega sõnum on allkirjastatud + NYC3 aadress millega sõnum on allkirjastatud Verify the message to ensure it was signed with the specified NYC3 address - Kinnita sõnum tõestamaks selle allkirjastatust määratud Bitcoini aadressiga. + Kinnita sõnum tõestamaks selle allkirjastatust määratud NYC3i aadressiga. Verify &Message @@ -1918,7 +1918,7 @@ bitcoin-core NYC3 - Bitcoini tuumik + NYC3i tuumik This is a pre-release test build - use at your own risk - do not use for mining or merchant applications diff --git a/src/qt/locale/nyc3_et_EE.ts b/src/qt/locale/nyc3_et_EE.ts index cad9e86b5..c31299bae 100644 --- a/src/qt/locale/nyc3_et_EE.ts +++ b/src/qt/locale/nyc3_et_EE.ts @@ -104,7 +104,7 @@ BanTableModel - BitcoinGUI + NYC3GUI Synchronizing with network... Võrguga sünkroniseerimine... @@ -130,8 +130,8 @@ Kõvakettal olevate plokkide reindekseerimine... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -261,8 +261,8 @@ Tere tulemast - Bitcoin - Bitcoin + NYC3 + NYC3 Error diff --git a/src/qt/locale/nyc3_eu_ES.ts b/src/qt/locale/nyc3_eu_ES.ts index 3e5db5a33..9b6406a69 100644 --- a/src/qt/locale/nyc3_eu_ES.ts +++ b/src/qt/locale/nyc3_eu_ES.ts @@ -66,12 +66,12 @@ Helbideak jasotzen - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Hauek dira zuk dirua jaso dezaketen Bitcoin helbideak. Egiaztatu beti diru-kopurua eta dirua jasoko duen helbidea zuzen egon daitezen, txanponak bidali baino lehen. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Hauek dira zuk dirua jaso dezaketen NYC3 helbideak. Egiaztatu beti diru-kopurua eta dirua jasoko duen helbidea zuzen egon daitezen, txanponak bidali baino lehen. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Hauek dira zure dirua jasotzeko Bitcoin helbideak. Gomendagarria da, operazio bakoitza helbide berri batekin egitea. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Hauek dira zure dirua jasotzeko NYC3 helbideak. Gomendagarria da, operazio bakoitza helbide berri batekin egitea. &Copy Address @@ -216,7 +216,7 @@ BanTableModel - BitcoinGUI + NYC3GUI Synchronizing with network... Sarearekin sinkronizatzen... diff --git a/src/qt/locale/nyc3_fa.ts b/src/qt/locale/nyc3_fa.ts index f0b5f5414..818da4c58 100644 --- a/src/qt/locale/nyc3_fa.ts +++ b/src/qt/locale/nyc3_fa.ts @@ -66,11 +66,11 @@ آدرس‌های دریافتی - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. این‌ها آدرس‌های بیتکوین برای پرداخت‌ها هستند. همیشه قبل از فرستادن سکه‌ها مقدار و آدرس دریافت‌کننده را بررسی نمایید. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. این‌ها آدرس‌های بیتکوین شما برای دریافت مبالغ می‌باشد. توصیه می‌شود برای هر تراکنش از یک آدرس جدید استفاده کنید. @@ -224,7 +224,7 @@ - BitcoinGUI + NYC3GUI Sign &message... &امضای پیام... @@ -342,7 +342,7 @@ با&زبینی پیام... - Bitcoin + NYC3 بیت‌کوین @@ -366,11 +366,11 @@ رمزنگاری کلیدهای خصوصی متعلق به کیف پول شما - Sign messages with your Bitcoin addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them برای اثبات اینکه پیام‌ها به شما تعلق دارند، آن‌ها را با نشانی بیت‌کوین خود امضا کنید - Verify messages to ensure they were signed with specified Bitcoin addresses + Verify messages to ensure they were signed with specified NYC3 addresses برای حصول اطمینان از اینکه پیام با نشانی بیت‌کوین مشخص شده امضا است یا خیر، پیام را شناسایی کنید @@ -410,7 +410,7 @@ گزینه‌های خط‌فرمان - %n active connection(s) to Bitcoin network + %n active connection(s) to NYC3 network %n ارتباط فعال با شبکهٔ بیت‌کوین%n ارتباط فعال با شبکهٔ بیت‌کوین @@ -735,7 +735,7 @@ استفاده از یک مسیر سفارشی: - Bitcoin + NYC3 بیت‌کوین @@ -836,7 +836,7 @@ استخراج - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. باز کردن خودکار درگاه شبکهٔ بیت‌کوین روی روترها. تنها زمانی کار می‌کند که روتر از پروتکل UPnP پشتیبانی کند و این پروتکل فعال باشد. @@ -939,7 +939,7 @@ فرم - 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. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. اطلاعات نمایش‌داده شده ممکن است قدیمی باشند. بعد از این که یک اتصال با شبکه برقرار شد، کیف پول شما به‌صورت خودکار با شبکهٔ بیت‌کوین همگام‌سازی می‌شود. اما این روند هنوز کامل نشده است. @@ -1850,7 +1850,7 @@ bitcoin-core NYC3 - هسته Bitcoin + هسته NYC3 Copyright (C) %i-%i diff --git a/src/qt/locale/nyc3_fa_IR.ts b/src/qt/locale/nyc3_fa_IR.ts index 1206e9850..d222a51db 100644 --- a/src/qt/locale/nyc3_fa_IR.ts +++ b/src/qt/locale/nyc3_fa_IR.ts @@ -66,11 +66,11 @@ آدرس‌های گیرنده - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. اینها آدرس‌های شما برای ارسال وجوه هستند. همیشه قبل از ارسال، مقدار و آدرس گیرنده را بررسی کنید. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. اینها آدرس‌های بیتکوین شما برای دریافت وجوه هستند. توصیه می‌شود برای هر دریافت از یک آدرس جدید استفاده کنید. @@ -236,7 +236,7 @@ - BitcoinGUI + NYC3GUI Sign &message... ثبت &پیام @@ -358,7 +358,7 @@ تایید پیام - Bitcoin + NYC3 بیت کوین @@ -382,11 +382,11 @@ رمزنگاری کلیدهای شخصی متعلق به کیف‌پول - Sign messages with your Bitcoin addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them پیام‌ها را با آدرس بیت‌کوین خود امضا کنید تا مالکیت آن‌ها را اثبات کنید - Verify messages to ensure they were signed with specified Bitcoin addresses + Verify messages to ensure they were signed with specified NYC3 addresses پیام‌ها را تائید کنید تا از امضاشدن آن‌ها با آدرس بیت‌کوین مطمئن شوید @@ -426,7 +426,7 @@ گزینه های خط فرمان - %n active connection(s) to Bitcoin network + %n active connection(s) to NYC3 network %n ارتباط فعال به شبکه بیت‌کوین%n ارتباط فعال به شبکه بیت‌کوین @@ -538,7 +538,7 @@ wallet رمزگذاری شد و در حال حاضر قفل است - A fatal error occurred. Bitcoin can no longer continue safely and will quit. + A fatal error occurred. NYC3 can no longer continue safely and will quit. خطای بحرانی رخ داده است. بیتکوین دیگر به صورت ایمن قادر به ادامه دادن نمی‌باشد و خارج خواهد شد. @@ -753,7 +753,7 @@ استفاده کردن از پوشه داده مخصوص: - Bitcoin + NYC3 بیت کوین @@ -899,7 +899,7 @@ شبکه Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. اتصال به شبکه بیت کوین با استفاده از پراکسی SOCKS5 برای استفاده از سرویس مخفی تور @@ -978,7 +978,7 @@ فرم - 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. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. اطلاعات نمایش داده شده ممکن است روزآمد نباشد. wallet شما به صورت خودکار بعد از برقراری اتصال با شبکه bitcoin به روز می شود اما این فرایند هنوز تکمیل نشده است. diff --git a/src/qt/locale/nyc3_fi.ts b/src/qt/locale/nyc3_fi.ts index 2b5838bce..fe2cfded3 100644 --- a/src/qt/locale/nyc3_fi.ts +++ b/src/qt/locale/nyc3_fi.ts @@ -66,12 +66,12 @@ Vastaanotto-osoitteet - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Nämä ovat Bitcoin-osoitteesi maksujen lähettämistä varten. Tarkista aina määrä ja vastaanotto-osoite ennen kolikoiden lähettämistä. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Nämä ovat NYC3-osoitteesi maksujen lähettämistä varten. Tarkista aina määrä ja vastaanotto-osoite ennen kolikoiden lähettämistä. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Tässä ovat Bitcoin vastaanotto-osoitteesi. On suositeltavaa käyttää uutta vastaanotto-osoitetta jokaista lähetystä varten. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Tässä ovat NYC3 vastaanotto-osoitteesi. On suositeltavaa käyttää uutta vastaanotto-osoitetta jokaista lähetystä varten. &Copy Address @@ -240,7 +240,7 @@ - BitcoinGUI + NYC3GUI Sign &message... &Allekirjoita viesti... @@ -343,7 +343,7 @@ Send coins to a NYC3 address - Lähetä kolikoita Bitcoin-osoitteeseen + Lähetä kolikoita NYC3-osoitteeseen Backup wallet to another location @@ -366,8 +366,8 @@ Varmista &viesti... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -383,19 +383,19 @@ Show or hide the main Window - Näytä tai piilota Bitcoin-ikkuna + Näytä tai piilota NYC3-ikkuna Encrypt the private keys that belong to your wallet Suojaa yksityiset avaimet, jotka kuuluvat lompakkoosi - Sign messages with your Bitcoin addresses to prove you own them - Allekirjoita viestisi omalla Bitcoin -osoitteellasi todistaaksesi, että omistat ne + Sign messages with your NYC3 addresses to prove you own them + Allekirjoita viestisi omalla NYC3 -osoitteellasi todistaaksesi, että omistat ne - Verify messages to ensure they were signed with specified Bitcoin addresses - Varmista, että viestisi on allekirjoitettu määritetyllä Bitcoin -osoitteella + Verify messages to ensure they were signed with specified NYC3 addresses + Varmista, että viestisi on allekirjoitettu määritetyllä NYC3 -osoitteella &File @@ -434,8 +434,8 @@ &Komentorivin valinnat - %n active connection(s) to Bitcoin network - %n aktiivinen yhteys Bitcoin-verkkoon%n aktiivista yhteyttä Bitcoin-verkkoon + %n active connection(s) to NYC3 network + %n aktiivinen yhteys NYC3-verkkoon%n aktiivista yhteyttä NYC3-verkkoon Indexing blocks on disk... @@ -478,8 +478,8 @@ Rahansiirtohistoria on ajan tasalla - Show the %1 help message to get a list with possible Bitcoin command-line options - Näytä %1 ohjeet saadaksesi listan mahdollisista Bitcoinin komentorivivalinnoista + Show the %1 help message to get a list with possible NYC3 command-line options + Näytä %1 ohjeet saadaksesi listan mahdollisista NYC3in komentorivivalinnoista default wallet @@ -578,8 +578,8 @@ Lompakko on <b>salattu</b> ja tällä hetkellä <b>lukittuna</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Peruuttamaton virhe on tapahtunut. Bitcoin ei voi enää jatkaa turvallisesti ja sammutetaan. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Peruuttamaton virhe on tapahtunut. NYC3 ei voi enää jatkaa turvallisesti ja sammutetaan. @@ -769,7 +769,7 @@ The entered address "%1" is not a valid NYC3 address. - Antamasi osoite "%1" ei ole kelvollinen Bitcoin-osoite. + Antamasi osoite "%1" ei ole kelvollinen NYC3-osoite. Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -865,8 +865,8 @@ Määritä oma kansio: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -877,8 +877,8 @@ Noin %1 GB tietoa varastoidaan tähän hakemistoon. - %1 will download and store a copy of the Bitcoin block chain. - %1 lataa ja tallentaa kopion Bitcoinin lohkoketjusta. + %1 will download and store a copy of the NYC3 block chain. + %1 lataa ja tallentaa kopion NYC3in lohkoketjusta. The wallet will also be stored in this directory. @@ -1086,8 +1086,8 @@ &Käytä varmistamattomia vaihtorahoja - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Avaa Bitcoin-asiakasohjelman portti reitittimellä automaattisesti. Tämä toimii vain, jos reitittimesi tukee UPnP:tä ja se on käytössä. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Avaa NYC3-asiakasohjelman portti reitittimellä automaattisesti. Tämä toimii vain, jos reitittimesi tukee UPnP:tä ja se on käytössä. Map port using &UPnP @@ -1102,8 +1102,8 @@ Hyväksy sisääntulevia yhteyksiä - Connect to the Bitcoin network through a SOCKS5 proxy. - Yhdistä Bitcoin-verkkoon SOCKS5-välityspalvelimen kautta. + Connect to the NYC3 network through a SOCKS5 proxy. + Yhdistä NYC3-verkkoon SOCKS5-välityspalvelimen kautta. &Connect through SOCKS5 proxy (default proxy): @@ -1138,8 +1138,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Yhdistä Bitcoin-verkkoon erillisen SOCKS5-välityspalvelimen kautta piilotettuja Tor-palveluja varten. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Yhdistä NYC3-verkkoon erillisen SOCKS5-välityspalvelimen kautta piilotettuja Tor-palveluja varten. &Window @@ -1245,8 +1245,8 @@ Lomake - 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. - 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. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Näytetyt tiedot eivät välttämättä ole ajantasalla. Lompakkosi synkronoituu NYC3-verkon kanssa automaattisesti yhteyden muodostamisen jälkeen, mutta synkronointi on vielä meneillään. Watch-only: @@ -1286,7 +1286,7 @@ Your current total balance - Tililläsi tällä hetkellä olevien Bitcoinien määrä + Tililläsi tällä hetkellä olevien NYC3ien määrä Your current balance in watch-only addresses @@ -1321,7 +1321,7 @@ Cannot start bitcoin: click-to-pay handler - Bitcoinia ei voi käynnistää: klikkaa-maksaaksesi -käsittelijän virhe + NYC3ia ei voi käynnistää: klikkaa-maksaaksesi -käsittelijän virhe URI handling @@ -1341,7 +1341,7 @@ URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - URIa ei voitu jäsentää! Tämä voi johtua virheellisestä Bitcoin-osoitteesta tai väärin muotoilluista URI parametreista. + URIa ei voitu jäsentää! Tämä voi johtua virheellisestä NYC3-osoitteesta tai väärin muotoilluista URI parametreista. Payment request file handling @@ -1443,7 +1443,7 @@ Enter a NYC3 address (e.g. %1) - Syötä Bitcoin-osoite (esim. %1) + Syötä NYC3-osoite (esim. %1) %1 d @@ -1874,8 +1874,8 @@ &Viesti: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Valinnainen viesti liitetään maksupyyntöön ja näytetään avattaessa. Viestiä ei lähetetä Bitcoin-verkkoon. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Valinnainen viesti liitetään maksupyyntöön ja näytetään avattaessa. Viestiä ei lähetetä NYC3-verkkoon. An optional label to associate with the new receiving address. @@ -2280,7 +2280,7 @@ Warning: Invalid NYC3 address - Varoitus: Virheellinen Bitcoin-osoite + Varoitus: Virheellinen NYC3-osoite Warning: Unknown change address @@ -2323,7 +2323,7 @@ The NYC3 address to send the payment to - Bitcoin-osoite johon maksu lähetetään + NYC3-osoite johon maksu lähetetään Alt+A @@ -2370,8 +2370,8 @@ Aseta nimi tälle osoitteelle lisätäksesi sen käytettyjen osoitteiden listalle. - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Viesti joka liitettiin bitcoin: URI:iin tallennetaan rahansiirtoon viitteeksi. Tätä viestiä ei lähetetä Bitcoin-verkkoon. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Viesti joka liitettiin bitcoin: URI:iin tallennetaan rahansiirtoon viitteeksi. Tätä viestiä ei lähetetä NYC3-verkkoon. Pay To: @@ -2420,7 +2420,7 @@ The NYC3 address to sign the message with - Bitcoin-osoite jolla viesti allekirjoitetaan + NYC3-osoite jolla viesti allekirjoitetaan Choose previously used address @@ -2452,7 +2452,7 @@ Sign the message to prove you own this NYC3 address - Allekirjoita viesti todistaaksesi, että omistat tämän Bitcoin-osoitteen + Allekirjoita viesti todistaaksesi, että omistat tämän NYC3-osoitteen Sign &Message @@ -2476,11 +2476,11 @@ The NYC3 address the message was signed with - Bitcoin-osoite jolla viesti on allekirjoitettu + NYC3-osoite jolla viesti on allekirjoitettu Verify the message to ensure it was signed with the specified NYC3 address - Tarkista viestin allekirjoitus varmistaaksesi, että se allekirjoitettiin tietyllä Bitcoin-osoitteella + Tarkista viestin allekirjoitus varmistaaksesi, että se allekirjoitettiin tietyllä NYC3-osoitteella Verify &Message @@ -3128,7 +3128,7 @@ NYC3 - Bitcoin-ydin + NYC3-ydin The %s developers diff --git a/src/qt/locale/nyc3_fr.ts b/src/qt/locale/nyc3_fr.ts index ac38d85f7..f2be7e707 100644 --- a/src/qt/locale/nyc3_fr.ts +++ b/src/qt/locale/nyc3_fr.ts @@ -66,12 +66,12 @@ Adresses de réception - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Voici vos adresses Bitcoin pour envoyer des paiements. Vérifiez toujours le montant et l’adresse du destinataire avant d’envoyer des pièces. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Voici vos adresses NYC3 pour envoyer des paiements. Vérifiez toujours le montant et l’adresse du destinataire avant d’envoyer des pièces. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Voici vos adresses Bitcoin pour recevoir des paiements. Il est recommandé d’utiliser une nouvelle adresse de réception pour chaque transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Voici vos adresses NYC3 pour recevoir des paiements. Il est recommandé d’utiliser une nouvelle adresse de réception pour chaque transaction. &Copy Address @@ -240,7 +240,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Signer un &message... @@ -343,7 +343,7 @@ Send coins to a NYC3 address - Envoyer des pièces à une adresse Bitcoin + Envoyer des pièces à une adresse NYC3 Backup wallet to another location @@ -366,8 +366,8 @@ &Vérifier un message... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -390,12 +390,12 @@ Chiffrer les clés privées qui appartiennent à votre porte-monnaie - Sign messages with your Bitcoin addresses to prove you own them - Signer les messages avec vos adresses Bitcoin pour prouver que vous les détenez + Sign messages with your NYC3 addresses to prove you own them + Signer les messages avec vos adresses NYC3 pour prouver que vous les détenez - Verify messages to ensure they were signed with specified Bitcoin addresses - Vérifier les messages pour s’assurer qu’ils ont été signés avec les adresses Bitcoin indiquées + Verify messages to ensure they were signed with specified NYC3 addresses + Vérifier les messages pour s’assurer qu’ils ont été signés avec les adresses NYC3 indiquées &File @@ -434,8 +434,8 @@ Options de ligne de &commande - %n active connection(s) to Bitcoin network - %n connexion active avec le réseau Bitcoin%n connexions actives avec le réseau Bitcoin + %n active connection(s) to NYC3 network + %n connexion active avec le réseau NYC3%n connexions actives avec le réseau NYC3 Indexing blocks on disk... @@ -502,8 +502,8 @@ Fermer le porte-monnaie - Show the %1 help message to get a list with possible Bitcoin command-line options - Afficher le message d’aide de %1 pour obtenir la liste des options de ligne de commande Bitcoin possibles. + Show the %1 help message to get a list with possible NYC3 command-line options + Afficher le message d’aide de %1 pour obtenir la liste des options de ligne de commande NYC3 possibles. default wallet @@ -614,8 +614,8 @@ Le porte-monnaie est <b>chiffré</b> et actuellement <b>verrouillé</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Une erreur fatale est survenue. Bitcoin ne peut plus continuer en toute sécurité et va s’arrêter. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Une erreur fatale est survenue. NYC3 ne peut plus continuer en toute sécurité et va s’arrêter. @@ -805,7 +805,7 @@ The entered address "%1" is not a valid NYC3 address. - L’adresse saisie « %1 » n’est pas une adresse Bitcoin valide. + L’adresse saisie « %1 » n’est pas une adresse NYC3 valide. Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -901,8 +901,8 @@ Utiliser un répertoire de données personnalisé : - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -913,8 +913,8 @@ Approximativement %1 Go de données seront stockés dans ce répertoire. - %1 will download and store a copy of the Bitcoin block chain. - %1 téléchargera et stockera une copie de la chaîne de blocs Bitcoin. + %1 will download and store a copy of the NYC3 block chain. + %1 téléchargera et stockera une copie de la chaîne de blocs NYC3. The wallet will also be stored in this directory. @@ -945,7 +945,7 @@ Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below. - Les transactions récentes ne sont peut-être pas encore visibles et par conséquent le solde de votre porte-monnaie est peut-être erroné. Ces informations seront justes quand votre porte-monnaie aura fini de se synchroniser avec le réseau Bitcoin, comme décrit ci-dessous. + Les transactions récentes ne sont peut-être pas encore visibles et par conséquent le solde de votre porte-monnaie est peut-être erroné. Ces informations seront justes quand votre porte-monnaie aura fini de se synchroniser avec le réseau NYC3, comme décrit ci-dessous. Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network. @@ -1130,8 +1130,8 @@ &Dépenser la monnaie non confirmée - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Ouvrir automatiquement le port du client Bitcoin sur le routeur. Cela ne fonctionne que si votre routeur prend en charge l’UPnP et si la fonction est activée. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Ouvrir automatiquement le port du client NYC3 sur le routeur. Cela ne fonctionne que si votre routeur prend en charge l’UPnP et si la fonction est activée. Map port using &UPnP @@ -1146,8 +1146,8 @@ Permettre les connexions e&ntrantes - Connect to the Bitcoin network through a SOCKS5 proxy. - Se connecter au réseau Bitcoin par un mandataire SOCKS5. + Connect to the NYC3 network through a SOCKS5 proxy. + Se connecter au réseau NYC3 par un mandataire SOCKS5. &Connect through SOCKS5 proxy (default proxy): @@ -1182,8 +1182,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Se connecter au réseau Bitcoin au travers d’un mandataire SOCKS5 séparé pour les services cachés de Tor. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Se connecter au réseau NYC3 au travers d’un mandataire SOCKS5 séparé pour les services cachés de Tor. &Window @@ -1293,8 +1293,8 @@ Formulaire - 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. - Les informations affichées peuvent être obsolètes. Votre porte-monnaie se synchronise automatiquement avec le réseau Bitcoin dès qu’une connexion est établie, mais ce processus n’est pas encore achevé. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Les informations affichées peuvent être obsolètes. Votre porte-monnaie se synchronise automatiquement avec le réseau NYC3 dès qu’une connexion est établie, mais ce processus n’est pas encore achevé. Watch-only: @@ -1397,7 +1397,7 @@ URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - L’URI ne peut pas être analysée ! Cela peut être causé par une adresse Bitcoin invalide ou par des paramètres d’URI mal formés. + L’URI ne peut pas être analysée ! Cela peut être causé par une adresse NYC3 invalide ou par des paramètres d’URI mal formés. Payment request file handling @@ -1499,7 +1499,7 @@ Enter a NYC3 address (e.g. %1) - Saisir une adresse Bitcoin (p. ex. %1) + Saisir une adresse NYC3 (p. ex. %1) %1 d @@ -1954,8 +1954,8 @@ M&essage : - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Un message facultatif à joindre à la demande de paiement et qui sera affiché à l’ouverture de celle-ci. Note : Le message ne sera pas envoyé avec le paiement par le réseau Bitcoin. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Un message facultatif à joindre à la demande de paiement et qui sera affiché à l’ouverture de celle-ci. Note : Le message ne sera pas envoyé avec le paiement par le réseau NYC3. An optional label to associate with the new receiving address. @@ -2384,7 +2384,7 @@ Note : Les frais étant calculés par octet, des frais de « 100 satoshis par Warning: Invalid NYC3 address - Avertissement : L’adresse Bitcoin est invalide + Avertissement : L’adresse NYC3 est invalide Warning: Unknown change address @@ -2427,7 +2427,7 @@ Note : Les frais étant calculés par octet, des frais de « 100 satoshis par The NYC3 address to send the payment to - L’adresse Bitcoin à laquelle envoyer le paiement + L’adresse NYC3 à laquelle envoyer le paiement Alt+A @@ -2474,8 +2474,8 @@ Note : Les frais étant calculés par octet, des frais de « 100 satoshis par Saisir une étiquette pour cette adresse afin de l’ajouter à la liste d’adresses utilisées - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Un message qui était joint à l’URI bitcoin: et qui sera stocké avec la transaction pour référence. Note : Ce message ne sera pas envoyé par le réseau Bitcoin. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Un message qui était joint à l’URI bitcoin: et qui sera stocké avec la transaction pour référence. Note : Ce message ne sera pas envoyé par le réseau NYC3. Pay To: @@ -2524,7 +2524,7 @@ Note : Les frais étant calculés par octet, des frais de « 100 satoshis par The NYC3 address to sign the message with - L’adresse Bitcoin avec laquelle signer le message + L’adresse NYC3 avec laquelle signer le message Choose previously used address @@ -2556,7 +2556,7 @@ Note : Les frais étant calculés par octet, des frais de « 100 satoshis par Sign the message to prove you own this NYC3 address - Signer le message afin de prouver que vous détenez cette adresse Bitcoin + Signer le message afin de prouver que vous détenez cette adresse NYC3 Sign &Message @@ -2580,11 +2580,11 @@ Note : Les frais étant calculés par octet, des frais de « 100 satoshis par The NYC3 address the message was signed with - L’adresse Bitcoin avec laquelle le message a été signé + L’adresse NYC3 avec laquelle le message a été signé Verify the message to ensure it was signed with the specified NYC3 address - Vérifier le message pour s’assurer qu’il a été signé avec l’adresse Bitcoin indiquée + Vérifier le message pour s’assurer qu’il a été signé avec l’adresse NYC3 indiquée Verify &Message diff --git a/src/qt/locale/nyc3_fr_CA.ts b/src/qt/locale/nyc3_fr_CA.ts index 8dd7dc557..244c7ab22 100644 --- a/src/qt/locale/nyc3_fr_CA.ts +++ b/src/qt/locale/nyc3_fr_CA.ts @@ -36,7 +36,7 @@ BanTableModel - BitcoinGUI + NYC3GUI CoinControlDialog diff --git a/src/qt/locale/nyc3_fr_FR.ts b/src/qt/locale/nyc3_fr_FR.ts index cb489a34c..e9a7c6e27 100644 --- a/src/qt/locale/nyc3_fr_FR.ts +++ b/src/qt/locale/nyc3_fr_FR.ts @@ -66,12 +66,12 @@ Adresses de réception - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Ceci sont vos addresses Bitcoin pour envoyer vos paiements. Il faut toujours verifier les montants et l'addresse de reception avant de valider la transaction. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Ceci sont vos addresses NYC3 pour envoyer vos paiements. Il faut toujours verifier les montants et l'addresse de reception avant de valider la transaction. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Ceci sont vos addresses Bitcoin pour recevoir vos paiements. Il est recommandé d'utiliser une nouvelle adresse de recepetion pour chaque transaction + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Ceci sont vos addresses NYC3 pour recevoir vos paiements. Il est recommandé d'utiliser une nouvelle adresse de recepetion pour chaque transaction &Copy Address @@ -236,7 +236,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Signer un &message... @@ -339,7 +339,7 @@ Send coins to a NYC3 address - Envoyer des pièces à une adresse Bitcoin + Envoyer des pièces à une adresse NYC3 Backup wallet to another location @@ -362,8 +362,8 @@ &Vérification du message - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -386,12 +386,12 @@ Crypter les clé privées qui appartiennent votre portefeuille - Sign messages with your Bitcoin addresses to prove you own them - Signer vos messages avec vos adresses Bitcoin pour prouver que vous les détenez + Sign messages with your NYC3 addresses to prove you own them + Signer vos messages avec vos adresses NYC3 pour prouver que vous les détenez - Verify messages to ensure they were signed with specified Bitcoin addresses - Vérifier les messages pour s'assurer qu'ils soient signés avec les adresses Bitcoin spécifiées + Verify messages to ensure they were signed with specified NYC3 addresses + Vérifier les messages pour s'assurer qu'ils soient signés avec les adresses NYC3 spécifiées &File @@ -430,8 +430,8 @@ &Options de ligne de commande - %n active connection(s) to Bitcoin network - %n connexion active avec le réseau Bitcoin%n connexions actives avec le réseau Bitcoin + %n active connection(s) to NYC3 network + %n connexion active avec le réseau NYC3%n connexions actives avec le réseau NYC3 Indexing blocks on disk... @@ -470,8 +470,8 @@ À jour - Show the %1 help message to get a list with possible Bitcoin command-line options - Afficher le %1 message d'aide pour récupérer une liste des options de ligne de commande Bitcoin + Show the %1 help message to get a list with possible NYC3 command-line options + Afficher le %1 message d'aide pour récupérer une liste des options de ligne de commande NYC3 default wallet @@ -554,8 +554,8 @@ Le porte-monnaie est <b>chiffré</b> et est actuellement <b>verrouillé</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Une erreur fatale a eu lieu. Bitcoin ne peut plus continuer en toute sécurité et va s'éteindre + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Une erreur fatale a eu lieu. NYC3 ne peut plus continuer en toute sécurité et va s'éteindre @@ -745,7 +745,7 @@ The entered address "%1" is not a valid NYC3 address. - L'adresse entrée "%1" n'est pas une adresse Bitcoin valide. + L'adresse entrée "%1" n'est pas une adresse NYC3 valide. Could not unlock wallet. @@ -817,8 +817,8 @@ Utiliser votre propre répertoire - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -910,8 +910,8 @@ Expert - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Ouvrir le port du client Bitcoin automatiquement sur le routeur. Cela ne fonctionne que si votre routeur supporte l'UPnP et si la fonctionnalité est activée. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Ouvrir le port du client NYC3 automatiquement sur le routeur. Cela ne fonctionne que si votre routeur supporte l'UPnP et si la fonctionnalité est activée. Map port using &UPnP @@ -1111,7 +1111,7 @@ Enter a NYC3 address (e.g. %1) - Entrer une adresse Bitcoin (e.g. %1) + Entrer une adresse NYC3 (e.g. %1) %1 d @@ -1672,7 +1672,7 @@ Warning: Invalid NYC3 address - Attention: Adresse Bitcoin Invalide + Attention: Adresse NYC3 Invalide (no label) diff --git a/src/qt/locale/nyc3_gl.ts b/src/qt/locale/nyc3_gl.ts index 211040ba0..5f2349079 100644 --- a/src/qt/locale/nyc3_gl.ts +++ b/src/qt/locale/nyc3_gl.ts @@ -68,7 +68,7 @@ BanTableModel - BitcoinGUI + NYC3GUI Sign &message... &Asinar mensaxe... @@ -131,7 +131,7 @@ Send coins to a NYC3 address - Enviar moedas a unha dirección Bitcoin + Enviar moedas a unha dirección NYC3 Backup wallet to another location @@ -154,8 +154,8 @@ &Verificar mensaxe... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -178,12 +178,12 @@ Encriptar as claves privadas que pertencen ao teu moedeiro - Sign messages with your Bitcoin addresses to prove you own them - Asina mensaxes coas túas direccións Bitcoin para probar que te pertencen + Sign messages with your NYC3 addresses to prove you own them + Asina mensaxes coas túas direccións NYC3 para probar que te pertencen - Verify messages to ensure they were signed with specified Bitcoin addresses - Verificar mensaxes para asegurar que foron asinados con direccións Bitcoin dadas. + Verify messages to ensure they were signed with specified NYC3 addresses + Verificar mensaxes para asegurar que foron asinados con direccións NYC3 dadas. &File @@ -397,8 +397,8 @@ Empregar un directorio de datos personalizado - Bitcoin - Bitcoin + NYC3 + NYC3 Error @@ -462,8 +462,8 @@ Moedeiro - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Abrir automáticamente o porto do cliente Bitcoin no router. Esto so funciona se o teu router soporta UPnP e está habilitado. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Abrir automáticamente o porto do cliente NYC3 no router. Esto so funciona se o teu router soporta UPnP e está habilitado. Map port using &UPnP @@ -545,8 +545,8 @@ Formulario - 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. - A información amosada por estar desactualizada. O teu moedeiro sincronízase automáticamente coa rede Bitcoin despois de que se estableza unha conexión, pero este proceso non está todavía rematado. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + A información amosada por estar desactualizada. O teu moedeiro sincronízase automáticamente coa rede NYC3 despois de que se estableza unha conexión, pero este proceso non está todavía rematado. Your current spendable balance @@ -920,7 +920,7 @@ Sign the message to prove you own this NYC3 address - Asina a mensaxe para probar que posees esta dirección Bitcoin + Asina a mensaxe para probar que posees esta dirección NYC3 Sign &Message @@ -940,7 +940,7 @@ Verify the message to ensure it was signed with the specified NYC3 address - Verificar a mensaxe para asegurar que foi asinada coa dirección Bitcoin especificada + Verificar a mensaxe para asegurar que foi asinada coa dirección NYC3 especificada Verify &Message @@ -1000,7 +1000,7 @@ bitcoin-core NYC3 - Core de Bitcoin + Core de NYC3 Corrupted block database detected diff --git a/src/qt/locale/nyc3_he.ts b/src/qt/locale/nyc3_he.ts index 4847684d7..555f6ca7f 100644 --- a/src/qt/locale/nyc3_he.ts +++ b/src/qt/locale/nyc3_he.ts @@ -66,11 +66,11 @@ כתובות לקבלה - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. אלו הן כתובות הביטקוין שלך לשליחת תשלומים. חשוב לבדוק את הסכום ואת הכתובת המקבלת לפני שליחת מטבעות. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. אלו הן כתובות הביטקוין שלך לקבלת תשלומים. מומלץ להשתמש בכתובת חדשה לכל העברה. @@ -236,7 +236,7 @@ - BitcoinGUI + NYC3GUI Sign &message... &חתימה על הודעה… @@ -362,7 +362,7 @@ &אימות הודעה… - Bitcoin + NYC3 ביטקוין @@ -386,11 +386,11 @@ הצפנת המפתחות הפרטיים ששייכים לארנק שלך - Sign messages with your Bitcoin addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them חתום על הודעות עם כתובות הביטקוין שלך כדי להוכיח שהן בבעלותך - Verify messages to ensure they were signed with specified Bitcoin addresses + Verify messages to ensure they were signed with specified NYC3 addresses אמת הודעות כדי להבטיח שהן נחתמו עם כתובת ביטקוין מסוימות @@ -430,7 +430,7 @@ אפשרויות &שורת הפקודה - %n active connection(s) to Bitcoin network + %n active connection(s) to NYC3 network חיבור אחד פעיל לרשת ביטקוין%n חיבורים פעילים לרשת ביטקוין%n חיבורים פעילים לרשת ביטקוין%n חיבורים פעילים לרשת ביטקוין @@ -470,7 +470,7 @@ עדכני - Show the %1 help message to get a list with possible Bitcoin command-line options + Show the %1 help message to get a list with possible NYC3 command-line options יש להציג את הודעת העזרה של %1 כדי להציג רשימה עם אפשרויות שורת פקודה לביטקוין @@ -554,7 +554,7 @@ הארנק <b>מוצפן</b> ו<b>נעול</b> כרגע - A fatal error occurred. Bitcoin can no longer continue safely and will quit. + A fatal error occurred. NYC3 can no longer continue safely and will quit. אירעה שגיאה חמורה. אין אפשרות להשתמש עוד בביטקוין באופן מאובטח והיישום ייסגר. @@ -841,7 +841,7 @@ שימוש בתיקיית נתונים מותאמת אישית: - Bitcoin + NYC3 ביטקוין @@ -853,7 +853,7 @@ מידע בנפח של כ-%1 ג׳יגה-בייט יאוחסן בתיקייה זו. - %1 will download and store a copy of the Bitcoin block chain. + %1 will download and store a copy of the NYC3 block chain. %1 תוריד ותאחסן עותק של שרשרת הבלוקים של ביטקוין. @@ -1054,7 +1054,7 @@ עודף &בלתי מאושר מההשקעה - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. פתיחת הפתחה של ביטקוין בנתב באופן אוטומטי. עובד רק אם UPnP מופעל ונתמך בנתב. @@ -1070,7 +1070,7 @@ לאפשר חיבורים &נכנסים - Connect to the Bitcoin network through a SOCKS5 proxy. + Connect to the NYC3 network through a SOCKS5 proxy. התחבר לרשת הביטקוין דרך פרוקסי SOCKS5. @@ -1106,7 +1106,7 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. התחברות לרשת ביטקוין דרך מתווך SOCKS5 נפרד לשירותי Tor נסתרים. @@ -1209,7 +1209,7 @@ טופס - 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. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. המידע המוצג עשוי להיות מיושן. הארנק שלך מסתנכרן באופן אוטומטי עם רשת הביטקוין לאחר יצירת החיבור, אך התהליך טרם הסתיים. @@ -1842,7 +1842,7 @@ הו&דעה: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. הודעת רשות לצירוף לבקשת התשלום שתוצג בעת פתיחת הבקשה. לתשומת לבך: ההודעה לא תישלח עם התשלום ברשת ביטקוין. @@ -2338,7 +2338,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p יש להזין תווית עבור כתובת זו כדי להוסיף אותה לרשימת הכתובות בשימוש - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. הודעה שצורפה לביטקוין: כתובת שתאוחסן בהעברה לצורך מעקב מצדך. לתשומת לבך: הודעה זו לא תישלח ברשת הביטקוין. diff --git a/src/qt/locale/nyc3_hi_IN.ts b/src/qt/locale/nyc3_hi_IN.ts index 4da7af156..41f8f86a2 100644 --- a/src/qt/locale/nyc3_hi_IN.ts +++ b/src/qt/locale/nyc3_hi_IN.ts @@ -62,11 +62,11 @@ पतों को प्राप्त कर रहा है - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. ये भुगतान भेजने के लिए ये आपके बिटकॉइन पते हैं। हमेशा सिक्के भेजने से पहले राशि और प्राप्तकर्ता पते की जांच करें। - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. भुगतान प्राप्त करने के लिए ये आपके बीटकोइन पते हैं प्रत्येक लेनदेन के लिए एक नया प्राप्त पता उपयोग करने की सिफारिश की जाती है। @@ -140,7 +140,7 @@ BanTableModel - BitcoinGUI + NYC3GUI Synchronizing with network... नेटवर्क से समकालिक (मिल) रहा है ... @@ -183,7 +183,7 @@ पहचान शब्द/अक्षर जो वॉलेट एनक्रिपशन के लिए इस्तेमाल किया है उसे बदलिए! - Bitcoin + NYC3 बीटकोइन @@ -290,7 +290,7 @@ Intro - Bitcoin + NYC3 बीटकोइन diff --git a/src/qt/locale/nyc3_hr.ts b/src/qt/locale/nyc3_hr.ts index ba56ef8a5..2f3e9aff8 100644 --- a/src/qt/locale/nyc3_hr.ts +++ b/src/qt/locale/nyc3_hr.ts @@ -66,12 +66,12 @@ Adrese primatelja - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Ovo su vaše Bitcoin adrese za slanje novca. Uvijek provjerite iznos i adresu primatelja prije slanja novca. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Ovo su vaše NYC3 adrese za slanje novca. Uvijek provjerite iznos i adresu primatelja prije slanja novca. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Ovo su vaše Bitcoin adrese za primanje novca. Preporučeno je da koristite novu primateljsku adresu za svaku transakciju. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Ovo su vaše NYC3 adrese za primanje novca. Preporučeno je da koristite novu primateljsku adresu za svaku transakciju. &Copy Address @@ -236,7 +236,7 @@ - BitcoinGUI + NYC3GUI Sign &message... P&otpišite poruku... @@ -339,7 +339,7 @@ Send coins to a NYC3 address - Pošaljite novac na Bitcoin adresu + Pošaljite novac na NYC3 adresu Backup wallet to another location @@ -362,8 +362,8 @@ &Potvrdite poruku... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -386,12 +386,12 @@ Šifrirajte privatne ključeve u novčaniku - Sign messages with your Bitcoin addresses to prove you own them - Poruku potpišemo s Bitcoin adresom, kako bi dokazali vlasništvo nad tom adresom + Sign messages with your NYC3 addresses to prove you own them + Poruku potpišemo s NYC3 adresom, kako bi dokazali vlasništvo nad tom adresom - Verify messages to ensure they were signed with specified Bitcoin addresses - Provjerite poruku da je potpisana s navedenom Bitcoin adresom + Verify messages to ensure they were signed with specified NYC3 addresses + Provjerite poruku da je potpisana s navedenom NYC3 adresom &File @@ -430,8 +430,8 @@ Opcije &naredbene linije - %n active connection(s) to Bitcoin network - %n aktivna veza na Bitcoin mrežu%n aktivnih veza na Bitcoin mrežu%n aktivnih veza na Bitcoin mrežu + %n active connection(s) to NYC3 network + %n aktivna veza na NYC3 mrežu%n aktivnih veza na NYC3 mrežu%n aktivnih veza na NYC3 mrežu Indexing blocks on disk... @@ -474,7 +474,7 @@ Ažurno - Show the %1 help message to get a list with possible Bitcoin command-line options + Show the %1 help message to get a list with possible NYC3 command-line options Prikažite pomoć programa %1 kako biste ispisali moguće opcije preko terminala @@ -557,8 +557,8 @@ Novčanik je <b>šifriran</b> i trenutno <b>zaključan</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Dogodila se kobna greška. Bitcoin ne može više sigurno nastaviti te će se zatvoriti. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Dogodila se kobna greška. NYC3 ne može više sigurno nastaviti te će se zatvoriti. @@ -748,7 +748,7 @@ The entered address "%1" is not a valid NYC3 address. - Upisana adresa "%1" nije valjana Bitcoin adresa. + Upisana adresa "%1" nije valjana NYC3 adresa. Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -844,8 +844,8 @@ Odaberite različitu podatkovnu mapu: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -856,8 +856,8 @@ Otprilike %1 GB podataka bit će spremljeno u ovoj mapi. - %1 will download and store a copy of the Bitcoin block chain. - %1 preuzet će i pohraniti kopiju Bitcoinovog lanca blokova. + %1 will download and store a copy of the NYC3 block chain. + %1 preuzet će i pohraniti kopiju NYC3ovog lanca blokova. The wallet will also be stored in this directory. @@ -884,7 +884,7 @@ Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below. - Nedavne transakcije možda još nisu vidljive pa vam stanje novčanika može biti netočno. Ove informacije bit će točne nakon što vaš novčanik dovrši sinkronizaciju s Bitcoinovom mrežom, kako je opisano dolje. + Nedavne transakcije možda još nisu vidljive pa vam stanje novčanika može biti netočno. Ove informacije bit će točne nakon što vaš novčanik dovrši sinkronizaciju s NYC3ovom mrežom, kako je opisano dolje. Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network. @@ -1061,8 +1061,8 @@ &Trošenje nepotvrđenih vraćenih iznosa - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Automatski otvori port Bitcoin klijenta na ruteru. To radi samo ako ruter podržava UPnP i ako je omogućen. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Automatski otvori port NYC3 klijenta na ruteru. To radi samo ako ruter podržava UPnP i ako je omogućen. Map port using &UPnP @@ -1077,8 +1077,8 @@ Dozvolite dolazeće veze - Connect to the Bitcoin network through a SOCKS5 proxy. - Spojite se na Bitcoin mrežu kroz SOCKS5 proxy. + Connect to the NYC3 network through a SOCKS5 proxy. + Spojite se na NYC3 mrežu kroz SOCKS5 proxy. &Connect through SOCKS5 proxy (default proxy): @@ -1113,8 +1113,8 @@ Tora - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Spojite se na Bitcoin mrežu kroz zaseban SOCKS5 proxy za povezivanje na Tor. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Spojite se na NYC3 mrežu kroz zaseban SOCKS5 proxy za povezivanje na Tor. &Window @@ -1220,8 +1220,8 @@ Oblik - 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. - Prikazani podatci mogu biti zastarjeli. Vaš novčanik se automatski sinkronizira s Bitcoin mrežom kada je veza uspostavljena, ali taj proces još nije završen. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Prikazani podatci mogu biti zastarjeli. Vaš novčanik se automatski sinkronizira s NYC3 mrežom kada je veza uspostavljena, ali taj proces još nije završen. Watch-only: @@ -1316,7 +1316,7 @@ URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - Ne može se parsirati URI! Uzrok tomu može biti nevažeća Bitcoin adresa ili neispravni parametri kod URI-a. + Ne može se parsirati URI! Uzrok tomu može biti nevažeća NYC3 adresa ili neispravni parametri kod URI-a. Payment request file handling @@ -1418,7 +1418,7 @@ Enter a NYC3 address (e.g. %1) - Unesite Bitcoin adresu (npr. %1) + Unesite NYC3 adresu (npr. %1) %1 d @@ -1857,8 +1857,8 @@ &Poruka: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Opcionalna poruka koja se može dodati kao privitak zahtjevu za plaćanje. Bit će prikazana kad je zahtjev otvoren. Napomena: Ova poruka neće biti poslana zajedno s uplatom preko Bitcoin mreže. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Opcionalna poruka koja se može dodati kao privitak zahtjevu za plaćanje. Bit će prikazana kad je zahtjev otvoren. Napomena: Ova poruka neće biti poslana zajedno s uplatom preko NYC3 mreže. An optional label to associate with the new receiving address. @@ -2279,7 +2279,7 @@ Napomena: Budući da se naknada računa po bajtu, naknada od "100 satošija po k Warning: Invalid NYC3 address - Upozorenje: Nevažeća Bitcoin adresa + Upozorenje: Nevažeća NYC3 adresa Warning: Unknown change address @@ -2322,7 +2322,7 @@ Napomena: Budući da se naknada računa po bajtu, naknada od "100 satošija po k The NYC3 address to send the payment to - Bitcoin adresa na koju ćete poslati uplatu + NYC3 adresa na koju ćete poslati uplatu Alt+A @@ -2369,8 +2369,8 @@ Napomena: Budući da se naknada računa po bajtu, naknada od "100 satošija po k Unesite oznaku za ovu adresu kako bi ju dodali u vaš adresar - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Poruka koja je dodana uplati: URI koji će biti spremljen s transakcijom za referencu. Napomena: Ova poruka neće biti poslana preko Bitcoin mreže. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Poruka koja je dodana uplati: URI koji će biti spremljen s transakcijom za referencu. Napomena: Ova poruka neće biti poslana preko NYC3 mreže. Pay To: @@ -2419,7 +2419,7 @@ Napomena: Budući da se naknada računa po bajtu, naknada od "100 satošija po k The NYC3 address to sign the message with - Bitcoin adresa pomoću koje ćete potpisati poruku + NYC3 adresa pomoću koje ćete potpisati poruku Choose previously used address @@ -2451,7 +2451,7 @@ Napomena: Budući da se naknada računa po bajtu, naknada od "100 satošija po k Sign the message to prove you own this NYC3 address - Potpišite poruku kako biste dokazali da posjedujete ovu Bitcoin adresu + Potpišite poruku kako biste dokazali da posjedujete ovu NYC3 adresu Sign &Message @@ -2475,11 +2475,11 @@ Napomena: Budući da se naknada računa po bajtu, naknada od "100 satošija po k The NYC3 address the message was signed with - Bitcoin adresa kojom je poruka potpisana + NYC3 adresa kojom je poruka potpisana Verify the message to ensure it was signed with the specified NYC3 address - Provjerite poruku da budete sigurni da je potpisana zadanom Bitcoin adresom + Provjerite poruku da budete sigurni da je potpisana zadanom NYC3 adresom Verify &Message diff --git a/src/qt/locale/nyc3_hu.ts b/src/qt/locale/nyc3_hu.ts index 8a4904102..0a13ad77a 100644 --- a/src/qt/locale/nyc3_hu.ts +++ b/src/qt/locale/nyc3_hu.ts @@ -66,12 +66,12 @@ Fogadási cím - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Ezek a Bitcoin címeid kifizetések küldéséhez. Mindíg ellenőrizd az összeget és a fogadó címet mielőtt coinokat küldenél. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Ezek a NYC3 címeid kifizetések küldéséhez. Mindíg ellenőrizd az összeget és a fogadó címet mielőtt coinokat küldenél. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Ezek a Bitcoin címeid kifizetések fogadásához. Ajánlott új címet használni minden új fogadáshoz. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Ezek a NYC3 címeid kifizetések fogadásához. Ajánlott új címet használni minden új fogadáshoz. &Copy Address @@ -233,7 +233,7 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka - BitcoinGUI + NYC3GUI Sign &message... Üzenet aláírása... @@ -328,7 +328,7 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka Send coins to a NYC3 address - Bitcoin küldése megadott címre + NYC3 küldése megadott címre Backup wallet to another location @@ -351,8 +351,8 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka Üzenet &valódiságának ellenőrzése - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -375,12 +375,12 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka A tárcádhoz tartozó privát kulcsok titkosítása - Sign messages with your Bitcoin addresses to prove you own them - Üzenetek aláírása a Bitcoin-címmeiddel, amivel bizonyítod, hogy a cím a sajátod + Sign messages with your NYC3 addresses to prove you own them + Üzenetek aláírása a NYC3-címmeiddel, amivel bizonyítod, hogy a cím a sajátod - Verify messages to ensure they were signed with specified Bitcoin addresses - Üzenetek ellenőrzése, hogy valóban a megjelölt Bitcoin-címekkel vannak-e aláírva + Verify messages to ensure they were signed with specified NYC3 addresses + Üzenetek ellenőrzése, hogy valóban a megjelölt NYC3-címekkel vannak-e aláírva &File @@ -419,8 +419,8 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka Paran&cssor kapcsolók - %n active connection(s) to Bitcoin network - %n aktív kapcsolat a Bitcoin hálózathoz%n aktív kapcsolat a Bitcoin hálózathoz + %n active connection(s) to NYC3 network + %n aktív kapcsolat a NYC3 hálózathoz%n aktív kapcsolat a NYC3 hálózathoz Indexing blocks on disk... @@ -463,8 +463,8 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka Naprakész - Show the %1 help message to get a list with possible Bitcoin command-line options - A %1 súgó megjelenítése a Bitcoin lehetséges parancssori kapcsolóinak listájával + Show the %1 help message to get a list with possible NYC3 command-line options + A %1 súgó megjelenítése a NYC3 lehetséges parancssori kapcsolóinak listájával &Window @@ -541,8 +541,8 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka Tárca <b>kódolva</b> és jelenleg <b>zárva</b>. - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Végzetes hiba történt. A Bitcoin működése nem biztonságos és hamarosan leáll. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Végzetes hiba történt. A NYC3 működése nem biztonságos és hamarosan leáll. @@ -732,7 +732,7 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka The entered address "%1" is not a valid NYC3 address. - A megadott "%1" cím nem egy érvényes Bitcoin-cím. + A megadott "%1" cím nem egy érvényes NYC3-cím. Could not unlock wallet. @@ -816,8 +816,8 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka Saját adatkönyvtár használata: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -828,8 +828,8 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka Hozzávetőlegesen %1 GB adatot fogunk ebben a könyvtárban tárolni. - %1 will download and store a copy of the Bitcoin block chain. - %1 le fog töltődni és a Bitcoin blokk lánc egy másolatát fogja tárolni. + %1 will download and store a copy of the NYC3 block chain. + %1 le fog töltődni és a NYC3 blokk lánc egy másolatát fogja tárolni. The wallet will also be stored in this directory. @@ -1009,8 +1009,8 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka &Költése a a jóváhagyatlan visszajárónak - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - A Bitcoin-kliens portjának automatikus megnyitása a routeren. Ez csak akkor működik, ha a routered támogatja az UPnP-t és az engedélyezve is van rajta. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + A NYC3-kliens portjának automatikus megnyitása a routeren. Ez csak akkor működik, ha a routered támogatja az UPnP-t és az engedélyezve is van rajta. Map port using &UPnP @@ -1025,8 +1025,8 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka Bejövő kapcsolatok engedélyezése. - Connect to the Bitcoin network through a SOCKS5 proxy. - Csatlakozás a Bitcoin hálózatához SOCKS5 proxyn keresztül + Connect to the NYC3 network through a SOCKS5 proxy. + Csatlakozás a NYC3 hálózatához SOCKS5 proxyn keresztül &Connect through SOCKS5 proxy (default proxy): @@ -1061,8 +1061,8 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Csatlakozás a Bitcoin hálózathoz külön SOCKS5 proxy használatával a Tor rejtett szolgáltatásainak eléréséhez. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Csatlakozás a NYC3 hálózathoz külön SOCKS5 proxy használatával a Tor rejtett szolgáltatásainak eléréséhez. &Window @@ -1168,8 +1168,8 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka Űrlap - 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. - A kijelzett információ lehet, hogy elavult. A pénztárcája automatikusan szinkronizálja magát a Bitcoin hálózattal miután a kapcsolat létrejön, de ez e folyamat még nem fejeződött be. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + A kijelzett információ lehet, hogy elavult. A pénztárcája automatikusan szinkronizálja magát a NYC3 hálózattal miután a kapcsolat létrejön, de ez e folyamat még nem fejeződött be. Watch-only: @@ -1256,7 +1256,7 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - Nem sikerült az URI elemzése! Ezt okozhatja érvénytelen Bitcoin cím, vagy rossz URI paraméterezés. + Nem sikerült az URI elemzése! Ezt okozhatja érvénytelen NYC3 cím, vagy rossz URI paraméterezés. Payment request file handling @@ -1354,7 +1354,7 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka Enter a NYC3 address (e.g. %1) - Ad meg egy Bitcoin címet (pl: %1) + Ad meg egy NYC3 címet (pl: %1) %1 d @@ -1765,8 +1765,8 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka &Üzenet: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Egy opcionális üzenet csatolása a fizetési kérelemhez, amely megjelenik a kérelem megnyitásakor. Megjegyzés: Az üzenet nem lesz elküldve a fizetséggel a Bitcoin hálózaton keresztül. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Egy opcionális üzenet csatolása a fizetési kérelemhez, amely megjelenik a kérelem megnyitásakor. Megjegyzés: Az üzenet nem lesz elküldve a fizetséggel a NYC3 hálózaton keresztül. An optional label to associate with the new receiving address. @@ -2143,7 +2143,7 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka Warning: Invalid NYC3 address - Figyelmeztetés: Érvénytelen Bitcoin cím + Figyelmeztetés: Érvénytelen NYC3 cím Warning: Unknown change address @@ -2186,7 +2186,7 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka The NYC3 address to send the payment to - Erre a Bitcoin címre küldje az összeget + Erre a NYC3 címre küldje az összeget Alt+A @@ -2271,7 +2271,7 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka The NYC3 address to sign the message with - Bitcoin cím, amivel alá kívánja írni az üzenetet + NYC3 cím, amivel alá kívánja írni az üzenetet Choose previously used address @@ -2319,11 +2319,11 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka The NYC3 address the message was signed with - Bitcoin cím, amivel aláírta az üzenetet + NYC3 cím, amivel aláírta az üzenetet Verify the message to ensure it was signed with the specified NYC3 address - Ellenőrizze az üzenetet, hogy valóban a megjelölt Bitcoin címmel van-e aláírva + Ellenőrizze az üzenetet, hogy valóban a megjelölt NYC3 címmel van-e aláírva Verify &Message diff --git a/src/qt/locale/nyc3_id.ts b/src/qt/locale/nyc3_id.ts index 3d3203616..eb765899e 100644 --- a/src/qt/locale/nyc3_id.ts +++ b/src/qt/locale/nyc3_id.ts @@ -66,12 +66,12 @@ Alamat menerima - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Ini adalah alamat Bitcoin anda untuk mengirim pembayaran. Selalu periksa jumlah dan alamat penerima sebelum mengirim koin + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Ini adalah alamat NYC3 anda untuk mengirim pembayaran. Selalu periksa jumlah dan alamat penerima sebelum mengirim koin - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Ini adalah alamat Bitcoin anda untuk menerima pembayaran. Disarankan untuk menggunakan alamat penerimaan baru untuk setiap transaksi + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Ini adalah alamat NYC3 anda untuk menerima pembayaran. Disarankan untuk menggunakan alamat penerimaan baru untuk setiap transaksi &Copy Address @@ -240,7 +240,7 @@ - BitcoinGUI + NYC3GUI Sign &message... &Verifikasi pesan... @@ -343,7 +343,7 @@ Send coins to a NYC3 address - Kirim koin ke alamat Bitcoin + Kirim koin ke alamat NYC3 Backup wallet to another location @@ -366,8 +366,8 @@ &Verifikasi pesan... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -390,12 +390,12 @@ Enkripsi private keys wallet anda - Sign messages with your Bitcoin addresses to prove you own them - Tambahkan pesan di alamat Bitcoin untuk membuktikan bahwa anda pemiliknya + Sign messages with your NYC3 addresses to prove you own them + Tambahkan pesan di alamat NYC3 untuk membuktikan bahwa anda pemiliknya - Verify messages to ensure they were signed with specified Bitcoin addresses - Verifikasi pesan untuk memastikan bahwa telah ditanda tangani dengan alamat Bitcoin tertentu + Verify messages to ensure they were signed with specified NYC3 addresses + Verifikasi pesan untuk memastikan bahwa telah ditanda tangani dengan alamat NYC3 tertentu &File @@ -434,8 +434,8 @@ opsi &Command-line - %n active connection(s) to Bitcoin network - %n koneksi aktif pada jaringan Bitcoin + %n active connection(s) to NYC3 network + %n koneksi aktif pada jaringan NYC3 Indexing blocks on disk... @@ -486,8 +486,8 @@ Address &Penerima - Show the %1 help message to get a list with possible Bitcoin command-line options - Perlihatkan %1 pesan yang didapat dari daftar dengan opsi command-line Bitcoin yang memungkinkan + Show the %1 help message to get a list with possible NYC3 command-line options + Perlihatkan %1 pesan yang didapat dari daftar dengan opsi command-line NYC3 yang memungkinkan &Window @@ -777,8 +777,8 @@ Intro - Bitcoin - Bitcoin + NYC3 + NYC3 Error diff --git a/src/qt/locale/nyc3_id_ID.ts b/src/qt/locale/nyc3_id_ID.ts index e1d34c31e..62a82df3e 100644 --- a/src/qt/locale/nyc3_id_ID.ts +++ b/src/qt/locale/nyc3_id_ID.ts @@ -66,12 +66,12 @@ Alamat-alamat penerima - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Berikut ialah alamat-alamat Bitcoin Anda yang digunakan untuk mengirimkan pembayaran. Selalu periksa jumlah dan alamat penerima sebelum mengirimkan koin. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Berikut ialah alamat-alamat NYC3 Anda yang digunakan untuk mengirimkan pembayaran. Selalu periksa jumlah dan alamat penerima sebelum mengirimkan koin. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Berikut ialah alamat-alamat Bitcoin Anda yang digunakan untuk menerima pembayaran. Dianjurkan untuk menggunakan alamat penerimaan baru untuk setiap transaksi. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Berikut ialah alamat-alamat NYC3 Anda yang digunakan untuk menerima pembayaran. Dianjurkan untuk menggunakan alamat penerimaan baru untuk setiap transaksi. &Copy Address @@ -240,7 +240,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Pesan &penanda... @@ -343,7 +343,7 @@ Send coins to a NYC3 address - Kirim koin ke alamat Bitcoin + Kirim koin ke alamat NYC3 Backup wallet to another location @@ -366,8 +366,8 @@ &Verifikasi pesan... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -390,12 +390,12 @@ Enkripsi private key yang dimiliki dompet Anda - Sign messages with your Bitcoin addresses to prove you own them - Tanda tangani sebuah pesan menggunakan alamat Bitcoin Anda untuk membuktikan bahwa Anda adalah pemilik alamat tersebut + Sign messages with your NYC3 addresses to prove you own them + Tanda tangani sebuah pesan menggunakan alamat NYC3 Anda untuk membuktikan bahwa Anda adalah pemilik alamat tersebut - Verify messages to ensure they were signed with specified Bitcoin addresses - Verifikasi pesan untuk memastikan bahwa pesan tersebut ditanda tangani oleh suatu alamat Bitcoin tertentu + Verify messages to ensure they were signed with specified NYC3 addresses + Verifikasi pesan untuk memastikan bahwa pesan tersebut ditanda tangani oleh suatu alamat NYC3 tertentu &File @@ -434,8 +434,8 @@ &pilihan Command-line - %n active connection(s) to Bitcoin network - %n koneksi aktif ke jaringan Bitcoin + %n active connection(s) to NYC3 network + %n koneksi aktif ke jaringan NYC3 Indexing blocks on disk... @@ -486,8 +486,8 @@ &Address penerima - Show the %1 help message to get a list with possible Bitcoin command-line options - Tampilkan %1 pesan bantuan untuk mendapatkan daftar opsi baris perintah Bitcoin yang memungkinkan + Show the %1 help message to get a list with possible NYC3 command-line options + Tampilkan %1 pesan bantuan untuk mendapatkan daftar opsi baris perintah NYC3 yang memungkinkan default wallet @@ -590,8 +590,8 @@ Dompet saat ini <b>terenkripsi</b> dan <b>terkunci</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Terjadi Kesalahan Fatal. Bitcoin Tidak Dapat Melanjutkan Dengan Aman Dan Akan Keluar + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Terjadi Kesalahan Fatal. NYC3 Tidak Dapat Melanjutkan Dengan Aman Dan Akan Keluar @@ -777,7 +777,7 @@ The entered address "%1" is not a valid NYC3 address. - Alamat yang dimasukkan "%1" bukanlah alamat Bitcoin yang valid. + Alamat yang dimasukkan "%1" bukanlah alamat NYC3 yang valid. Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -873,8 +873,8 @@ Gunakan direktori pilihan Anda: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -885,8 +885,8 @@ %1 GB data akan disimpan di direktori ini. - %1 will download and store a copy of the Bitcoin block chain. - %1 akan mengunduh dan menyimpan salinan Bitcoin block chain. + %1 will download and store a copy of the NYC3 block chain. + %1 akan mengunduh dan menyimpan salinan NYC3 block chain. The wallet will also be stored in this directory. @@ -917,7 +917,7 @@ Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below. - Transaksi-transaksi terkini mungkin belum terlihat dan oleh karenanya, saldo dompet Anda mungkin tidak tepat. Informasi ini akan akurat ketika dompet Anda tersinkronisasi dengan jaringan Bitcoin, seperti rincian berikut. + Transaksi-transaksi terkini mungkin belum terlihat dan oleh karenanya, saldo dompet Anda mungkin tidak tepat. Informasi ini akan akurat ketika dompet Anda tersinkronisasi dengan jaringan NYC3, seperti rincian berikut. Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network. @@ -1098,8 +1098,8 @@ &Perubahan saldo untuk transaksi yang belum dikonfirmasi - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Otomatis membuka port client Bitcoin di router. Hanya berjalan apabila router anda mendukung UPnP dan di-enable. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Otomatis membuka port client NYC3 di router. Hanya berjalan apabila router anda mendukung UPnP dan di-enable. Map port using &UPnP @@ -1114,8 +1114,8 @@ Terima koneksi-koneksi masuk - Connect to the Bitcoin network through a SOCKS5 proxy. - Hubungkan ke jaringan Bitcoin melalui SOCKS5 proxy. + Connect to the NYC3 network through a SOCKS5 proxy. + Hubungkan ke jaringan NYC3 melalui SOCKS5 proxy. &Connect through SOCKS5 proxy (default proxy): @@ -1150,7 +1150,7 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. Koneksi ke jaringan bitcoin melalui proxy SOCKS5 yang berbeda untuk layanan Tor tersembunyi. @@ -1257,8 +1257,8 @@ Formulir - 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. - Informasi terlampir mungkin sudah kedaluwarsa. Dompet Anda secara otomatis mensinkronisasi dengan jaringan Bitcoin ketika sebuah hubungan terbentuk, namun proses ini belum selesai. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Informasi terlampir mungkin sudah kedaluwarsa. Dompet Anda secara otomatis mensinkronisasi dengan jaringan NYC3 ketika sebuah hubungan terbentuk, namun proses ini belum selesai. Watch-only: @@ -1349,7 +1349,7 @@ URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - URI tidak bisa dimengerti! Hal ini bisa disebabkan karena alamat Bitcoin yang tidak sah atau parameter URI yang tidak tepat. + URI tidak bisa dimengerti! Hal ini bisa disebabkan karena alamat NYC3 yang tidak sah atau parameter URI yang tidak tepat. Payment request file handling @@ -1391,7 +1391,7 @@ Enter a NYC3 address (e.g. %1) - Masukkan alamat Bitcoin (contoh %1) + Masukkan alamat NYC3 (contoh %1) %1 h @@ -1922,7 +1922,7 @@ Sign the message to prove you own this NYC3 address - Tandai pesan untuk menyetujui kamu pemiliki alamat Bitcoin ini + Tandai pesan untuk menyetujui kamu pemiliki alamat NYC3 ini Sign &Message diff --git a/src/qt/locale/nyc3_is.ts b/src/qt/locale/nyc3_is.ts index baa6b9ceb..4ff3e5e69 100644 --- a/src/qt/locale/nyc3_is.ts +++ b/src/qt/locale/nyc3_is.ts @@ -62,12 +62,12 @@ Færslugildi sem þiggja til sín - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Þetta eru Bitcoin færslugildin sem senda greiðslur. Skoðið ævinlega vel upphæðina og færslugildin sem þiggja greiðslur áður en mynt er send. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Þetta eru NYC3 færslugildin sem senda greiðslur. Skoðið ævinlega vel upphæðina og færslugildin sem þiggja greiðslur áður en mynt er send. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Þetta eru Bitcoin færslugildin sem þiggja greiðslur. Mælt er með að nota aldrei sama færslugildið til að þiggja fleiri en eina greiðslu. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Þetta eru NYC3 færslugildin sem þiggja greiðslur. Mælt er með að nota aldrei sama færslugildið til að þiggja fleiri en eina greiðslu. &Copy Address @@ -228,7 +228,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Undirrita &skilaboð @@ -323,7 +323,7 @@ Send coins to a NYC3 address - Senda mynt í Bitcoin færslugildi + Senda mynt í NYC3 færslugildi Backup wallet to another location @@ -346,8 +346,8 @@ &Yfirfara skilaboð... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -370,12 +370,12 @@ Dulkóða einkalyklana sem tilheyra veskinu þínu - Sign messages with your Bitcoin addresses to prove you own them - Kvitta undir skilaboð með Bitcoin færslugildunum þínum til að sanna að þú eigir þau + Sign messages with your NYC3 addresses to prove you own them + Kvitta undir skilaboð með NYC3 færslugildunum þínum til að sanna að þú eigir þau - Verify messages to ensure they were signed with specified Bitcoin addresses - Yfirfara skilaboð til að tryggja að kvittað hafi verið fyrir þau með tilteknum Bitcoin færslugildum + Verify messages to ensure they were signed with specified NYC3 addresses + Yfirfara skilaboð til að tryggja að kvittað hafi verið fyrir þau með tilteknum NYC3 færslugildum &File @@ -446,8 +446,8 @@ Uppfært - Show the %1 help message to get a list with possible Bitcoin command-line options - Sýna %1 hjálparskilaboðin til að fá lista yfir valkosti Bitcoin aðgerðir í skipanalínu + Show the %1 help message to get a list with possible NYC3 command-line options + Sýna %1 hjálparskilaboðin til að fá lista yfir valkosti NYC3 aðgerðir í skipanalínu %1 client @@ -516,8 +516,8 @@ Veskið er <b>dulkóðað</b> and currently <b>locked</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Alvarleg villa átti sér stað. Bitcoin getur ekki haldið áfram með öruggum hætti og stoppar hér. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Alvarleg villa átti sér stað. NYC3 getur ekki haldið áfram með öruggum hætti og stoppar hér. @@ -631,7 +631,7 @@ The entered address "%1" is not a valid NYC3 address. - Færslugildið sem slegið var inn "%1" er ekki leyfilegt Bitcoin færslugildi. + Færslugildið sem slegið var inn "%1" er ekki leyfilegt NYC3 færslugildi. @@ -643,8 +643,8 @@ Intro - Bitcoin - Bitcoin + NYC3 + NYC3 Error diff --git a/src/qt/locale/nyc3_it.ts b/src/qt/locale/nyc3_it.ts index 5e5410a0c..de683972d 100644 --- a/src/qt/locale/nyc3_it.ts +++ b/src/qt/locale/nyc3_it.ts @@ -66,12 +66,12 @@ Indirizzi di ricezione - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Questi sono i tuoi indirizzi Bitcoin per l'invio di pagamenti. Controlla sempre l'importo e l'indirizzo del beneficiario prima di inviare bitcoin. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Questi sono i tuoi indirizzi NYC3 per l'invio di pagamenti. Controlla sempre l'importo e l'indirizzo del beneficiario prima di inviare bitcoin. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Questi sono i tuoi indirizzi Bitcoin per la ricezione di pagamenti. Si raccomanda di usare un nuovo indirizzo di ricezione per ogni transazione. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Questi sono i tuoi indirizzi NYC3 per la ricezione di pagamenti. Si raccomanda di usare un nuovo indirizzo di ricezione per ogni transazione. &Copy Address @@ -240,7 +240,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Firma &messaggio... @@ -343,7 +343,7 @@ Send coins to a NYC3 address - Invia fondi ad un indirizzo Bitcoin + Invia fondi ad un indirizzo NYC3 Backup wallet to another location @@ -366,8 +366,8 @@ &Verifica messaggio... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -390,12 +390,12 @@ Cifra le chiavi private che appartengono al tuo portamonete - Sign messages with your Bitcoin addresses to prove you own them - Firma messaggi con i tuoi indirizzi Bitcoin per dimostrarne il possesso + Sign messages with your NYC3 addresses to prove you own them + Firma messaggi con i tuoi indirizzi NYC3 per dimostrarne il possesso - Verify messages to ensure they were signed with specified Bitcoin addresses - Verifica che i messaggi siano stati firmati con gli indirizzi Bitcoin specificati + Verify messages to ensure they were signed with specified NYC3 addresses + Verifica che i messaggi siano stati firmati con gli indirizzi NYC3 specificati &File @@ -434,8 +434,8 @@ Opzioni della riga di &comando - %n active connection(s) to Bitcoin network - %n connessione attiva alla rete Bitcoin%n connessioni alla rete Bitcoin attive + %n active connection(s) to NYC3 network + %n connessione attiva alla rete NYC3%n connessioni alla rete NYC3 attive Indexing blocks on disk... @@ -502,8 +502,8 @@ Chiudi il portafoglio - Show the %1 help message to get a list with possible Bitcoin command-line options - Mostra il messaggio di aiuto di %1 per ottenere una lista di opzioni di comando per Bitcoin + Show the %1 help message to get a list with possible NYC3 command-line options + Mostra il messaggio di aiuto di %1 per ottenere una lista di opzioni di comando per NYC3 default wallet @@ -614,8 +614,8 @@ Il portamonete è <b>cifrato</b> ed attualmente <b>bloccato</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Si è verificato un errore critico. Bitcoin non può più funzionare in maniera sicura e verrà chiuso. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Si è verificato un errore critico. NYC3 non può più funzionare in maniera sicura e verrà chiuso. @@ -901,8 +901,8 @@ Usa una cartella dati personalizzata: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -913,8 +913,8 @@ Verranno salvati circa %1 GB di dati in questa cartella. - %1 will download and store a copy of the Bitcoin block chain. - %1 scaricherà e salverà una copia della block chain di Bitcoin. + %1 will download and store a copy of the NYC3 block chain. + %1 scaricherà e salverà una copia della block chain di NYC3. The wallet will also be stored in this directory. @@ -1131,8 +1131,8 @@ Per specificare più URL separarli con una barra verticale "|". &Spendi resti non confermati - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Apri automaticamente la porta del client Bitcoin sul router. Il protocollo UPnP deve essere supportato da parte del router ed attivo. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Apri automaticamente la porta del client NYC3 sul router. Il protocollo UPnP deve essere supportato da parte del router ed attivo. Map port using &UPnP @@ -1147,8 +1147,8 @@ Per specificare più URL separarli con una barra verticale "|". Accetta connessioni in entrata - Connect to the Bitcoin network through a SOCKS5 proxy. - Connessione alla rete Bitcoin attraverso un proxy SOCKS5. + Connect to the NYC3 network through a SOCKS5 proxy. + Connessione alla rete NYC3 attraverso un proxy SOCKS5. &Connect through SOCKS5 proxy (default proxy): @@ -1183,8 +1183,8 @@ Per specificare più URL separarli con una barra verticale "|". Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Connette alla rete Bitcoin attraverso un proxy SOCKS5 separato per Tor. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Connette alla rete NYC3 attraverso un proxy SOCKS5 separato per Tor. &Window @@ -1294,8 +1294,8 @@ Per specificare più URL separarli con una barra verticale "|". Modulo - 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. - Le informazioni visualizzate potrebbero non essere aggiornate. Il portafoglio si sincronizza automaticamente con la rete Bitcoin una volta stabilita una connessione, ma questo processo non è ancora stato completato. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Le informazioni visualizzate potrebbero non essere aggiornate. Il portafoglio si sincronizza automaticamente con la rete NYC3 una volta stabilita una connessione, ma questo processo non è ancora stato completato. Watch-only: @@ -1398,7 +1398,7 @@ Per specificare più URL separarli con una barra verticale "|". URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - Impossibile interpretare l'URI! I parametri dell'URI o l'indirizzo Bitcoin potrebbero non essere corretti. + Impossibile interpretare l'URI! I parametri dell'URI o l'indirizzo NYC3 potrebbero non essere corretti. Payment request file handling @@ -1500,7 +1500,7 @@ Per specificare più URL separarli con una barra verticale "|". Enter a NYC3 address (e.g. %1) - Inserisci un indirizzo Bitcoin (ad es. %1) + Inserisci un indirizzo NYC3 (ad es. %1) %1 d @@ -1955,8 +1955,8 @@ Per specificare più URL separarli con una barra verticale "|". &Messaggio: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Un messaggio opzionale da allegare e mostrare all'apertura della richiesta di pagamento. Nota: Il messaggio non sarà inviato con il pagamento sulla rete Bitcoin. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Un messaggio opzionale da allegare e mostrare all'apertura della richiesta di pagamento. Nota: Il messaggio non sarà inviato con il pagamento sulla rete NYC3. An optional label to associate with the new receiving address. @@ -2121,7 +2121,7 @@ Per specificare più URL separarli con una barra verticale "|". SendCoinsDialog Send Coins - Invia Bitcoin + Invia NYC3 Coin Control Features @@ -2385,7 +2385,7 @@ Nota: poiché la commissione è calcolata su base per byte, una commissione di " Warning: Invalid NYC3 address - Attenzione: Indirizzo Bitcoin non valido + Attenzione: Indirizzo NYC3 non valido Warning: Unknown change address @@ -2428,7 +2428,7 @@ Nota: poiché la commissione è calcolata su base per byte, una commissione di " The NYC3 address to send the payment to - L'indirizzo Bitcoin a cui vuoi inviare il pagamento + L'indirizzo NYC3 a cui vuoi inviare il pagamento Alt+A @@ -2475,8 +2475,8 @@ Nota: poiché la commissione è calcolata su base per byte, una commissione di " Inserisci un'etichetta per questo indirizzo per aggiungerlo alla lista degli indirizzi utilizzati - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Messaggio incluso nel bitcoin URI e che sarà memorizzato con la transazione per tuo riferimento. Nota: Questo messaggio non sarà inviato attraverso la rete Bitcoin. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Messaggio incluso nel bitcoin URI e che sarà memorizzato con la transazione per tuo riferimento. Nota: Questo messaggio non sarà inviato attraverso la rete NYC3. Pay To: @@ -2525,7 +2525,7 @@ Nota: poiché la commissione è calcolata su base per byte, una commissione di " The NYC3 address to sign the message with - Indirizzo Bitcoin da utilizzare per firmare il messaggio + Indirizzo NYC3 da utilizzare per firmare il messaggio Choose previously used address @@ -2557,7 +2557,7 @@ Nota: poiché la commissione è calcolata su base per byte, una commissione di " Sign the message to prove you own this NYC3 address - Firma un messaggio per dimostrare di possedere questo indirizzo Bitcoin + Firma un messaggio per dimostrare di possedere questo indirizzo NYC3 Sign &Message @@ -2581,7 +2581,7 @@ Nota: poiché la commissione è calcolata su base per byte, una commissione di " The NYC3 address the message was signed with - L'indirizzo Bitcoin con cui è stato contrassegnato il messaggio + L'indirizzo NYC3 con cui è stato contrassegnato il messaggio Verify the message to ensure it was signed with the specified NYC3 address @@ -3131,7 +3131,7 @@ Nota: poiché la commissione è calcolata su base per byte, una commissione di " WalletModel Send Coins - Invia Bitcoin + Invia NYC3 Fee bump error diff --git a/src/qt/locale/nyc3_it_IT.ts b/src/qt/locale/nyc3_it_IT.ts index 702fa81c4..ae4db3c09 100644 --- a/src/qt/locale/nyc3_it_IT.ts +++ b/src/qt/locale/nyc3_it_IT.ts @@ -66,12 +66,12 @@ Indirizzi riceventi - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Questi sono i suoi indirizzi Bitcoin per ricevere i pagamenti. Controlla sempre l'importo e gli indirizzi prima di inviare i coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Questi sono i suoi indirizzi NYC3 per ricevere i pagamenti. Controlla sempre l'importo e gli indirizzi prima di inviare i coins. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Questi sono i tuoi indirizzi Bitcoin per ricevere i pagamenti. Si raccomanda di usare un nuovo indirizzo per ogni transazione. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Questi sono i tuoi indirizzi NYC3 per ricevere i pagamenti. Si raccomanda di usare un nuovo indirizzo per ogni transazione. &Copy Address @@ -232,7 +232,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Firma &messaggio... @@ -331,7 +331,7 @@ Send coins to a NYC3 address - Invia monete ad un indirizzo Bitcoin... + Invia monete ad un indirizzo NYC3... Backup wallet to another location @@ -354,8 +354,8 @@ Verifica messaggio... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -378,12 +378,12 @@ Cripta le chiavi private che appartengono al tuo portafoglio - Sign messages with your Bitcoin addresses to prove you own them - Firma messaggi con i tuoi indirizzi Bitcoin per provare che li possiedi + Sign messages with your NYC3 addresses to prove you own them + Firma messaggi con i tuoi indirizzi NYC3 per provare che li possiedi - Verify messages to ensure they were signed with specified Bitcoin addresses - Verifica messaggi per accertarti che siano firmati dagli indirizzi Bitcoin specificati + Verify messages to ensure they were signed with specified NYC3 addresses + Verifica messaggi per accertarti che siano firmati dagli indirizzi NYC3 specificati &File @@ -458,8 +458,8 @@ Aggiornato - Show the %1 help message to get a list with possible Bitcoin command-line options - Mostra il %1 messaggio d'aiuto per ottenere una lista con le possibili opzioni per la riga di comando di Bitcoin + Show the %1 help message to get a list with possible NYC3 command-line options + Mostra il %1 messaggio d'aiuto per ottenere una lista con le possibili opzioni per la riga di comando di NYC3 default wallet @@ -512,8 +512,8 @@ Generazione di chiavi HD <b>disabilitata</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Si è verificato un errore fatale. Bitcoin non può continuare in maniera sicura e sarà chiuso. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Si è verificato un errore fatale. NYC3 non può continuare in maniera sicura e sarà chiuso. @@ -687,7 +687,7 @@ The entered address "%1" is not a valid NYC3 address. - L'indirizzo inserito "%1" non è un indirizzo Bitcoin valido. + L'indirizzo inserito "%1" non è un indirizzo NYC3 valido. Could not unlock wallet. @@ -743,8 +743,8 @@ Benvenuto - Bitcoin - Bitcoin + NYC3 + NYC3 The wallet will also be stored in this directory. diff --git a/src/qt/locale/nyc3_ja.ts b/src/qt/locale/nyc3_ja.ts index 6831cd55e..05cbc55f3 100644 --- a/src/qt/locale/nyc3_ja.ts +++ b/src/qt/locale/nyc3_ja.ts @@ -66,12 +66,12 @@ 受取用アドレス - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - これらは、あなたが知っている支払い送り先の Bitcoin アドレスです。コインを送る前に、必ず金額と送金先アドレスを確認してください。 + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + これらは、あなたが知っている支払い送り先の NYC3 アドレスです。コインを送る前に、必ず金額と送金先アドレスを確認してください。 - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - これらは支払いを受け取るための、あなたの Bitcoin アドレスです。トランザクションごとに新しい受け取り用アドレスを作成することが推奨されます。 + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + これらは支払いを受け取るための、あなたの NYC3 アドレスです。トランザクションごとに新しい受け取り用アドレスを作成することが推奨されます。 &Copy Address @@ -177,7 +177,7 @@ Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! - 警告: もしもあなたのウォレットを暗号化してパスフレーズを忘れてしまったら、<b>あなたの Bitcoin はすべて失われます</b>！ + 警告: もしもあなたのウォレットを暗号化してパスフレーズを忘れてしまったら、<b>あなたの NYC3 はすべて失われます</b>！ Are you sure you wish to encrypt your wallet? @@ -189,7 +189,7 @@ Your wallet is now encrypted. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer. - ウォレットの暗号化処理が完了しました。ウォレットを暗号化しても、コンピュータに感染したマルウェアなどによる Bitcoin の盗難を完全に防ぐことはできないことにご注意ください。 + ウォレットの暗号化処理が完了しました。ウォレットを暗号化しても、コンピュータに感染したマルウェアなどによる NYC3 の盗難を完全に防ぐことはできないことにご注意ください。 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. @@ -240,7 +240,7 @@ - BitcoinGUI + NYC3GUI Sign &message... メッセージの署名...(&m) @@ -343,7 +343,7 @@ Send coins to a NYC3 address - Bitcoin アドレスにコインを送る + NYC3 アドレスにコインを送る Backup wallet to another location @@ -366,8 +366,8 @@ メッセージの検証(&V)... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -390,12 +390,12 @@ ウォレットの秘密鍵を暗号化する - Sign messages with your Bitcoin addresses to prove you own them - Bitcoin アドレスでメッセージに署名して、アドレスを所有していることを証明する + Sign messages with your NYC3 addresses to prove you own them + NYC3 アドレスでメッセージに署名して、アドレスを所有していることを証明する - Verify messages to ensure they were signed with specified Bitcoin addresses - メッセージを検証して、指定された Bitcoin アドレスで署名されたことを確認する + Verify messages to ensure they were signed with specified NYC3 addresses + メッセージを検証して、指定された NYC3 アドレスで署名されたことを確認する &File @@ -434,8 +434,8 @@ コマンドラインオプション(&C) - %n active connection(s) to Bitcoin network - Bitcoin ネットワークへのアクティブな接続は %n 個 + %n active connection(s) to NYC3 network + NYC3 ネットワークへのアクティブな接続は %n 個 Indexing blocks on disk... @@ -502,7 +502,7 @@ ウォレットを閉じる - Show the %1 help message to get a list with possible Bitcoin command-line options + Show the %1 help message to get a list with possible NYC3 command-line options %1 のヘルプ メッセージを表示して、使用可能な XPChain のコマンドライン オプションの一覧を見る。 @@ -614,8 +614,8 @@ ウォレットは<b>暗号化済み</b>・<b>ロック状態</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - 致命的なエラーが発生しました。Bitcoin を安全に動作し続けることができないため終了します。 + A fatal error occurred. NYC3 can no longer continue safely and will quit. + 致命的なエラーが発生しました。NYC3 を安全に動作し続けることができないため終了します。 @@ -805,7 +805,7 @@ The entered address "%1" is not a valid NYC3 address. - 入力されたアドレス "%1" は無効な Bitcoin アドレスです。 + 入力されたアドレス "%1" は無効な NYC3 アドレスです。 Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -901,8 +901,8 @@ カスタム データ ディレクトリを使用: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -913,8 +913,8 @@ 約%1 GBのデータがこのディレクトリに保存されます。 - %1 will download and store a copy of the Bitcoin block chain. - %1 は Bitcoin ブロックチェーンのコピーをダウンロードし保存します。 + %1 will download and store a copy of the NYC3 block chain. + %1 は NYC3 ブロックチェーンのコピーをダウンロードし保存します。 The wallet will also be stored in this directory. @@ -945,11 +945,11 @@ Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below. - 最近の取引がまだ表示されていない可能性があります。そのため、ウォレットの残高が正しく表示されていないかもしれません。この情報は、ウォレットが Bitcoin ネットワークへの同期が完了すると正確なものとなります。詳細は下記を参照してください。 + 最近の取引がまだ表示されていない可能性があります。そのため、ウォレットの残高が正しく表示されていないかもしれません。この情報は、ウォレットが NYC3 ネットワークへの同期が完了すると正確なものとなります。詳細は下記を参照してください。 Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network. - まだ表示されていない取引が関係する Bitcoin を使用しようとすると、ネットワークから認証を受けられません。 + まだ表示されていない取引が関係する NYC3 を使用しようとすると、ネットワークから認証を受けられません。 Number of blocks left @@ -1126,8 +1126,8 @@ 未検証のお釣りを使用する(&S) - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - 自動的にルーター上の Bitcoin クライアントのポートを開放します。あなたのルーターが UPnP に対応していて、それが有効になっている場合のみ動作します。 + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + 自動的にルーター上の NYC3 クライアントのポートを開放します。あなたのルーターが UPnP に対応していて、それが有効になっている場合のみ動作します。 Map port using &UPnP @@ -1142,8 +1142,8 @@ 外部からの接続を許可する(&G) - Connect to the Bitcoin network through a SOCKS5 proxy. - SOCKS5 プロキシ経由で Bitcoin ネットワークに接続する。 + Connect to the NYC3 network through a SOCKS5 proxy. + SOCKS5 プロキシ経由で NYC3 ネットワークに接続する。 &Connect through SOCKS5 proxy (default proxy): @@ -1178,8 +1178,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Tor秘匿サービスを利用するため、専用の SOCKS5 プロキシ経由で Bitcoin ネットワークに接続する。 + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Tor秘匿サービスを利用するため、専用の SOCKS5 プロキシ経由で NYC3 ネットワークに接続する。 &Window @@ -1289,8 +1289,8 @@ フォーム - 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. - 表示されている情報は古い可能性があります。ウォレットは接続確立後に Bitcoin ネットワークと自動的に同期しますが、同期処理はまだ完了していません。 + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + 表示されている情報は古い可能性があります。ウォレットは接続確立後に NYC3 ネットワークと自動的に同期しますが、同期処理はまだ完了していません。 Watch-only: @@ -1365,7 +1365,7 @@ Cannot start bitcoin: click-to-pay handler - Bitcoin を起動できません: click-to-pay handler + NYC3 を起動できません: click-to-pay handler URI handling @@ -1393,7 +1393,7 @@ URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - URIを解析できませんでした！ Bitcoin アドレスが無効であるか、URIパラメーターが不正な形式である可能性があります。 + URIを解析できませんでした！ NYC3 アドレスが無効であるか、URIパラメーターが不正な形式である可能性があります。 Payment request file handling @@ -1495,7 +1495,7 @@ Enter a NYC3 address (e.g. %1) - Bitcoin アドレスを入力してください (例: %1) + NYC3 アドレスを入力してください (例: %1) %1 d @@ -1950,8 +1950,8 @@ メッセージ (&M): - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - 支払いリクエストに添付するメッセージ（任意）。支払リクエスト開始時に表示されます。注意: メッセージは Bitcoin ネットワーク上へ送信されません。 + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + 支払いリクエストに添付するメッセージ（任意）。支払リクエスト開始時に表示されます。注意: メッセージは NYC3 ネットワーク上へ送信されません。 An optional label to associate with the new receiving address. @@ -2380,7 +2380,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p Warning: Invalid NYC3 address - 警告: 無効な Bitcoin アドレス + 警告: 無効な NYC3 アドレス Warning: Unknown change address @@ -2423,7 +2423,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p The NYC3 address to send the payment to - 支払い先 Bitcoin アドレス + 支払い先 NYC3 アドレス Alt+A @@ -2443,7 +2443,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally. - 手数料は送金する金額から差し引かれます。送金先には金額欄で指定した額よりも少ない Bitcoin が送られます。送金先が複数ある場合は、手数料は均等に分けられます。 + 手数料は送金する金額から差し引かれます。送金先には金額欄で指定した額よりも少ない NYC3 が送られます。送金先が複数ある場合は、手数料は均等に分けられます。 S&ubtract fee from amount @@ -2470,8 +2470,8 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p このアドレスに対するラベルを入力することで、送金したことがあるアドレスの一覧に追加することができます - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - bitcoin: URIに添付されていたメッセージです。これは参照用として取引とともに保存されます。注意: メッセージは Bitcoin ネットワーク上へ送信されません。 + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + bitcoin: URIに添付されていたメッセージです。これは参照用として取引とともに保存されます。注意: メッセージは NYC3 ネットワーク上へ送信されません。 Pay To: @@ -2516,11 +2516,11 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to. - あなたが所有しているアドレスでメッセージや契約書に署名をすることで、それらのアドレスへ送られた Bitcoin を受け取ることができることを証明できます。フィッシング攻撃者があなたを騙して、あなたの身分情報に署名させようとしている可能性があるため、よくわからないものやランダムな文字列に対して署名しないでください。あなたが同意した、よく詳細の記された文言にのみ署名するようにしてください。 + あなたが所有しているアドレスでメッセージや契約書に署名をすることで、それらのアドレスへ送られた NYC3 を受け取ることができることを証明できます。フィッシング攻撃者があなたを騙して、あなたの身分情報に署名させようとしている可能性があるため、よくわからないものやランダムな文字列に対して署名しないでください。あなたが同意した、よく詳細の記された文言にのみ署名するようにしてください。 The NYC3 address to sign the message with - メッセージの署名に使用する Bitcoin アドレス + メッセージの署名に使用する NYC3 アドレス Choose previously used address @@ -2552,7 +2552,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p Sign the message to prove you own this NYC3 address - メッセージに署名してこの Bitcoin アドレスを所有していることを証明 + メッセージに署名してこの NYC3 アドレスを所有していることを証明 Sign &Message @@ -2576,11 +2576,11 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p The NYC3 address the message was signed with - メッセージの署名に使われた Bitcoin アドレス + メッセージの署名に使われた NYC3 アドレス Verify the message to ensure it was signed with the specified NYC3 address - メッセージを検証して指定された Bitcoin アドレスで署名されたことを確認 + メッセージを検証して指定された NYC3 アドレスで署名されたことを確認 Verify &Message @@ -3248,7 +3248,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p NYC3 - Bitcoin コア + NYC3 コア The %s developers diff --git a/src/qt/locale/nyc3_ka.ts b/src/qt/locale/nyc3_ka.ts index 845670fe1..91b1fd9bb 100644 --- a/src/qt/locale/nyc3_ka.ts +++ b/src/qt/locale/nyc3_ka.ts @@ -66,11 +66,11 @@ მიმღები მისამართი - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. ეს არის თქვენი ბიტკოინ-მისამართები, რომელთაგანაც შეგიძლიათ გადახდა. აუცილებლად შეამოწმეთ თანხა და მიმღები მისამართი გაგზავნამდე. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. ეს არის თქვენი ბიტკოინ-მისამართები, რომლებზეც შეგიძლიათ მიიღოთ თანხები. რეკომენდებულია ყოველი ტრანსაქციისათვის ახალი მიმღები მისამართის გამოყენება. @@ -220,7 +220,7 @@ - BitcoinGUI + NYC3GUI Sign &message... ხელ&მოწერა @@ -311,7 +311,7 @@ Send coins to a NYC3 address - მონეტების გაგზავნა Bitcoin-მისამართზე + მონეტების გაგზავნა NYC3-მისამართზე Backup wallet to another location @@ -334,8 +334,8 @@ &ვერიფიკაცია - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -358,12 +358,12 @@ თქვენი საფულის პირადი გასაღებების დაშიფრვა - Sign messages with your Bitcoin addresses to prove you own them - მესიჯებზე ხელმოწერა თქვენი Bitcoin-მისამართებით იმის დასტურად, რომ ის თქვენია + Sign messages with your NYC3 addresses to prove you own them + მესიჯებზე ხელმოწერა თქვენი NYC3-მისამართებით იმის დასტურად, რომ ის თქვენია - Verify messages to ensure they were signed with specified Bitcoin addresses - შეამოწმეთ, რომ მესიჯები ხელმოწერილია მითითებული Bitcoin-მისამართით + Verify messages to ensure they were signed with specified NYC3 addresses + შეამოწმეთ, რომ მესიჯები ხელმოწერილია მითითებული NYC3-მისამართით &File @@ -677,8 +677,8 @@ მითითებული კატალოგის გამოყენება: - Bitcoin - Bitcoin + NYC3 + NYC3 Error @@ -778,8 +778,8 @@ დაუდასტურებელი ხურდის გამოყენების აკრძალვის შემდეგ მათი გამოყენება შეუძლებელი იქნება, სანამ ტრანსაქციას არ ექნება ერთი დასტური მაინც. ეს აისახება თქვენი ნაშთის დათვლაზეც. - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - როუტერში Bitcoin-კლიენტის პორტის ავტომატური გახსნა. მუშაობს, თუ თქვენს როუტერს ჩართული აქვს UPnP. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + როუტერში NYC3-კლიენტის პორტის ავტომატური გახსნა. მუშაობს, თუ თქვენს როუტერს ჩართული აქვს UPnP. Map port using &UPnP @@ -889,8 +889,8 @@ ფორმა - 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. - ნაჩვენები ინფორმაცია შეიძლება მოძველებული იყოს. თქვენი საფულე ავტომატურად სინქრონიზდება Bitcoin-ის ქსელთან კავშირის დამყარების შემდეგ, ეს პროცესი ჯერ არ არის დასრულებული. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + ნაჩვენები ინფორმაცია შეიძლება მოძველებული იყოს. თქვენი საფულე ავტომატურად სინქრონიზდება NYC3-ის ქსელთან კავშირის დამყარების შემდეგ, ეს პროცესი ჯერ არ არის დასრულებული. Available: @@ -1078,7 +1078,7 @@ &მესიჯი: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. არააუცილებელი მესიჯი, რომელიც ერთვის გადახდის მოთხოვნას და ნაჩვენები იქნება მოთხოვნის გახსნისას. შენიშვნა: მესიჯი არ გაყვება გადახდას ბითქოინის ქსელში. @@ -1330,7 +1330,7 @@ შეიყვანეთ ამ მისამართის ნიშნული გამოყენებული მისამართების სიაში დასამატებლად - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. მესიჯი, რომელიც თან ერთვის მონეტებს: URI, რომელიც შეინახება ტრანსაქციასთან ერთად თქვენთვის. შენიშვნა: მესიჯი არ გაყვება გადახდას ბითქოინის ქსელში. @@ -1412,7 +1412,7 @@ Verify the message to ensure it was signed with the specified NYC3 address - შეამოწმეთ, რომ მესიჯი ხელმოწერილია მითითებული Bitcoin-მისამართით + შეამოწმეთ, რომ მესიჯი ხელმოწერილია მითითებული NYC3-მისამართით Verify &Message diff --git a/src/qt/locale/nyc3_kk_KZ.ts b/src/qt/locale/nyc3_kk_KZ.ts index 0ba02518b..2d680c8c9 100644 --- a/src/qt/locale/nyc3_kk_KZ.ts +++ b/src/qt/locale/nyc3_kk_KZ.ts @@ -48,7 +48,7 @@ BanTableModel - BitcoinGUI + NYC3GUI &Transactions &Транзакциялар @@ -70,7 +70,7 @@ Құпия сөзді өзгерту - Bitcoin + NYC3 Биткоин @@ -165,7 +165,7 @@ Intro - Bitcoin + NYC3 Биткоин diff --git a/src/qt/locale/nyc3_ko.ts b/src/qt/locale/nyc3_ko.ts index 80d1dfc31..75244466d 100644 --- a/src/qt/locale/nyc3_ko.ts +++ b/src/qt/locale/nyc3_ko.ts @@ -66,11 +66,11 @@ 받을 주소 - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. 이것은 비트코인 전송을 위한 주소입니다. 코인을 보내기 전에 항상 받는 주소와 수량을 확인하세요 - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. 이것은 비트코인 수신을 위한 주소입니다. 코인을 받을 때 마다 항상 다른 주소를 사용 하시는 것을 권장합니다. @@ -216,7 +216,7 @@ - BitcoinGUI + NYC3GUI Sign &message... &메시지에 서명하기... diff --git a/src/qt/locale/nyc3_ko_KR.ts b/src/qt/locale/nyc3_ko_KR.ts index bf0a733fa..a00b9995f 100644 --- a/src/qt/locale/nyc3_ko_KR.ts +++ b/src/qt/locale/nyc3_ko_KR.ts @@ -66,11 +66,11 @@ 받는 주소들 - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. 비트코인을 보내는 계좌 주소입니다. 코인을 보내기 전에 금액과 받는 주소를 항상 확인하세요. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. 비트코인을 받을 수 있는 계좌 주소입니다. 매 거래마다 새로운 주소 사용을 권장합니다. @@ -240,7 +240,7 @@ - BitcoinGUI + NYC3GUI Sign &message... 메시지 서명(&M)... @@ -366,7 +366,7 @@ 메시지 검증(&V)... - Bitcoin + NYC3 비트코인 @@ -390,11 +390,11 @@ 지갑에 포함된 개인키 암호화하기 - Sign messages with your Bitcoin addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them 지갑 주소가 본인 소유인지 증명하기 위해 메시지를 서명합니다 - Verify messages to ensure they were signed with specified Bitcoin addresses + Verify messages to ensure they were signed with specified NYC3 addresses 해당 비트코인 주소로 서명되었는지 확인하기 위해 메시지를 검증합니다 @@ -434,7 +434,7 @@ 명령줄 옵션(&C) - %n active connection(s) to Bitcoin network + %n active connection(s) to NYC3 network 비트코인 네트워크에 %n개의 연결 활성화됨 @@ -502,7 +502,7 @@ 지갑 닫기 - Show the %1 help message to get a list with possible Bitcoin command-line options + Show the %1 help message to get a list with possible NYC3 command-line options 사용할 수 있는 비트코인 명령줄 옵션 목록을 가져오기 위해 %1 도움말 메시지를 표시합니다 @@ -614,7 +614,7 @@ 지갑이 <b>암호화</b> 되었고 현재 <b>잠겨져</b> 있습니다 - A fatal error occurred. Bitcoin can no longer continue safely and will quit. + A fatal error occurred. NYC3 can no longer continue safely and will quit. 치명적인 오류가 발생했습니다. 비트코인을 더이상 안전하게 진행할 수 없어 곧 종료합니다. @@ -901,7 +901,7 @@ 커스텀 데이터 폴더 사용: - Bitcoin + NYC3 비트코인 @@ -913,7 +913,7 @@ 약 %1 GB의 데이터가 이 디렉토리에 저장됩니다. - %1 will download and store a copy of the Bitcoin block chain. + %1 will download and store a copy of the NYC3 block chain. %1은 비트코인 블록체인의 사본을 다운로드하여 저장합니다. @@ -1130,7 +1130,7 @@ 검증되지 않은 잔돈 쓰기 (&S) - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. 라우터에서 비트코인 클라이언트 포트를 자동적으로 엽니다. 라우터에서 UPnP를 지원하고 활성화 했을 경우에만 동작합니다. @@ -1146,7 +1146,7 @@ 연결 요청을 허용 (&G) - Connect to the Bitcoin network through a SOCKS5 proxy. + Connect to the NYC3 network through a SOCKS5 proxy. SOCKS5 프록시를 통해 비트코인 네트워크에 연결합니다. @@ -1182,7 +1182,7 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. Tor 서비스를 경유하여 비트코인 네트워크에 연결하기 위해 분리된 SOCKS5 프록시를 사용합니다. @@ -1293,7 +1293,7 @@ 유형 - 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. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. 표시된 정보가 오래된 것 같습니다. 비트코인 네트워크에 연결하고 난 다음에 지갑을 자동으로 동기화 하지만, 아직 과정이 끝나지는 않았습니다. @@ -1954,7 +1954,7 @@ 메시지(&M): - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. 지불 요청에 첨부되는 선택가능한 메시지 입니다. 이 메세지는 요청이 열릴 때 표시될 것 입니다. 메모: 이 메시지는 비트코인 네트워크로 전송되지 않습니다. @@ -2474,7 +2474,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p 이 주소에 라벨을 입력하면 사용된 주소 목록에 라벨이 표시됩니다 - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. bitcoin: URI에 추가된 메시지는 참고를 위해 거래내역과 함께 저장될 것입니다. Note: 이 메시지는 비트코인 네트워크로 전송되지 않습니다. diff --git a/src/qt/locale/nyc3_ku_IQ.ts b/src/qt/locale/nyc3_ku_IQ.ts index b614822d3..395babaa0 100644 --- a/src/qt/locale/nyc3_ku_IQ.ts +++ b/src/qt/locale/nyc3_ku_IQ.ts @@ -40,7 +40,7 @@ BanTableModel - BitcoinGUI + NYC3GUI &Send &ناردن diff --git a/src/qt/locale/nyc3_ky.ts b/src/qt/locale/nyc3_ky.ts index 040324c28..dd956bd94 100644 --- a/src/qt/locale/nyc3_ky.ts +++ b/src/qt/locale/nyc3_ky.ts @@ -28,7 +28,7 @@ BanTableModel - BitcoinGUI + NYC3GUI &Transactions &Транзакциялар @@ -38,8 +38,8 @@ Билдирүүнү &текшерүү... - Bitcoin - Bitcoin + NYC3 + NYC3 &File @@ -101,8 +101,8 @@ Intro - Bitcoin - Bitcoin + NYC3 + NYC3 Error diff --git a/src/qt/locale/nyc3_la.ts b/src/qt/locale/nyc3_la.ts index 81f0cd58e..e7152f058 100644 --- a/src/qt/locale/nyc3_la.ts +++ b/src/qt/locale/nyc3_la.ts @@ -56,7 +56,7 @@ BanTableModel - BitcoinGUI + NYC3GUI Sign &message... Signa &nuntium... @@ -119,7 +119,7 @@ Send coins to a NYC3 address - Mitte nummos ad inscriptionem Bitcoin + Mitte nummos ad inscriptionem NYC3 Backup wallet to another location @@ -142,8 +142,8 @@ &Verifica nuntium... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -166,12 +166,12 @@ Cifra claves privatas quae cassidili tui sunt - Sign messages with your Bitcoin addresses to prove you own them - Signa nuntios cum tuis inscriptionibus Bitcoin ut demonstres te eas possidere + Sign messages with your NYC3 addresses to prove you own them + Signa nuntios cum tuis inscriptionibus NYC3 ut demonstres te eas possidere - Verify messages to ensure they were signed with specified Bitcoin addresses - Verifica nuntios ut certus sis eos signatos esse cum specificatis inscriptionibus Bitcoin + Verify messages to ensure they were signed with specified NYC3 addresses + Verifica nuntios ut certus sis eos signatos esse cum specificatis inscriptionibus NYC3 &File @@ -297,8 +297,8 @@ Intro - Bitcoin - Bitcoin + NYC3 + NYC3 Error @@ -346,8 +346,8 @@ Cassidile - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Aperi per se portam clientis Bitcoin in itineratore. Hoc tantum effectivum est si itineratrum tuum supportat UPnP et id activum est. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Aperi per se portam clientis NYC3 in itineratore. Hoc tantum effectivum est si itineratrum tuum supportat UPnP et id activum est. Map port using &UPnP @@ -429,8 +429,8 @@ Schema - 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. - Monstrata informatio fortasse non recentissima est. Tuum cassidile per se synchronizat cum rete Bitcoin postquam conexio constabilita est, sed hoc actio nondum perfecta est. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Monstrata informatio fortasse non recentissima est. Tuum cassidile per se synchronizat cum rete NYC3 postquam conexio constabilita est, sed hoc actio nondum perfecta est. Immature: @@ -680,7 +680,7 @@ Sign the message to prove you own this NYC3 address - Signa nuntium ut demonstres hanc inscriptionem Bitcoin a te possessa esse + Signa nuntium ut demonstres hanc inscriptionem NYC3 a te possessa esse Sign &Message @@ -700,7 +700,7 @@ Verify the message to ensure it was signed with the specified NYC3 address - Verifica nuntium ut cures signatum esse cum specifica inscriptione Bitcoin + Verifica nuntium ut cures signatum esse cum specifica inscriptione NYC3 Verify &Message @@ -756,7 +756,7 @@ bitcoin-core NYC3 - Bitcoin Nucleus + NYC3 Nucleus Corrupted block database detected diff --git a/src/qt/locale/nyc3_lt.ts b/src/qt/locale/nyc3_lt.ts index c26b80a1d..addfa5b59 100644 --- a/src/qt/locale/nyc3_lt.ts +++ b/src/qt/locale/nyc3_lt.ts @@ -66,12 +66,12 @@ Gavimo adresai - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Tai yra jūsų Bitcoin adresai išeinantiems mokėjimams. Visada pasitikrinkite sumą ir gavėjo adresą prieš siunčiant lėšas. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Tai yra jūsų NYC3 adresai išeinantiems mokėjimams. Visada pasitikrinkite sumą ir gavėjo adresą prieš siunčiant lėšas. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Tai yra Jūsų Bitcoin adresai įeinantiems mokėjimams. Kiekvienam mokėjimui rekomenduojama naudoti naują adresą. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Tai yra Jūsų NYC3 adresai įeinantiems mokėjimams. Kiekvienam mokėjimui rekomenduojama naudoti naują adresą. &Copy Address @@ -232,7 +232,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Pasirašyti ži&nutę... @@ -331,7 +331,7 @@ Send coins to a NYC3 address - Siųsti monetas Bitcoin adresui + Siųsti monetas NYC3 adresui Backup wallet to another location @@ -354,8 +354,8 @@ &Tikrinti žinutę... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -378,12 +378,12 @@ Užšifruoti privačius raktus, kurie priklauso jūsų piniginei - Sign messages with your Bitcoin addresses to prove you own them - Pasirašydami žinutes su savo Bitcoin adresais įrodysite jog esate jų savininkas + Sign messages with your NYC3 addresses to prove you own them + Pasirašydami žinutes su savo NYC3 adresais įrodysite jog esate jų savininkas - Verify messages to ensure they were signed with specified Bitcoin addresses - Patikrinkite žinutę, jog įsitikintumėte, kad ją pasirašė nurodytas Bitcoin adresas + Verify messages to ensure they were signed with specified NYC3 addresses + Patikrinkite žinutę, jog įsitikintumėte, kad ją pasirašė nurodytas NYC3 adresas &File @@ -645,8 +645,8 @@ Sveiki - Bitcoin - Bitcoin + NYC3 + NYC3 The wallet will also be stored in this directory. @@ -698,8 +698,8 @@ Piniginė - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Automatiškai atidaryti Bitcoin kliento prievadą maršrutizatoriuje. Tai veikia tik tada, kai jūsų maršrutizatorius palaiko UPnP ir ji įjungta. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Automatiškai atidaryti NYC3 kliento prievadą maršrutizatoriuje. Tai veikia tik tada, kai jūsų maršrutizatorius palaiko UPnP ir ji įjungta. Map port using &UPnP @@ -1208,7 +1208,7 @@ Verify the message to ensure it was signed with the specified NYC3 address - Patikrinkite žinutę, jog įsitikintumėte, kad ją pasirašė nurodytas Bitcoin adresas + Patikrinkite žinutę, jog įsitikintumėte, kad ją pasirašė nurodytas NYC3 adresas Verify &Message @@ -1308,7 +1308,7 @@ bitcoin-core NYC3 - Bitcoin branduolys + NYC3 branduolys Error opening block database diff --git a/src/qt/locale/nyc3_lv_LV.ts b/src/qt/locale/nyc3_lv_LV.ts index 80aa35169..c6ed2741a 100644 --- a/src/qt/locale/nyc3_lv_LV.ts +++ b/src/qt/locale/nyc3_lv_LV.ts @@ -136,7 +136,7 @@ BanTableModel - BitcoinGUI + NYC3GUI Sign &message... Parakstīt &ziņojumu... @@ -203,7 +203,7 @@ Send coins to a NYC3 address - Nosūtīt bitkoinus uz Bitcoin adresi + Nosūtīt bitkoinus uz NYC3 adresi Backup wallet to another location @@ -226,8 +226,8 @@ &Pārbaudīt ziņojumu... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -250,12 +250,12 @@ Šifrēt privātās atslēgas kuras pieder tavam maciņam - Sign messages with your Bitcoin addresses to prove you own them - Parakstīt ziņojumus ar savām Bitcoin adresēm lai pierādītu ka tās pieder tev + Sign messages with your NYC3 addresses to prove you own them + Parakstīt ziņojumus ar savām NYC3 adresēm lai pierādītu ka tās pieder tev - Verify messages to ensure they were signed with specified Bitcoin addresses - Pārbaudīt ziņojumus lai pārliecinātos, ka tie tika parakstīti ar norādītajām Bitcoin adresēm + Verify messages to ensure they were signed with specified NYC3 addresses + Pārbaudīt ziņojumus lai pārliecinātos, ka tie tika parakstīti ar norādītajām NYC3 adresēm &File @@ -457,8 +457,8 @@ Izmantot pielāgotu datu mapi: - Bitcoin - Bitcoin + NYC3 + NYC3 Error @@ -550,8 +550,8 @@ &Tērēt neapstiprinātu atlikumu - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Uz rūtera automātiski atvērt Bitcoin klienta portu. Tas strādā tikai tad, ja rūteris atbalsta UPnP un tas ir ieslēgts. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Uz rūtera automātiski atvērt NYC3 klienta portu. Tas strādā tikai tad, ja rūteris atbalsta UPnP un tas ir ieslēgts. Map port using &UPnP @@ -603,7 +603,7 @@ Whether to show coin control features or not. - Vai rādīt Bitcoin kontroles funkcijas vai nē. + Vai rādīt NYC3 kontroles funkcijas vai nē. &OK @@ -641,8 +641,8 @@ Forma - 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. - Attēlotā informācija var būt novecojusi. Jūsu maciņš pēc savienojuma izveides automātiski sinhronizējas ar Bitcoin tīklu, taču šis process vēl nav beidzies. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Attēlotā informācija var būt novecojusi. Jūsu maciņš pēc savienojuma izveides automātiski sinhronizējas ar NYC3 tīklu, taču šis process vēl nav beidzies. Available: @@ -908,7 +908,7 @@ Coin Control Features - Bitcoin Kontroles Funkcijas + NYC3 Kontroles Funkcijas Inputs... @@ -1092,7 +1092,7 @@ Sign the message to prove you own this NYC3 address - Parakstīt ziņojumu lai pierādītu, ka esi šīs Bitcoin adreses īpašnieks. + Parakstīt ziņojumu lai pierādītu, ka esi šīs NYC3 adreses īpašnieks. Sign &Message diff --git a/src/qt/locale/nyc3_mk_MK.ts b/src/qt/locale/nyc3_mk_MK.ts index 80022c407..083a692d5 100644 --- a/src/qt/locale/nyc3_mk_MK.ts +++ b/src/qt/locale/nyc3_mk_MK.ts @@ -64,7 +64,7 @@ BanTableModel - BitcoinGUI + NYC3GUI Sign &message... Потпиши &порака... @@ -134,7 +134,7 @@ &Потврди порака... - Bitcoin + NYC3 Биткоин @@ -287,7 +287,7 @@ Intro - Bitcoin + NYC3 Биткоин diff --git a/src/qt/locale/nyc3_ml.ts b/src/qt/locale/nyc3_ml.ts index 3e34b8b36..68bf8b007 100644 --- a/src/qt/locale/nyc3_ml.ts +++ b/src/qt/locale/nyc3_ml.ts @@ -63,11 +63,11 @@ സ്വീകരിക്കുന്ന വിലാസങ്ങൾ - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. പേയ്മെന്റുകൾ അയയ്ക്കുന്നതിനുള്ള നിങ്ങളുടെ ബിറ്റ്കോയിൻ വിലാസങ്ങളാണ് ഇവ. നാണയങ്ങൾ അയയ്ക്കുന്നതിനുമുമ്പ് എല്ലായ്പ്പോഴും തുകയും സ്വീകരിക്കുന്ന വിലാസവും പരിശോധിക്കുക. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. പേയ്മെന്റ് സ്വീകരിക്കുന്നതിന് നിങ്ങളുടെ ബിറ്റ്കോയിൻ വിലാസങ്ങളാണ് ഇവ. ഓരോ ഇടപാടിനും പുതിയ സ്വീകരിക്കുന്ന വിലാസം ഉപയോഗിക്കുന്നതാണ് ഉചിതം. @@ -173,7 +173,7 @@ BanTableModel - BitcoinGUI + NYC3GUI CoinControlDialog diff --git a/src/qt/locale/nyc3_mn.ts b/src/qt/locale/nyc3_mn.ts index 04d941c33..fb41d2564 100644 --- a/src/qt/locale/nyc3_mn.ts +++ b/src/qt/locale/nyc3_mn.ts @@ -64,7 +64,7 @@ BanTableModel - BitcoinGUI + NYC3GUI Sign &message... &Зурвас хавсаргах... @@ -122,7 +122,7 @@ Оношилгоо ба засварын консолыг онгойлго - Bitcoin + NYC3 Биткойн @@ -221,7 +221,7 @@ Intro - Bitcoin + NYC3 Биткойн diff --git a/src/qt/locale/nyc3_ms_MY.ts b/src/qt/locale/nyc3_ms_MY.ts index 27716e95d..efda102eb 100644 --- a/src/qt/locale/nyc3_ms_MY.ts +++ b/src/qt/locale/nyc3_ms_MY.ts @@ -68,12 +68,12 @@ Alihkan fail data ke dalam tab semasa alamat-alamat penerimaan - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Ini adalah alamat Bitcoin anda untuk pembayaran. Periksa jumlah dan alamat penerima sebelum membuat penghantaran koin sentiasa. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Ini adalah alamat NYC3 anda untuk pembayaran. Periksa jumlah dan alamat penerima sebelum membuat penghantaran koin sentiasa. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Ini adalah alamat Bitcoin anda untuk menerima pembayaraan. Anda disyorkan untuk menguna alamat menerima untuk setiap transaksi. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Ini adalah alamat NYC3 anda untuk menerima pembayaraan. Anda disyorkan untuk menguna alamat menerima untuk setiap transaksi. &Copy Address @@ -239,7 +239,7 @@ Alihkan fail data ke dalam tab semasa - BitcoinGUI + NYC3GUI Sign &message... Tandatangan & mesej... @@ -338,7 +338,7 @@ Alihkan fail data ke dalam tab semasa Send coins to a NYC3 address - Menghantar koin kepada alamat Bitcoin + Menghantar koin kepada alamat NYC3 Backup wallet to another location @@ -361,8 +361,8 @@ Alihkan fail data ke dalam tab semasa sahkan mesej - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -385,12 +385,12 @@ Alihkan fail data ke dalam tab semasa sulitkan kata laluan milik peribadi anda - Sign messages with your Bitcoin addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them sahkan mesej bersama alamat bitcoin anda untuk menunjukkan alamat ini anda punya - Verify messages to ensure they were signed with specified Bitcoin addresses - Sahkan mesej untuk memastikan mereka telah ditandatangani dengan alamat Bitcoin yang ditentukan + Verify messages to ensure they were signed with specified NYC3 addresses + Sahkan mesej untuk memastikan mereka telah ditandatangani dengan alamat NYC3 yang ditentukan &File @@ -484,8 +484,8 @@ Alihkan fail data ke dalam tab semasa Intro - Bitcoin - Bitcoin + NYC3 + NYC3 Error diff --git a/src/qt/locale/nyc3_nb.ts b/src/qt/locale/nyc3_nb.ts index 1f7678ea0..ec79660eb 100644 --- a/src/qt/locale/nyc3_nb.ts +++ b/src/qt/locale/nyc3_nb.ts @@ -66,12 +66,12 @@ Mottaksadresser - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Dette er dine Bitcoin-adresser for sending av betalinger. Sjekk alltid beløpet og mottakeradressen før sending av mynter. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Dette er dine NYC3-adresser for sending av betalinger. Sjekk alltid beløpet og mottakeradressen før sending av mynter. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Dette er dine Bitcoin-adresser for å sende betalinger med. Det er anbefalt å bruke en ny mottaksadresse for hver transaksjon. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Dette er dine NYC3-adresser for å sende betalinger med. Det er anbefalt å bruke en ny mottaksadresse for hver transaksjon. &Copy Address @@ -236,7 +236,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Signer &melding... @@ -331,7 +331,7 @@ Send coins to a NYC3 address - Send til en Bitcoin-adresse + Send til en NYC3-adresse Backup wallet to another location @@ -354,8 +354,8 @@ &Verifiser melding... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -378,12 +378,12 @@ Krypter de private nøklene som tilhører lommeboken din - Sign messages with your Bitcoin addresses to prove you own them - Signer en melding med Bitcoin-adressene dine for å bevise at du eier dem + Sign messages with your NYC3 addresses to prove you own them + Signer en melding med NYC3-adressene dine for å bevise at du eier dem - Verify messages to ensure they were signed with specified Bitcoin addresses - Bekreft meldinger for å være sikker på at de ble signert av en angitt Bitcoin-adresse + Verify messages to ensure they were signed with specified NYC3 addresses + Bekreft meldinger for å være sikker på at de ble signert av en angitt NYC3-adresse &File @@ -415,15 +415,15 @@ Open a bitcoin: URI or payment request - Åpne en Bitcoin: URI eller betalingsetterspørring + Åpne en NYC3: URI eller betalingsetterspørring &Command-line options &Kommandolinjevalg - %n active connection(s) to Bitcoin network - %n aktiv forbindelse til Bitcoin-nettverket%n aktive forbindelser til Bitcoin-nettverket + %n active connection(s) to NYC3 network + %n aktiv forbindelse til NYC3-nettverket%n aktive forbindelser til NYC3-nettverket Indexing blocks on disk... @@ -466,8 +466,8 @@ Oppdatert - Show the %1 help message to get a list with possible Bitcoin command-line options - Vis %1 hjelpemeldingen for å få en liste med mulige Bitcoin kommandolinjevalg. + Show the %1 help message to get a list with possible NYC3 command-line options + Vis %1 hjelpemeldingen for å få en liste med mulige NYC3 kommandolinjevalg. &Window @@ -544,8 +544,8 @@ Lommeboken er <b>kryptert</b> og for tiden <b>låst</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - En fatal feil har inntruffet. Bitcoin kan ikke lenger trygt fortsette, og må derfor avslutte. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + En fatal feil har inntruffet. NYC3 kan ikke lenger trygt fortsette, og må derfor avslutte. @@ -735,7 +735,7 @@ The entered address "%1" is not a valid NYC3 address. - Den angitte adressen "%1" er ikke en gyldig Bitcoin-adresse. + Den angitte adressen "%1" er ikke en gyldig NYC3-adresse. Could not unlock wallet. @@ -823,8 +823,8 @@ Bruk en egendefinert datamappe: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -835,8 +835,8 @@ Omtrent %1GB data vil bli lagret i denne mappen. - %1 will download and store a copy of the Bitcoin block chain. - %1 vil laste ned og lagre en kopi av Bitcoin blokkjeden. + %1 will download and store a copy of the NYC3 block chain. + %1 vil laste ned og lagre en kopi av NYC3 blokkjeden. The wallet will also be stored in this directory. @@ -1028,8 +1028,8 @@ &Bruk ubekreftet veksel - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Åpne automatisk Bitcoin klientporten på ruteren. Dette virker kun om din ruter støtter UPnP og dette er påslått. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Åpne automatisk NYC3 klientporten på ruteren. Dette virker kun om din ruter støtter UPnP og dette er påslått. Map port using &UPnP @@ -1044,8 +1044,8 @@ Tillatt innkommend&e tilkoblinger - Connect to the Bitcoin network through a SOCKS5 proxy. - Koble til Bitcoin-nettverket gjennom en SOCKS5 proxy. + Connect to the NYC3 network through a SOCKS5 proxy. + Koble til NYC3-nettverket gjennom en SOCKS5 proxy. &Connect through SOCKS5 proxy (default proxy): @@ -1080,8 +1080,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Koble til Bitcoin-nettverket gjennom en separat SOCKS5 mellomtjener for Tor skjulte tjenester. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Koble til NYC3-nettverket gjennom en separat SOCKS5 mellomtjener for Tor skjulte tjenester. &Window @@ -1187,8 +1187,8 @@ Skjema - 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. - Informasjonen som vises kan være foreldet. Din lommebok synkroniseres automatisk med Bitcoin-nettverket etter at tilkobling er opprettet, men denne prosessen er ikke ferdig enda. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Informasjonen som vises kan være foreldet. Din lommebok synkroniseres automatisk med NYC3-nettverket etter at tilkobling er opprettet, men denne prosessen er ikke ferdig enda. Watch-only: @@ -1381,7 +1381,7 @@ Enter a NYC3 address (e.g. %1) - Oppgi en Bitcoin-adresse (f.eks. %1) + Oppgi en NYC3-adresse (f.eks. %1) %1 d @@ -1800,8 +1800,8 @@ &Melding: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - En valgfri melding å tilknytte betalingsetterspørringen, som vil bli vist når forespørselen er åpnet. Meldingen vil ikke bli sendt med betalingen over Bitcoin-nettverket. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + En valgfri melding å tilknytte betalingsetterspørringen, som vil bli vist når forespørselen er åpnet. Meldingen vil ikke bli sendt med betalingen over NYC3-nettverket. An optional label to associate with the new receiving address. @@ -1958,7 +1958,7 @@ SendCoinsDialog Send Coins - Send Bitcoins + Send NYC3s Coin Control Features @@ -2237,7 +2237,7 @@ The NYC3 address to send the payment to - Bitcoin-adressen betalingen skal sendes til + NYC3-adressen betalingen skal sendes til Alt+A @@ -2284,8 +2284,8 @@ Skriv inn en merkelapp for denne adressen for å legge den til listen av brukte adresser - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - En melding som var tilknyttet bitcoinen: URI vil bli lagret med transaksjonen for din oversikt. Denne meldingen vil ikke bli sendt over Bitcoin-nettverket. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + En melding som var tilknyttet bitcoinen: URI vil bli lagret med transaksjonen for din oversikt. Denne meldingen vil ikke bli sendt over NYC3-nettverket. Pay To: @@ -2334,7 +2334,7 @@ The NYC3 address to sign the message with - Bitcoin-adressen meldingen skal signeres med + NYC3-adressen meldingen skal signeres med Choose previously used address @@ -2366,7 +2366,7 @@ Sign the message to prove you own this NYC3 address - Signer meldingen for å bevise at du eier denne Bitcoin-adressen + Signer meldingen for å bevise at du eier denne NYC3-adressen Sign &Message @@ -2390,11 +2390,11 @@ The NYC3 address the message was signed with - Bitcoin-adressen meldingen ble signert med + NYC3-adressen meldingen ble signert med Verify the message to ensure it was signed with the specified NYC3 address - Verifiser meldingen for å være sikker på at den ble signert av den angitte Bitcoin-adressen + Verifiser meldingen for å være sikker på at den ble signert av den angitte NYC3-adressen Verify &Message diff --git a/src/qt/locale/nyc3_ne.ts b/src/qt/locale/nyc3_ne.ts index d141875c6..1564eb506 100644 --- a/src/qt/locale/nyc3_ne.ts +++ b/src/qt/locale/nyc3_ne.ts @@ -93,7 +93,7 @@ - BitcoinGUI + NYC3GUI Sign &message... सन्देशमा &amp;हस्ताक्षर गर्नुहोस्... @@ -231,7 +231,7 @@ OverviewPage - 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. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. देखाइएको सूचना पूरानो हुन सक्छ । कनेक्सन स्थापित भएपछि, तपाईंको वालेट बिटकोइन नेटवर्कमा स्वचालित रूपमा समिकरण हुन्छ , तर यो प्रक्रिया अहिले सम्म पूरा भएको छैन । @@ -348,7 +348,7 @@ यो ठेगानालाई प्रयोग गरिएको ठेगानाको सूचीमा थप्न एउटा लेबल प्रविष्ट गर्नुहोस् - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. बिटकोइनमा संलग्न गरिएको सन्देश: तपाईंको मध्यस्थको लागि कारोबारको साथमा भण्डारण गरिने URI । नोट: यो सन्देश बिटकोइन नेटवर्क मार्फत पठाइने छैन । diff --git a/src/qt/locale/nyc3_nl.ts b/src/qt/locale/nyc3_nl.ts index d5253d545..ce252db94 100644 --- a/src/qt/locale/nyc3_nl.ts +++ b/src/qt/locale/nyc3_nl.ts @@ -66,12 +66,12 @@ Ontvangstadressen - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Dit zijn uw Bitcoinadressen om betalingen mee te verzenden. Controleer altijd het bedrag en het ontvangstadres voordat u uw bitcoins verzendt. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Dit zijn uw NYC3adressen om betalingen mee te verzenden. Controleer altijd het bedrag en het ontvangstadres voordat u uw bitcoins verzendt. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Dit zijn uw Bitcoin-adressen waarmee u betalingen kunt ontvangen. We raden u aan om een nieuw ontvangstadres voor elke transactie te gebruiken. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Dit zijn uw NYC3-adressen waarmee u betalingen kunt ontvangen. We raden u aan om een nieuw ontvangstadres voor elke transactie te gebruiken. &Copy Address @@ -240,7 +240,7 @@ - BitcoinGUI + NYC3GUI Sign &message... &Onderteken bericht... @@ -343,7 +343,7 @@ Send coins to a NYC3 address - Verstuur munten naar een Bitcoinadres + Verstuur munten naar een NYC3adres Backup wallet to another location @@ -366,8 +366,8 @@ &Verifiëer bericht... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -390,12 +390,12 @@ Versleutel de geheime sleutels die bij uw portemonnee horen - Sign messages with your Bitcoin addresses to prove you own them - Onderteken berichten met uw Bitcoinadressen om te bewijzen dat u deze adressen bezit + Sign messages with your NYC3 addresses to prove you own them + Onderteken berichten met uw NYC3adressen om te bewijzen dat u deze adressen bezit - Verify messages to ensure they were signed with specified Bitcoin addresses - Verifiëer handtekeningen om zeker te zijn dat de berichten zijn ondertekend met de gespecificeerde Bitcoinadressen + Verify messages to ensure they were signed with specified NYC3 addresses + Verifiëer handtekeningen om zeker te zijn dat de berichten zijn ondertekend met de gespecificeerde NYC3adressen &File @@ -434,8 +434,8 @@ &Opdrachtregelopties - %n active connection(s) to Bitcoin network - %n actieve verbinding met Bitcoinnetwerk%n actieve verbindingen met Bitcoinnetwerk + %n active connection(s) to NYC3 network + %n actieve verbinding met NYC3netwerk%n actieve verbindingen met NYC3netwerk Indexing blocks on disk... @@ -502,8 +502,8 @@ Portemonnee Sluiten - Show the %1 help message to get a list with possible Bitcoin command-line options - Toon het %1 hulpbericht om een lijst te krijgen met mogelijke Bitcoin commandoregelopties + Show the %1 help message to get a list with possible NYC3 command-line options + Toon het %1 hulpbericht om een lijst te krijgen met mogelijke NYC3 commandoregelopties default wallet @@ -614,8 +614,8 @@ Portemonnee is <b>versleuteld</b> en momenteel <b>gesloten</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Een fatale fout heeft zich voorgedaan. Bitcoin kan niet veilig worden verdergezet en wordt afgesloten. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Een fatale fout heeft zich voorgedaan. NYC3 kan niet veilig worden verdergezet en wordt afgesloten. @@ -805,7 +805,7 @@ The entered address "%1" is not a valid NYC3 address. - Het opgegeven adres "%1" is een ongeldig Bitcoinadres. + Het opgegeven adres "%1" is een ongeldig NYC3adres. Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -901,8 +901,8 @@ Gebruik een aangepaste gegevensmap: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -913,8 +913,8 @@ Gemiddeld %1 GB aan data zal worden opgeslagen in deze map. - %1 will download and store a copy of the Bitcoin block chain. - %1 zal een kopie van de blokketen van Bitcoin downloaden en opslaan. + %1 will download and store a copy of the NYC3 block chain. + %1 zal een kopie van de blokketen van NYC3 downloaden en opslaan. The wallet will also be stored in this directory. @@ -945,7 +945,7 @@ Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below. - Recente transacties zijn mogelijk nog niet zichtbaar. De balans van de portemonnee is daarom mogelijk niet correct. Deze informatie is correct van zodra de synchronisatie met het Bitcoin-netwerk werd voltooid, zoals onderaan beschreven. + Recente transacties zijn mogelijk nog niet zichtbaar. De balans van de portemonnee is daarom mogelijk niet correct. Deze informatie is correct van zodra de synchronisatie met het NYC3-netwerk werd voltooid, zoals onderaan beschreven. Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network. @@ -1130,8 +1130,8 @@ &Spendeer onbevestigd wisselgeld - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Open de Bitcoinpoort automatisch op de router. Dit werkt alleen als de router UPnP ondersteunt en het aanstaat. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Open de NYC3poort automatisch op de router. Dit werkt alleen als de router UPnP ondersteunt en het aanstaat. Map port using &UPnP @@ -1146,8 +1146,8 @@ Sta inkomende verbindingen toe - Connect to the Bitcoin network through a SOCKS5 proxy. - Verbind met het Bitcoinnetwerk via een SOCKS5 proxy. + Connect to the NYC3 network through a SOCKS5 proxy. + Verbind met het NYC3netwerk via een SOCKS5 proxy. &Connect through SOCKS5 proxy (default proxy): @@ -1182,8 +1182,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Maak verbinding met Bitcoinnetwerk door een aparte SOCKS5-proxy voor verborgen diensten van Tor. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Maak verbinding met NYC3netwerk door een aparte SOCKS5-proxy voor verborgen diensten van Tor. &Window @@ -1293,8 +1293,8 @@ Vorm - 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. - De weergegeven informatie kan verouderd zijn. Uw portemonnee synchroniseert automatisch met het Bitcoinnetwerk nadat een verbinding is gelegd, maar dit proces is nog niet voltooid. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + De weergegeven informatie kan verouderd zijn. Uw portemonnee synchroniseert automatisch met het NYC3netwerk nadat een verbinding is gelegd, maar dit proces is nog niet voltooid. Watch-only: @@ -1397,7 +1397,7 @@ URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - URI kan niet verwerkt worden! Dit kan het gevolg zijn van een ongeldig Bitcoin adres of misvormde URI parameters. + URI kan niet verwerkt worden! Dit kan het gevolg zijn van een ongeldig NYC3 adres of misvormde URI parameters. Payment request file handling @@ -1499,7 +1499,7 @@ Enter a NYC3 address (e.g. %1) - Voer een Bitcoinadres in (bijv. %1) + Voer een NYC3adres in (bijv. %1) %1 d @@ -1954,8 +1954,8 @@ &Bericht - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Een optioneel bericht om bij te voegen aan het betalingsverzoek, welke zal getoond worden wanneer het verzoek is geopend. Opmerking: Het bericht zal niet worden verzonden met de betaling over het Bitcoinnetwerk. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Een optioneel bericht om bij te voegen aan het betalingsverzoek, welke zal getoond worden wanneer het verzoek is geopend. Opmerking: Het bericht zal niet worden verzonden met de betaling over het NYC3netwerk. An optional label to associate with the new receiving address. @@ -2384,7 +2384,7 @@ Notitie: Omdat de vergoeding per byte wordt gerekend, zal een vergoeding van "10 Warning: Invalid NYC3 address - Waarschuwing: Ongeldig Bitcoinadres + Waarschuwing: Ongeldig NYC3adres Warning: Unknown change address @@ -2427,7 +2427,7 @@ Notitie: Omdat de vergoeding per byte wordt gerekend, zal een vergoeding van "10 The NYC3 address to send the payment to - Het Bitcoinadres om betaling aan te versturen + Het NYC3adres om betaling aan te versturen Alt+A @@ -2474,8 +2474,8 @@ Notitie: Omdat de vergoeding per byte wordt gerekend, zal een vergoeding van "10 Vul een label voor dit adres in om het aan de lijst met gebruikte adressen toe te voegen - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Een bericht dat werd toegevoegd aan de bitcoin: URI welke wordt opgeslagen met de transactie ter referentie. Opmerking: Dit bericht zal niet worden verzonden over het Bitcoinnetwerk. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Een bericht dat werd toegevoegd aan de bitcoin: URI welke wordt opgeslagen met de transactie ter referentie. Opmerking: Dit bericht zal niet worden verzonden over het NYC3netwerk. Pay To: @@ -2520,11 +2520,11 @@ Notitie: Omdat de vergoeding per byte wordt gerekend, zal een vergoeding van "10 You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to. - U kunt berichten/overeenkomsten ondertekenen met uw adres om te bewijzen dat u Bitcoins kunt versturen. Wees voorzichtig met het ondertekenen van iets vaags of willekeurigs, omdat phishingaanvallen u kunnen proberen te misleiden tot het ondertekenen van overeenkomsten om uw identiteit aan hen toe te vertrouwen. Onderteken alleen volledig gedetailleerde verklaringen voordat u akkoord gaat. + U kunt berichten/overeenkomsten ondertekenen met uw adres om te bewijzen dat u NYC3s kunt versturen. Wees voorzichtig met het ondertekenen van iets vaags of willekeurigs, omdat phishingaanvallen u kunnen proberen te misleiden tot het ondertekenen van overeenkomsten om uw identiteit aan hen toe te vertrouwen. Onderteken alleen volledig gedetailleerde verklaringen voordat u akkoord gaat. The NYC3 address to sign the message with - Het Bitcoinadres om bericht mee te ondertekenen + Het NYC3adres om bericht mee te ondertekenen Choose previously used address @@ -2556,7 +2556,7 @@ Notitie: Omdat de vergoeding per byte wordt gerekend, zal een vergoeding van "10 Sign the message to prove you own this NYC3 address - Onderteken een bericht om te bewijzen dat u een bepaald Bitcoinadres bezit + Onderteken een bericht om te bewijzen dat u een bepaald NYC3adres bezit Sign &Message @@ -2580,11 +2580,11 @@ Notitie: Omdat de vergoeding per byte wordt gerekend, zal een vergoeding van "10 The NYC3 address the message was signed with - Het Bitcoinadres waarmee het bericht ondertekend is + Het NYC3adres waarmee het bericht ondertekend is Verify the message to ensure it was signed with the specified NYC3 address - Controleer een bericht om te verifiëren dat het gespecificeerde Bitcoinadres het bericht heeft ondertekend. + Controleer een bericht om te verifiëren dat het gespecificeerde NYC3adres het bericht heeft ondertekend. Verify &Message diff --git a/src/qt/locale/nyc3_pam.ts b/src/qt/locale/nyc3_pam.ts index 7ae615f9e..15a4e333e 100644 --- a/src/qt/locale/nyc3_pam.ts +++ b/src/qt/locale/nyc3_pam.ts @@ -64,7 +64,7 @@ BanTableModel - BitcoinGUI + NYC3GUI Sign &message... I-sign ing &mensayi @@ -146,8 +146,8 @@ &Beripikan ing message... - Bitcoin - Bitcoin + NYC3 + NYC3 &Show / Hide @@ -281,8 +281,8 @@ Malaus ka - Bitcoin - Bitcoin + NYC3 + NYC3 Error @@ -318,8 +318,8 @@ &Network - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Ibuklat yang antimanu ing Bitcoin client port king router. Gagana yamu ini istung ing router mu susuporta yang UPnP at magsilbi ya. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Ibuklat yang antimanu ing NYC3 client port king router. Gagana yamu ini istung ing router mu susuporta yang UPnP at magsilbi ya. Map port using &UPnP @@ -397,8 +397,8 @@ Form - 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. - Ing makaltong impormasion mapalyaring luma ne. Ing kekang wallet otomatiku yang mag-synchronize keng Bitcoin network istung mekakonekta ne king network, oneng ing prosesung ini ali ya pa kumpletu. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Ing makaltong impormasion mapalyaring luma ne. Ing kekang wallet otomatiku yang mag-synchronize keng NYC3 network istung mekakonekta ne king network, oneng ing prosesung ini ali ya pa kumpletu. Your current spendable balance @@ -736,7 +736,7 @@ bitcoin-core NYC3 - Kapilubluban ning Bitcoin + Kapilubluban ning NYC3 Corrupted block database detected diff --git a/src/qt/locale/nyc3_pl.ts b/src/qt/locale/nyc3_pl.ts index a0d331600..563d32b68 100644 --- a/src/qt/locale/nyc3_pl.ts +++ b/src/qt/locale/nyc3_pl.ts @@ -66,12 +66,12 @@ Adresy odbioru - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Tutaj znajdują się adresy Bitcoin na które wysyłasz płatności. Zawsze sprawdzaj ilość i adres odbiorcy przed wysyłką monet. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Tutaj znajdują się adresy NYC3 na które wysyłasz płatności. Zawsze sprawdzaj ilość i adres odbiorcy przed wysyłką monet. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - To są twoje adresy Bitcoin do odbierania płatności. Zaleca się używanie nowych adresów odbiorczych dla każdej transakcji. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + To są twoje adresy NYC3 do odbierania płatności. Zaleca się używanie nowych adresów odbiorczych dla każdej transakcji. &Copy Address @@ -240,7 +240,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Podpisz wiado&mość... @@ -366,8 +366,8 @@ &Zweryfikuj wiadomość... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -390,11 +390,11 @@ Szyfruj klucze prywatne, które są w twoim portfelu - Sign messages with your Bitcoin addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them Podpisz wiadomości swoim adresem aby udowodnić jego posiadanie - Verify messages to ensure they were signed with specified Bitcoin addresses + Verify messages to ensure they were signed with specified NYC3 addresses Zweryfikuj wiadomość, aby upewnić się, że została podpisana podanym adresem bitcoinowym. @@ -434,8 +434,8 @@ &Opcje linii komend - %n active connection(s) to Bitcoin network - %n aktywnych połączeń do sieci Bitcoin%n aktywnych połączeń do sieci Bitcoin%n aktywnych połączeń do sieci Bitcoin%n aktywnych połączeń do sieci Bitcoin + %n active connection(s) to NYC3 network + %n aktywnych połączeń do sieci NYC3%n aktywnych połączeń do sieci NYC3%n aktywnych połączeń do sieci NYC3%n aktywnych połączeń do sieci NYC3 Indexing blocks on disk... @@ -486,7 +486,7 @@ Zamknij Portfel... - Show the %1 help message to get a list with possible Bitcoin command-line options + Show the %1 help message to get a list with possible NYC3 command-line options Pokaż pomoc %1 aby zobaczyć listę wszystkich opcji lnii poleceń. @@ -590,8 +590,8 @@ Portfel jest <b>zaszyfrowany</b> i obecnie <b>zablokowany</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Wystąpił krytyczny błąd. Bitcoin nie jest w stanie kontynuować bezpiecznie i zostanie zamknięty. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Wystąpił krytyczny błąd. NYC3 nie jest w stanie kontynuować bezpiecznie i zostanie zamknięty. @@ -781,7 +781,7 @@ The entered address "%1" is not a valid NYC3 address. - Wprowadzony adres "%1" nie jest prawidłowym adresem Bitcoin. + Wprowadzony adres "%1" nie jest prawidłowym adresem NYC3. Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -877,8 +877,8 @@ Użyj wybranego folderu dla danych - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -889,8 +889,8 @@ Około %1 GB danych zostanie zapisane w tym katalogu. - %1 will download and store a copy of the Bitcoin block chain. - %1 pobierze i zapisze lokalnie kopię łańcucha bloków Bitcoin. + %1 will download and store a copy of the NYC3 block chain. + %1 pobierze i zapisze lokalnie kopię łańcucha bloków NYC3. The wallet will also be stored in this directory. @@ -1098,8 +1098,8 @@ Wydaj niepotwierdzoną re&sztę - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Automatycznie otwiera port klienta Bitcoin na routerze. Ta opcja dzieła tylko jeśli twój router wspiera UPnP i jest ono włączone. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Automatycznie otwiera port klienta NYC3 na routerze. Ta opcja dzieła tylko jeśli twój router wspiera UPnP i jest ono włączone. Map port using &UPnP @@ -1114,8 +1114,8 @@ Zezwól na &połączenia przychodzące - Connect to the Bitcoin network through a SOCKS5 proxy. - Połącz się z siecią Bitcoin poprzez proxy SOCKS5. + Connect to the NYC3 network through a SOCKS5 proxy. + Połącz się z siecią NYC3 poprzez proxy SOCKS5. &Connect through SOCKS5 proxy (default proxy): @@ -1150,8 +1150,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Połącz się z siecią Bitcoin przy pomocy oddzielnego SOCKS5 proxy dla sieci TOR + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Połącz się z siecią NYC3 przy pomocy oddzielnego SOCKS5 proxy dla sieci TOR &Window @@ -1257,7 +1257,7 @@ Formularz - 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. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 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ą bitcoin, zaraz po tym jak uzyskano połączenie, ale proces ten nie został jeszcze ukończony. @@ -1353,7 +1353,7 @@ URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - Nie można przeanalizować identyfikatora URI! Może to być spowodowane nieważnym adresem Bitcoin lub nieprawidłowymi parametrami URI. + Nie można przeanalizować identyfikatora URI! Może to być spowodowane nieważnym adresem NYC3 lub nieprawidłowymi parametrami URI. Payment request file handling @@ -1898,8 +1898,8 @@ &Wiadomość: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Opcjonalna wiadomość do dołączenia do żądania płatności, która będzie wyświetlana, gdy żądanie zostanie otwarte. Uwaga: wiadomość ta nie zostanie wysłana wraz z płatnością w sieci Bitcoin. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Opcjonalna wiadomość do dołączenia do żądania płatności, która będzie wyświetlana, gdy żądanie zostanie otwarte. Uwaga: wiadomość ta nie zostanie wysłana wraz z płatnością w sieci NYC3. An optional label to associate with the new receiving address. @@ -2321,7 +2321,7 @@ Uwaga: Ponieważ opłata jest naliczana za każdy bajt, opłata "100 satoshi za Warning: Invalid NYC3 address - Ostrzeżenie: nieprawidłowy adres Bitcoin + Ostrzeżenie: nieprawidłowy adres NYC3 Warning: Unknown change address @@ -2364,7 +2364,7 @@ Uwaga: Ponieważ opłata jest naliczana za każdy bajt, opłata "100 satoshi za The NYC3 address to send the payment to - Adres Bitcoin gdzie wysłać płatność + Adres NYC3 gdzie wysłać płatność Alt+A @@ -2411,8 +2411,8 @@ Uwaga: Ponieważ opłata jest naliczana za każdy bajt, opłata "100 satoshi za Wprowadź etykietę dla tego adresu by dodać go do listy użytych adresów - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Wiadomość, która została dołączona do URI bitcoin:, która będzie przechowywana wraz z transakcją w celach informacyjnych. Uwaga: Ta wiadomość nie będzie rozsyłana w sieci Bitcoin. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Wiadomość, która została dołączona do URI bitcoin:, która będzie przechowywana wraz z transakcją w celach informacyjnych. Uwaga: Ta wiadomość nie będzie rozsyłana w sieci NYC3. Pay To: @@ -2461,7 +2461,7 @@ Uwaga: Ponieważ opłata jest naliczana za każdy bajt, opłata "100 satoshi za The NYC3 address to sign the message with - Adres Bitcoin, za pomocą którego podpisać wiadomość + Adres NYC3, za pomocą którego podpisać wiadomość Choose previously used address @@ -2518,11 +2518,11 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw The NYC3 address the message was signed with - Adres Bitcoin, którym została podpisana wiadomość + Adres NYC3, którym została podpisana wiadomość Verify the message to ensure it was signed with the specified NYC3 address - Zweryfikuj wiadomość, aby upewnić się, że została podpisana odpowiednim adresem Bitcoin. + Zweryfikuj wiadomość, aby upewnić się, że została podpisana odpowiednim adresem NYC3. Verify &Message diff --git a/src/qt/locale/nyc3_pt_BR.ts b/src/qt/locale/nyc3_pt_BR.ts index 02de3211e..0a8928035 100644 --- a/src/qt/locale/nyc3_pt_BR.ts +++ b/src/qt/locale/nyc3_pt_BR.ts @@ -66,11 +66,11 @@ Endereço de &recebimento - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. Estes são os seus endereços para enviar pagamentos. Sempre cheque a quantia e o endereço do destinatário antes de enviar moedas. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. Estes são os seus endereços para receber pagamentos. É recomendado usar um novo para cada transação. @@ -240,7 +240,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Assinar &mensagem... @@ -366,8 +366,8 @@ &Verificar mensagem... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -390,12 +390,12 @@ Criptografar as chaves privadas que pertencem à sua carteira - Sign messages with your Bitcoin addresses to prove you own them - Assine mensagens com seus endereços Bitcoin para provar que você é dono delas + Sign messages with your NYC3 addresses to prove you own them + Assine mensagens com seus endereços NYC3 para provar que você é dono delas - Verify messages to ensure they were signed with specified Bitcoin addresses - Verificar mensagens para se assegurar que elas foram assinadas pelo dono de Endereços Bitcoin específicos + Verify messages to ensure they were signed with specified NYC3 addresses + Verificar mensagens para se assegurar que elas foram assinadas pelo dono de Endereços NYC3 específicos &File @@ -434,8 +434,8 @@ Opções de linha de &comando - %n active connection(s) to Bitcoin network - %n conexão ativa na rede Bitcoin%n conexões ativas na rede Bitcoin + %n active connection(s) to NYC3 network + %n conexão ativa na rede NYC3%n conexões ativas na rede NYC3 Indexing blocks on disk... @@ -502,8 +502,8 @@ Fechar carteira - Show the %1 help message to get a list with possible Bitcoin command-line options - Mostrar a mensagem de ajuda do %1 para obter uma lista com possíveis opções de linha de comando Bitcoin + Show the %1 help message to get a list with possible NYC3 command-line options + Mostrar a mensagem de ajuda do %1 para obter uma lista com possíveis opções de linha de comando NYC3 default wallet @@ -614,8 +614,8 @@ Carteira está <b>criptografada</b> e atualmente <b>bloqueada</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Um erro fatal ocorreu. Bitcoin não pode continuar em segurança e irá fechar. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Um erro fatal ocorreu. NYC3 não pode continuar em segurança e irá fechar. @@ -901,8 +901,8 @@ Use um diretório de dados personalizado: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -913,8 +913,8 @@ Aproximadamente %1 GB de dados serão armazenados neste diretório. - %1 will download and store a copy of the Bitcoin block chain. - %1 irá baixar e armazenar uma cópia da block chain do Bitcoin. + %1 will download and store a copy of the NYC3 block chain. + %1 irá baixar e armazenar uma cópia da block chain do NYC3. The wallet will also be stored in this directory. @@ -1130,8 +1130,8 @@ Ga&star troco não confirmado - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Abrir automaticamente no roteador as portas do cliente Bitcoin. Isto só funcionará se seu roteador suportar UPnP e esta função estiver habilitada. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Abrir automaticamente no roteador as portas do cliente NYC3. Isto só funcionará se seu roteador suportar UPnP e esta função estiver habilitada. Map port using &UPnP @@ -1146,8 +1146,8 @@ Permitir conexões de entrada - Connect to the Bitcoin network through a SOCKS5 proxy. - Conectar na rede Bitcoin através de um proxy SOCKS5. + Connect to the NYC3 network through a SOCKS5 proxy. + Conectar na rede NYC3 através de um proxy SOCKS5. &Connect through SOCKS5 proxy (default proxy): @@ -1182,8 +1182,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Conecte-se à rede Bitcoin através de um proxy SOCKS5 separado para utilizar serviços ocultos Tor. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Conecte-se à rede NYC3 através de um proxy SOCKS5 separado para utilizar serviços ocultos Tor. &Window @@ -1293,8 +1293,8 @@ Formulário - 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. - A informação mostrada pode estar desatualizada. Sua carteira sincroniza automaticamente com a rede Bitcoin depois que a conexão é estabelecida, mas este processo ainda não está completo. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + A informação mostrada pode estar desatualizada. Sua carteira sincroniza automaticamente com a rede NYC3 depois que a conexão é estabelecida, mas este processo ainda não está completo. Watch-only: @@ -1499,7 +1499,7 @@ Enter a NYC3 address (e.g. %1) - Informe um endereço Bitcoin (ex: %1) + Informe um endereço NYC3 (ex: %1) %1 d @@ -1954,8 +1954,8 @@ &Mensagem: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Uma mensagem opcional que será anexada na cobrança e será mostrada quando ela for aberta. Nota: A mensagem não será enviada com o pagamento pela rede Bitcoin. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Uma mensagem opcional que será anexada na cobrança e será mostrada quando ela for aberta. Nota: A mensagem não será enviada com o pagamento pela rede NYC3. An optional label to associate with the new receiving address. @@ -2384,7 +2384,7 @@ Nota: Como a taxa é calculada por byte, uma taxa de "100 satoshis por kB" por Warning: Invalid NYC3 address - Aviso: Endereço Bitcoin inválido + Aviso: Endereço NYC3 inválido Warning: Unknown change address @@ -2427,7 +2427,7 @@ Nota: Como a taxa é calculada por byte, uma taxa de "100 satoshis por kB" por The NYC3 address to send the payment to - O endereço Bitcoin para enviar o pagamento + O endereço NYC3 para enviar o pagamento Alt+A @@ -2474,8 +2474,8 @@ Nota: Como a taxa é calculada por byte, uma taxa de "100 satoshis por kB" por Digite um rótulo para este endereço para adicioná-lo no catálogo - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - A mensagem que foi anexada ao bitcoin: URI na qual será gravada na transação para sua referência. Nota: Essa mensagem não será gravada publicamente na rede Bitcoin. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + A mensagem que foi anexada ao bitcoin: URI na qual será gravada na transação para sua referência. Nota: Essa mensagem não será gravada publicamente na rede NYC3. Pay To: @@ -2524,7 +2524,7 @@ Nota: Como a taxa é calculada por byte, uma taxa de "100 satoshis por kB" por The NYC3 address to sign the message with - O endereço Bitcoin que assinará a mensagem + O endereço NYC3 que assinará a mensagem Choose previously used address @@ -2556,7 +2556,7 @@ Nota: Como a taxa é calculada por byte, uma taxa de "100 satoshis por kB" por Sign the message to prove you own this NYC3 address - Assinar mensagem para provar que você é dono deste endereço Bitcoin + Assinar mensagem para provar que você é dono deste endereço NYC3 Sign &Message @@ -2580,11 +2580,11 @@ Nota: Como a taxa é calculada por byte, uma taxa de "100 satoshis por kB" por The NYC3 address the message was signed with - O endereço Bitcoin que foi usado para assinar a mensagem + O endereço NYC3 que foi usado para assinar a mensagem Verify the message to ensure it was signed with the specified NYC3 address - Verificar mensagem para se assegurar que ela foi assinada pelo dono de um endereço Bitcoin específico + Verificar mensagem para se assegurar que ela foi assinada pelo dono de um endereço NYC3 específico Verify &Message diff --git a/src/qt/locale/nyc3_pt_PT.ts b/src/qt/locale/nyc3_pt_PT.ts index 8b5e1275b..8b4c8208d 100644 --- a/src/qt/locale/nyc3_pt_PT.ts +++ b/src/qt/locale/nyc3_pt_PT.ts @@ -66,12 +66,12 @@ Endereços de receção - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Estes são os seus endereços Bitcoin para enviar pagamentos. Verifique sempre o valor e o endereço de receção antes de enviar moedas. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Estes são os seus endereços NYC3 para enviar pagamentos. Verifique sempre o valor e o endereço de receção antes de enviar moedas. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Estes são os seus endereços Bitcoin para receber pagamentos. É recomendado que utilize um endereço de receção novo para cada transação. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Estes são os seus endereços NYC3 para receber pagamentos. É recomendado que utilize um endereço de receção novo para cada transação. &Copy Address @@ -240,7 +240,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Assinar &mensagem... @@ -343,7 +343,7 @@ Send coins to a NYC3 address - Enviar moedas para um endereço Bitcoin + Enviar moedas para um endereço NYC3 Backup wallet to another location @@ -366,8 +366,8 @@ &Verificar mensagem... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -390,12 +390,12 @@ Encriptar as chaves privadas que pertencem à sua carteira - Sign messages with your Bitcoin addresses to prove you own them - Assine as mensagens com os seus endereços Bitcoin para provar que é o proprietário dos mesmos + Sign messages with your NYC3 addresses to prove you own them + Assine as mensagens com os seus endereços NYC3 para provar que é o proprietário dos mesmos - Verify messages to ensure they were signed with specified Bitcoin addresses - Verifique mensagens para assegurar que foram assinadas com o endereço Bitcoin especificado + Verify messages to ensure they were signed with specified NYC3 addresses + Verifique mensagens para assegurar que foram assinadas com o endereço NYC3 especificado &File @@ -434,8 +434,8 @@ &Opções da linha de &comando - %n active connection(s) to Bitcoin network - %n ligação ativa à rede Bitcoin%n ligações ativas à rede Bitcoin + %n active connection(s) to NYC3 network + %n ligação ativa à rede NYC3%n ligações ativas à rede NYC3 Indexing blocks on disk... @@ -502,7 +502,7 @@ Fechar a carteira - Show the %1 help message to get a list with possible Bitcoin command-line options + Show the %1 help message to get a list with possible NYC3 command-line options Mostrar a mensagem de ajuda %1 para obter uma lista com possíveis opções a usar na linha de comandos. @@ -614,8 +614,8 @@ A carteira está <b>encriptada</b> e atualmente <b>bloqueada</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Ocorreu um erro fatal. O Bitcoin não pode continuar com segurança e irá fechar. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Ocorreu um erro fatal. O NYC3 não pode continuar com segurança e irá fechar. @@ -897,8 +897,8 @@ Utilizar uma pasta de dados personalizada: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -909,8 +909,8 @@ Aproximadamente %1 GB de dados irão ser guardados nesta pasta. - %1 will download and store a copy of the Bitcoin block chain. - %1 irá descarregar e armazenar uma cópia da cadeia de blocos da Bitcoin. + %1 will download and store a copy of the NYC3 block chain. + %1 irá descarregar e armazenar uma cópia da cadeia de blocos da NYC3. The wallet will also be stored in this directory. @@ -1127,7 +1127,7 @@ &Gastar troco não confirmado - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. Abrir a porta do cliente bitcoin automaticamente no seu router. Isto apenas funciona se o seu router suportar UPnP e este se encontrar ligado. @@ -1143,8 +1143,8 @@ Permitir ligações de "a receber" - Connect to the Bitcoin network through a SOCKS5 proxy. - Conectar à rede da Bitcoin através dum proxy SOCLS5. + Connect to the NYC3 network through a SOCKS5 proxy. + Conectar à rede da NYC3 através dum proxy SOCLS5. &Connect through SOCKS5 proxy (default proxy): @@ -1179,8 +1179,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Ligar à rede Bitcoin através de um proxy SOCKS5 separado para utilizar os serviços ocultos do Tor. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Ligar à rede NYC3 através de um proxy SOCKS5 separado para utilizar os serviços ocultos do Tor. &Window @@ -1290,8 +1290,8 @@ Formulário - 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. - A informação mostrada poderá estar desatualizada. A sua carteira sincroniza automaticamente com a rede Bitcoin depois de estabelecer ligação, mas este processo ainda não está completo. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + A informação mostrada poderá estar desatualizada. A sua carteira sincroniza automaticamente com a rede NYC3 depois de estabelecer ligação, mas este processo ainda não está completo. Watch-only: @@ -1394,7 +1394,7 @@ URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - URI não foi lido corretamente! Isto pode ser causado por um endereço Bitcoin inválido ou por parâmetros URI malformados. + URI não foi lido corretamente! Isto pode ser causado por um endereço NYC3 inválido ou por parâmetros URI malformados. Payment request file handling @@ -1496,7 +1496,7 @@ Enter a NYC3 address (e.g. %1) - Introduza um endereço Bitcoin (ex. %1) + Introduza um endereço NYC3 (ex. %1) %1 d @@ -1947,8 +1947,8 @@ &Mensagem: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Uma mensagem opcional para anexar ao pedido de pagamento, que será exibida quando o pedido for aberto. Nota: A mensagem não será enviada com o pagamento através da rede Bitcoin. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Uma mensagem opcional para anexar ao pedido de pagamento, que será exibida quando o pedido for aberto. Nota: A mensagem não será enviada com o pagamento através da rede NYC3. An optional label to associate with the new receiving address. @@ -2374,7 +2374,7 @@ Nota: como a taxa é calculada por byte, uma taxa de "100 satoshis por kB" por u Warning: Invalid NYC3 address - Aviso: endereço Bitcoin inválido + Aviso: endereço NYC3 inválido Warning: Unknown change address @@ -2417,7 +2417,7 @@ Nota: como a taxa é calculada por byte, uma taxa de "100 satoshis por kB" por u The NYC3 address to send the payment to - O endereço Bitcoin para enviar o pagamento + O endereço NYC3 para enviar o pagamento Alt+A @@ -2464,8 +2464,8 @@ Nota: como a taxa é calculada por byte, uma taxa de "100 satoshis por kB" por u Introduza uma etiqueta para este endereço para o adicionar à sua lista de endereços usados - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Uma mensagem que estava anexada ao URI bitcoin: que será armazenada com a transação para sua referência. Nota: Esta mensagem não será enviada através da rede Bitcoin. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Uma mensagem que estava anexada ao URI bitcoin: que será armazenada com a transação para sua referência. Nota: Esta mensagem não será enviada através da rede NYC3. Pay To: @@ -2514,7 +2514,7 @@ Nota: como a taxa é calculada por byte, uma taxa de "100 satoshis por kB" por u The NYC3 address to sign the message with - O endereço Bitcoin para designar a mensagem + O endereço NYC3 para designar a mensagem Choose previously used address @@ -2546,7 +2546,7 @@ Nota: como a taxa é calculada por byte, uma taxa de "100 satoshis por kB" por u Sign the message to prove you own this NYC3 address - Assine uma mensagem para provar que é dono deste endereço Bitcoin + Assine uma mensagem para provar que é dono deste endereço NYC3 Sign &Message @@ -2570,11 +2570,11 @@ Nota: como a taxa é calculada por byte, uma taxa de "100 satoshis por kB" por u The NYC3 address the message was signed with - O endereço Bitcoin com que a mensagem foi designada + O endereço NYC3 com que a mensagem foi designada Verify the message to ensure it was signed with the specified NYC3 address - Verifique a mensagem para assegurar que foi assinada com o endereço Bitcoin especificado + Verifique a mensagem para assegurar que foi assinada com o endereço NYC3 especificado Verify &Message diff --git a/src/qt/locale/nyc3_ro.ts b/src/qt/locale/nyc3_ro.ts index 4f47091a1..639184677 100644 --- a/src/qt/locale/nyc3_ro.ts +++ b/src/qt/locale/nyc3_ro.ts @@ -62,12 +62,12 @@ Adresele de primire - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Acestea sunt adresele tale Bitcoin pentru trimiterea plății. Verifică mereu suma și adresa de primire înainte de trimiterea monedelor. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Acestea sunt adresele tale NYC3 pentru trimiterea plății. Verifică mereu suma și adresa de primire înainte de trimiterea monedelor. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Acestea sunt adresele tale Bitcoin pentru primirea plăților. Este recomandată folosirea de noi adrese de primire pentru fiecare tranzacție. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Acestea sunt adresele tale NYC3 pentru primirea plăților. Este recomandată folosirea de noi adrese de primire pentru fiecare tranzacție. &Copy Address @@ -224,7 +224,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Semnează și trimite... @@ -299,7 +299,7 @@ Send coins to a NYC3 address - Trimite monedele către o adresă Bitcoin + Trimite monedele către o adresă NYC3 Backup wallet to another location @@ -322,8 +322,8 @@ &Verifică mesajul... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -346,12 +346,12 @@ Criptează cheile private care aparțin portofelului tău. - Sign messages with your Bitcoin addresses to prove you own them - Semnează mesajele cu adresa ta de Bitcoin pentru a face dovada că îți aparțin. + Sign messages with your NYC3 addresses to prove you own them + Semnează mesajele cu adresa ta de NYC3 pentru a face dovada că îți aparțin. - Verify messages to ensure they were signed with specified Bitcoin addresses - Verifică mesajele cu scopul de a asigura faptul că au fost semnate cu adresa de Bitcoin specificată. + Verify messages to ensure they were signed with specified NYC3 addresses + Verifică mesajele cu scopul de a asigura faptul că au fost semnate cu adresa de NYC3 specificată. &File @@ -613,8 +613,8 @@ Alege un folder/director personalizat - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. diff --git a/src/qt/locale/nyc3_ro_RO.ts b/src/qt/locale/nyc3_ro_RO.ts index 79169b4f3..d59833a71 100644 --- a/src/qt/locale/nyc3_ro_RO.ts +++ b/src/qt/locale/nyc3_ro_RO.ts @@ -66,12 +66,12 @@ Adresa de primire - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Acestea sunt adresele tale Bitcoin pentru efectuarea platilor. Intotdeauna verifica atent suma de plata si adresa beneficiarului inainte de a trimite monede. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Acestea sunt adresele tale NYC3 pentru efectuarea platilor. Intotdeauna verifica atent suma de plata si adresa beneficiarului inainte de a trimite monede. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Acestea sunt adresele tale Bitcoin pentru receptionarea platilor. Este recomandat sa folosesti mereu o adresa noua pentru primirea platilor. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Acestea sunt adresele tale NYC3 pentru receptionarea platilor. Este recomandat sa folosesti mereu o adresa noua pentru primirea platilor. &Copy Address @@ -236,7 +236,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Semnează &mesaj... @@ -339,7 +339,7 @@ Send coins to a NYC3 address - Trimite monede către o adresă Bitcoin + Trimite monede către o adresă NYC3 Backup wallet to another location @@ -362,8 +362,8 @@ &Verifică mesaj... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -386,12 +386,12 @@ Criptează cheile private ale portofelului dvs. - Sign messages with your Bitcoin addresses to prove you own them - Semnaţi mesaje cu adresa dvs. Bitcoin pentru a dovedi că vă aparţin + Sign messages with your NYC3 addresses to prove you own them + Semnaţi mesaje cu adresa dvs. NYC3 pentru a dovedi că vă aparţin - Verify messages to ensure they were signed with specified Bitcoin addresses - Verificaţi mesaje pentru a vă asigura că au fost semnate cu adresa Bitcoin specificată + Verify messages to ensure they were signed with specified NYC3 addresses + Verificaţi mesaje pentru a vă asigura că au fost semnate cu adresa NYC3 specificată &File @@ -430,8 +430,8 @@ Opţiuni linie de &comandă - %n active connection(s) to Bitcoin network - %n conexiune activă către reţeaua Bitcoin%n conexiuni active către reţeaua Bitcoin%n de conexiuni active către reţeaua Bitcoin + %n active connection(s) to NYC3 network + %n conexiune activă către reţeaua NYC3%n conexiuni active către reţeaua NYC3%n de conexiuni active către reţeaua NYC3 Indexing blocks on disk... @@ -474,8 +474,8 @@ Actualizat - Show the %1 help message to get a list with possible Bitcoin command-line options - Arată mesajul de ajutor %1 pentru a obţine o listă cu opţiunile posibile de linii de comandă Bitcoin + Show the %1 help message to get a list with possible NYC3 command-line options + Arată mesajul de ajutor %1 pentru a obţine o listă cu opţiunile posibile de linii de comandă NYC3 default wallet @@ -562,8 +562,8 @@ Portofelul este <b>criptat</b> iar în momentul de faţă este <b>blocat</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - A survenit o eroare fatală. Bitcoin nu mai poate continua în siguranţă şi se va opri. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + A survenit o eroare fatală. NYC3 nu mai poate continua în siguranţă şi se va opri. @@ -749,7 +749,7 @@ The entered address "%1" is not a valid NYC3 address. - Adresa introdusă "%1" nu este o adresă Bitcoin validă. + Adresa introdusă "%1" nu este o adresă NYC3 validă. Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -845,8 +845,8 @@ Foloseşte un dosar de date personalizat: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -857,8 +857,8 @@ Aproximativ %1 GB de date vor fi stocate in acest director. - %1 will download and store a copy of the Bitcoin block chain. - %1 va descarca si stoca o copie a blockchainului Bitcoin + %1 will download and store a copy of the NYC3 block chain. + %1 va descarca si stoca o copie a blockchainului NYC3 The wallet will also be stored in this directory. @@ -889,7 +889,7 @@ Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below. - Tranzactiile recente pot sa nu fie inca vizibile, de aceea balanta portofelului poate fi incorecta. Aceasta informatie va fi corecta de indata ce portofelul va fi complet sincronizat cu reteaua Bitcoin, asa cum este detaliat mai jos. + Tranzactiile recente pot sa nu fie inca vizibile, de aceea balanta portofelului poate fi incorecta. Aceasta informatie va fi corecta de indata ce portofelul va fi complet sincronizat cu reteaua NYC3, asa cum este detaliat mai jos. Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network. @@ -1066,8 +1066,8 @@ Cheltuire rest neconfirmat - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Deschide automat în router portul aferent clientului Bitcoin. Funcţionează doar dacă routerul duportă UPnP şi e activat. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Deschide automat în router portul aferent clientului NYC3. Funcţionează doar dacă routerul duportă UPnP şi e activat. Map port using &UPnP @@ -1082,8 +1082,8 @@ Permite conexiuni de intrar&e - Connect to the Bitcoin network through a SOCKS5 proxy. - Conectare la reţeaua Bitcoin printr-un proxy SOCKS. + Connect to the NYC3 network through a SOCKS5 proxy. + Conectare la reţeaua NYC3 printr-un proxy SOCKS. &Connect through SOCKS5 proxy (default proxy): @@ -1118,8 +1118,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Conectare la reteaua Bitcoin printr-un proxy SOCKS5 separat pentru serviciile TOR ascunse. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Conectare la reteaua NYC3 printr-un proxy SOCKS5 separat pentru serviciile TOR ascunse. &Window @@ -1225,8 +1225,8 @@ Form - 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. - Informaţiile afişate pot fi neactualizate. Portofelul dvs. se sincronizează automat cu reţeaua Bitcoin după ce o conexiune este stabilită, dar acest proces nu a fost finalizat încă. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Informaţiile afişate pot fi neactualizate. Portofelul dvs. se sincronizează automat cu reţeaua NYC3 după ce o conexiune este stabilită, dar acest proces nu a fost finalizat încă. Watch-only: @@ -1301,7 +1301,7 @@ Cannot start bitcoin: click-to-pay handler - Bitcoin nu poate porni: click-to-pay handler + NYC3 nu poate porni: click-to-pay handler URI handling @@ -1321,7 +1321,7 @@ URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - URI nu poate fi analizat! Acest lucru poate fi cauzat de o adresă Bitcoin invalidă sau parametri URI deformaţi. + URI nu poate fi analizat! Acest lucru poate fi cauzat de o adresă NYC3 invalidă sau parametri URI deformaţi. Payment request file handling @@ -1423,7 +1423,7 @@ Enter a NYC3 address (e.g. %1) - Introduceţi o adresă Bitcoin (de exemplu %1) + Introduceţi o adresă NYC3 (de exemplu %1) %1 d @@ -1866,8 +1866,8 @@ &Mesaj: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Un mesaj opţional de ataşat la cererea de plată, care va fi afişat cînd cererea este deschisă. Notă: Acest mesaj nu va fi trimis cu plata către reţeaua Bitcoin. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Un mesaj opţional de ataşat la cererea de plată, care va fi afişat cînd cererea este deschisă. Notă: Acest mesaj nu va fi trimis cu plata către reţeaua NYC3. An optional label to associate with the new receiving address. @@ -2378,7 +2378,7 @@ Nota: Cum taxa este calculata per byte, o taxa de "100 satoshi per kB" pentru o Introduceţi eticheta pentru ca această adresa să fie introdusă în lista de adrese folosite - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. un mesaj a fost ataşat la bitcoin: URI care va fi stocat cu tranzacţia pentru referinţa dvs. Notă: Acest mesaj nu va fi trimis către reţeaua bitcoin. @@ -2460,7 +2460,7 @@ Nota: Cum taxa este calculata per byte, o taxa de "100 satoshi per kB" pentru o Sign the message to prove you own this NYC3 address - Semnează mesajul pentru a dovedi ca deţineţi acestă adresă Bitcoin + Semnează mesajul pentru a dovedi ca deţineţi acestă adresă NYC3 Sign &Message @@ -2484,11 +2484,11 @@ Nota: Cum taxa este calculata per byte, o taxa de "100 satoshi per kB" pentru o The NYC3 address the message was signed with - Introduceţi o adresă Bitcoin + Introduceţi o adresă NYC3 Verify the message to ensure it was signed with the specified NYC3 address - Verificaţi mesajul pentru a vă asigura că a fost semnat cu adresa Bitcoin specificată + Verificaţi mesajul pentru a vă asigura că a fost semnat cu adresa NYC3 specificată Verify &Message @@ -3140,7 +3140,7 @@ Nota: Cum taxa este calculata per byte, o taxa de "100 satoshi per kB" pentru o NYC3 - Nucleul Bitcoin + Nucleul NYC3 The %s developers diff --git a/src/qt/locale/nyc3_ru.ts b/src/qt/locale/nyc3_ru.ts index c43c20c0b..b0d0c0e1a 100644 --- a/src/qt/locale/nyc3_ru.ts +++ b/src/qt/locale/nyc3_ru.ts @@ -66,12 +66,12 @@ Адреса получения - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Это ваши адреса Bitcoin для отправки платежей. Всегда проверяйте количество и адрес получателя перед отправкой перевода. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Это ваши адреса NYC3 для отправки платежей. Всегда проверяйте количество и адрес получателя перед отправкой перевода. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Это ваши адреса Bitcoin для приёма платежей. Рекомендуется использовать новый адрес получения для каждой транзакции. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Это ваши адреса NYC3 для приёма платежей. Рекомендуется использовать новый адрес получения для каждой транзакции. &Copy Address @@ -220,7 +220,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Подписать &сообщение... diff --git a/src/qt/locale/nyc3_ru_RU.ts b/src/qt/locale/nyc3_ru_RU.ts index 8d647e1f9..26afe4519 100644 --- a/src/qt/locale/nyc3_ru_RU.ts +++ b/src/qt/locale/nyc3_ru_RU.ts @@ -66,12 +66,12 @@ Адреса получения - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Это ваши Bitcoin адреса для отправки платежа. Всегда проверяйте сумму и адрес получателя перед отправкой платежа. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Это ваши NYC3 адреса для отправки платежа. Всегда проверяйте сумму и адрес получателя перед отправкой платежа. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Это ваши Bitcoin адреса для получения платежей. Настоятельно рекомендуем использовать новые адреса для получения каждой транзакции. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Это ваши NYC3 адреса для получения платежей. Настоятельно рекомендуем использовать новые адреса для получения каждой транзакции. &Copy Address @@ -240,7 +240,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Подписать &сообщение... @@ -366,7 +366,7 @@ &Проверить сообщение... - Bitcoin + NYC3 NYC3 @@ -390,12 +390,12 @@ Зашифровать приватные ключи, принадлежащие вашему кошельку - Sign messages with your Bitcoin addresses to prove you own them - Подписывайте сообщения Bitcoin адресами чтобы подтвердить что это написали именно Вы + Sign messages with your NYC3 addresses to prove you own them + Подписывайте сообщения NYC3 адресами чтобы подтвердить что это написали именно Вы - Verify messages to ensure they were signed with specified Bitcoin addresses - Проверяйте сообщения чтобы убедиться что они подписаны конкретными Bitcoin адресами + Verify messages to ensure they were signed with specified NYC3 addresses + Проверяйте сообщения чтобы убедиться что они подписаны конкретными NYC3 адресами &File @@ -434,8 +434,8 @@ Опции командной строки - %n active connection(s) to Bitcoin network - %n активное подключение к сети Bitcoin%n активных подключения к сети Bitcoin%n активных подключений к сети Bitcoin%n активных подключений к сети Bitcoin + %n active connection(s) to NYC3 network + %n активное подключение к сети NYC3%n активных подключения к сети NYC3%n активных подключений к сети NYC3%n активных подключений к сети NYC3 Indexing blocks on disk... @@ -502,7 +502,7 @@ Закрыть кошелек - Show the %1 help message to get a list with possible Bitcoin command-line options + Show the %1 help message to get a list with possible NYC3 command-line options Показать помощь по %1, чтобы получить список доступных параметров командной строки @@ -614,8 +614,8 @@ Кошелек <b>зашифрован</b> и сейчас <b>заблокирован</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Произошла критическая ошибка. Bitcoin больше не может продолжать безопасную работу и будет закрыт. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Произошла критическая ошибка. NYC3 больше не может продолжать безопасную работу и будет закрыт. @@ -805,7 +805,7 @@ The entered address "%1" is not a valid NYC3 address. - Введенный адрес "%1" не является действительным адресом Bitcoin. + Введенный адрес "%1" не является действительным адресом NYC3. Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -901,7 +901,7 @@ Использовать пользовательскую директорию данных - Bitcoin + NYC3 NYC3 @@ -913,7 +913,7 @@ Приблизительно %1 ГБ данных будет сохранено в эту директорию. - %1 will download and store a copy of the Bitcoin block chain. + %1 will download and store a copy of the NYC3 block chain. %1 скачает и сохранит копию цепи блоков. @@ -1130,8 +1130,8 @@ &Тратить неподтвержденную сдачу - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Автоматически открыть порт для Bitcoin-клиента на маршрутизаторе. Работает только если Ваш маршрутизатор поддерживает UPnP, и данная функция включена. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Автоматически открыть порт для NYC3-клиента на маршрутизаторе. Работает только если Ваш маршрутизатор поддерживает UPnP, и данная функция включена. Map port using &UPnP @@ -1146,8 +1146,8 @@ Разрешить входящие соединения - Connect to the Bitcoin network through a SOCKS5 proxy. - Подключится к сети Bitcoin через SOCKS5 прокси. + Connect to the NYC3 network through a SOCKS5 proxy. + Подключится к сети NYC3 через SOCKS5 прокси. &Connect through SOCKS5 proxy (default proxy): @@ -1182,7 +1182,7 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. Соединяться к Биткоин-сети через отдельные SOCKS5 прокси через Tor hidden services: @@ -1293,8 +1293,8 @@ Форма - 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. - Отображаемая информация может быть устаревшей. Ваш бумажник автоматически синхронизируется с сетью Bitcoin после подключения, но этот процесс пока не завершён. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Отображаемая информация может быть устаревшей. Ваш бумажник автоматически синхронизируется с сетью NYC3 после подключения, но этот процесс пока не завершён. Watch-only: @@ -1397,7 +1397,7 @@ URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - Не удалось обработать идентификатор! Это может быть связано с неверным Bitcoin-адресом или неправильными параметрами идентификатора. + Не удалось обработать идентификатор! Это может быть связано с неверным NYC3-адресом или неправильными параметрами идентификатора. Payment request file handling @@ -1950,8 +1950,8 @@ &Сообщение: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Необязательное сообщение для запроса платежа, которое будет показано при открытии запроса. Заметьте: сообщение не будет отправлено вместе с платежом через сеть Bitcoin. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Необязательное сообщение для запроса платежа, которое будет показано при открытии запроса. Заметьте: сообщение не будет отправлено вместе с платежом через сеть NYC3. An optional label to associate with the new receiving address. @@ -2376,7 +2376,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p Warning: Invalid NYC3 address - Предупреждение: Неверный Bitcoin адрес + Предупреждение: Неверный NYC3 адрес Warning: Unknown change address @@ -2419,7 +2419,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p The NYC3 address to send the payment to - Bitcoin-адрес, на который отправить платёж + NYC3-адрес, на который отправить платёж Alt+A @@ -2466,8 +2466,8 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p Введите метку для этого адреса, чтобы добавить его в список используемых адресов - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Сообщение прикрепленное к bitcoin идентификатору будет сохранено вместе с транзакцией для вашего сведения. Заметьте: сообщение не будет отправлено через сеть Bitcoin. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Сообщение прикрепленное к bitcoin идентификатору будет сохранено вместе с транзакцией для вашего сведения. Заметьте: сообщение не будет отправлено через сеть NYC3. Pay To: @@ -2516,7 +2516,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p The NYC3 address to sign the message with - Bitcoin-адрес, которым подписать сообщение + NYC3-адрес, которым подписать сообщение Choose previously used address @@ -2548,7 +2548,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p Sign the message to prove you own this NYC3 address - Подписать сообщение, чтобы доказать владение Bitcoin-адресом + Подписать сообщение, чтобы доказать владение NYC3-адресом Sign &Message @@ -2572,11 +2572,11 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p The NYC3 address the message was signed with - Bitcoin-адрес, которым было подписано сообщение + NYC3-адрес, которым было подписано сообщение Verify the message to ensure it was signed with the specified NYC3 address - Проверить сообщение, чтобы убедиться, что оно было подписано указанным Bitcoin-адресом + Проверить сообщение, чтобы убедиться, что оно было подписано указанным NYC3-адресом Verify &Message diff --git a/src/qt/locale/nyc3_sk.ts b/src/qt/locale/nyc3_sk.ts index 241a90036..12345a998 100644 --- a/src/qt/locale/nyc3_sk.ts +++ b/src/qt/locale/nyc3_sk.ts @@ -66,12 +66,12 @@ Prijímajúce adresy - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Toto sú Vaše Bitcoin adresy pre posielanie platieb. Vždy skontrolujte sumu a prijímaciu adresu pred poslaním mincí. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Toto sú Vaše NYC3 adresy pre posielanie platieb. Vždy skontrolujte sumu a prijímaciu adresu pred poslaním mincí. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Toto sú vaše Bitcoin adresy pre prijímanie platieb. Odporúča sa použiť vždy novú prijímaciu adresu pre každú transakciu. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Toto sú vaše NYC3 adresy pre prijímanie platieb. Odporúča sa použiť vždy novú prijímaciu adresu pre každú transakciu. &Copy Address @@ -240,7 +240,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Podpísať &správu... @@ -366,8 +366,8 @@ O&veriť správu... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -390,12 +390,12 @@ Zašifruj súkromné kľúče ktoré patria do vašej peňaženky - Sign messages with your Bitcoin addresses to prove you own them - Podpísať správu s vašou adresou Bitcoin aby ste preukázali že ju vlastníte + Sign messages with your NYC3 addresses to prove you own them + Podpísať správu s vašou adresou NYC3 aby ste preukázali že ju vlastníte - Verify messages to ensure they were signed with specified Bitcoin addresses - Overiť či správa bola podpísaná uvedenou Bitcoin adresou + Verify messages to ensure they were signed with specified NYC3 addresses + Overiť či správa bola podpísaná uvedenou NYC3 adresou &File @@ -434,8 +434,8 @@ &Možnosti príkazového riadku - %n active connection(s) to Bitcoin network - %n aktívne pripojenie do siete Bitcoin%n aktívne pripojenia do siete Bitcoin%n aktívnych pripojení do siete Bitcoin%n aktívnych pripojení do siete Bitcoin + %n active connection(s) to NYC3 network + %n aktívne pripojenie do siete NYC3%n aktívne pripojenia do siete NYC3%n aktívnych pripojení do siete NYC3%n aktívnych pripojení do siete NYC3 Indexing blocks on disk... @@ -502,8 +502,8 @@ Zatvoriť peňaženku - Show the %1 help message to get a list with possible Bitcoin command-line options - Ukáž %1 zoznam možných nastavení Bitcoinu pomocou príkazového riadku + Show the %1 help message to get a list with possible NYC3 command-line options + Ukáž %1 zoznam možných nastavení NYC3u pomocou príkazového riadku default wallet @@ -614,8 +614,8 @@ Peňaženka je <b>zašifrovaná</b> a momentálne <b>zamknutá</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Vyskytla sa kritická chyba. Bitcoin nemôže ďalej bezpečne pokračovať a ukončí sa. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Vyskytla sa kritická chyba. NYC3 nemôže ďalej bezpečne pokračovať a ukončí sa. @@ -805,7 +805,7 @@ The entered address "%1" is not a valid NYC3 address. - Vložená adresa "%1" nieje platnou adresou Bitcoin. + Vložená adresa "%1" nieje platnou adresou NYC3. Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -901,8 +901,8 @@ Použiť vlastný dátový adresár: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -913,7 +913,7 @@ Približne %1 GB dát bude uložených v tejto zložke. - %1 will download and store a copy of the Bitcoin block chain. + %1 will download and store a copy of the NYC3 block chain. %1 bude sťahovať kopiu reťazca blokov. @@ -1130,8 +1130,8 @@ &Minúť nepotvrdený výdavok - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Automaticky otvorit port pre Bitcoin na routeri. Toto funguje len ak router podporuje UPnP a je táto podpora aktivovaná. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Automaticky otvorit port pre NYC3 na routeri. Toto funguje len ak router podporuje UPnP a je táto podpora aktivovaná. Map port using &UPnP @@ -1146,8 +1146,8 @@ Povoliť prichá&dzajúce spojenia - Connect to the Bitcoin network through a SOCKS5 proxy. - Pripojiť do siete Bitcoin cez proxy server SOCKS5. + Connect to the NYC3 network through a SOCKS5 proxy. + Pripojiť do siete NYC3 cez proxy server SOCKS5. &Connect through SOCKS5 proxy (default proxy): @@ -1182,8 +1182,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Pripojiť k Bitcoinovej sieti cez separované SOCKS5 proxy pre skrytú službu Tor. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Pripojiť k NYC3ovej sieti cez separované SOCKS5 proxy pre skrytú službu Tor. &Window @@ -1293,8 +1293,8 @@ Formulár - 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. - Zobrazené informácie môžu byť neaktuálne. Vaša peňaženka sa automaticky synchronizuje so sieťou Bitcoin po nadviazaní spojenia, ale tento proces ešte nie je ukončený. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Zobrazené informácie môžu byť neaktuálne. Vaša peňaženka sa automaticky synchronizuje so sieťou NYC3 po nadviazaní spojenia, ale tento proces ešte nie je ukončený. Watch-only: @@ -1369,7 +1369,7 @@ Cannot start bitcoin: click-to-pay handler - Nemôžeme spustiť Bitcoin: obsluha click-to-pay + Nemôžeme spustiť NYC3: obsluha click-to-pay URI handling @@ -1397,7 +1397,7 @@ URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - URI sa nedá analyzovať! To môže byť spôsobené neplatnou Bitcoin adresou alebo zle nastavenými vlastnosťami URI. + URI sa nedá analyzovať! To môže byť spôsobené neplatnou NYC3 adresou alebo zle nastavenými vlastnosťami URI. Payment request file handling @@ -1955,8 +1955,8 @@ &Správa: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Pridať voliteľnú správu k výzve na zaplatenie, ktorá sa zobrazí keď bude výzva otvorená. Poznámka: Správa nebude poslaná s platbou cez sieť Bitcoin. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Pridať voliteľnú správu k výzve na zaplatenie, ktorá sa zobrazí keď bude výzva otvorená. Poznámka: Správa nebude poslaná s platbou cez sieť NYC3. An optional label to associate with the new receiving address. @@ -2121,7 +2121,7 @@ SendCoinsDialog Send Coins - Poslať Bitcoins + Poslať NYC3s Coin Control Features @@ -2385,7 +2385,7 @@ Poznámka: Keďže poplatok je počítaný za bajt, poplatok o hodnote "100 sato Warning: Invalid NYC3 address - Varovanie: Neplatná Bitcoin adresa + Varovanie: Neplatná NYC3 adresa Warning: Unknown change address @@ -2475,8 +2475,8 @@ Poznámka: Keďže poplatok je počítaný za bajt, poplatok o hodnote "100 sato Vložte popis pre túto adresu aby sa uložila do zoznamu použitých adries - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Správa ktorá bola pripojená k bitcoin: URI a ktorá bude uložená s transakcou pre Vaše potreby. Poznámka: Táto správa nebude poslaná cez sieť Bitcoin. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Správa ktorá bola pripojená k bitcoin: URI a ktorá bude uložená s transakcou pre Vaše potreby. Poznámka: Táto správa nebude poslaná cez sieť NYC3. Pay To: @@ -2525,7 +2525,7 @@ Poznámka: Keďže poplatok je počítaný za bajt, poplatok o hodnote "100 sato The NYC3 address to sign the message with - Bitcoin adresa pre podpísanie správy s + NYC3 adresa pre podpísanie správy s Choose previously used address @@ -2581,11 +2581,11 @@ Poznámka: Keďže poplatok je počítaný za bajt, poplatok o hodnote "100 sato The NYC3 address the message was signed with - Adresa Bitcoin, ktorou bola podpísaná správa + Adresa NYC3, ktorou bola podpísaná správa Verify the message to ensure it was signed with the specified NYC3 address - Overím správy sa uistiť že bola podpísaná označenou Bitcoin adresou + Overím správy sa uistiť že bola podpísaná označenou NYC3 adresou Verify &Message diff --git a/src/qt/locale/nyc3_sl_SI.ts b/src/qt/locale/nyc3_sl_SI.ts index 7da4ac73d..380770751 100644 --- a/src/qt/locale/nyc3_sl_SI.ts +++ b/src/qt/locale/nyc3_sl_SI.ts @@ -66,12 +66,12 @@ Imenik naslovov za prejemanje - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - To so vaši Bitcoin naslovi za pošiljanje. Pred pošiljanjem vedno preverite količino in prejemnikov naslov. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + To so vaši NYC3 naslovi za pošiljanje. Pred pošiljanjem vedno preverite količino in prejemnikov naslov. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - To so vaši Bitcoin naslovi za prejemanje. Priporočeno je, da za vsako transakcijo uporabite nov naslov. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + To so vaši NYC3 naslovi za prejemanje. Priporočeno je, da za vsako transakcijo uporabite nov naslov. &Copy Address @@ -232,7 +232,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Podpiši &sporočilo ... @@ -335,7 +335,7 @@ Send coins to a NYC3 address - Izvedite plačilo na naslov Bitcoin + Izvedite plačilo na naslov NYC3 Backup wallet to another location @@ -358,8 +358,8 @@ &Preveri sporočilo ... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -382,12 +382,12 @@ Šifrirajte zasebne ključe, ki se nahajajo v denarnici - Sign messages with your Bitcoin addresses to prove you own them - Podpišite poljubno sporočilo z enim svojih naslovov Bitcoin, da prejemniku sporočila dokažete, da je ta naslov v vaši lasti. + Sign messages with your NYC3 addresses to prove you own them + Podpišite poljubno sporočilo z enim svojih naslovov NYC3, da prejemniku sporočila dokažete, da je ta naslov v vaši lasti. - Verify messages to ensure they were signed with specified Bitcoin addresses - Preverite, če je bilo prejeto sporočilo podpisano z določenim naslovom Bitcoin + Verify messages to ensure they were signed with specified NYC3 addresses + Preverite, če je bilo prejeto sporočilo podpisano z določenim naslovom NYC3 &File @@ -426,8 +426,8 @@ Opcije &ukazne vrstice - %n active connection(s) to Bitcoin network - %n aktivna povezava v omrežje Bitcoin%n aktivni povezavi v omrežje Bitcoin%n aktivne povezave v omrežje Bitcoin%n aktivnih povezav v omrežje Bitcoin + %n active connection(s) to NYC3 network + %n aktivna povezava v omrežje NYC3%n aktivni povezavi v omrežje NYC3%n aktivne povezave v omrežje NYC3%n aktivnih povezav v omrežje NYC3 Indexing blocks on disk... @@ -691,8 +691,8 @@ Uporabi to podatkovno mapo: - Bitcoin - Bitcoin + NYC3 + NYC3 Error: Specified data directory "%1" cannot be created. @@ -812,7 +812,7 @@ Omogoči &trošenje drobiža iz še nepotrjenih plačil - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. Program samodejno odpre ustrezna vrata na usmerjevalniku. To deluje samo, če vaš usmerjevalnik podpira in ima omogočen UPnP. @@ -820,8 +820,8 @@ Preslikaj vrata z uporabo &UPnP - Connect to the Bitcoin network through a SOCKS5 proxy. - Poveži se v omrežje Bitcoin preko posredniškega strežnika SOCKS5. + Connect to the NYC3 network through a SOCKS5 proxy. + Poveži se v omrežje NYC3 preko posredniškega strežnika SOCKS5. &Connect through SOCKS5 proxy (default proxy): @@ -923,8 +923,8 @@ Oblika - 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. - Prikazani podatki so morda zastareli. Program ob vzpostavitvi povezave samodejno sinhronizira denarnico z omrežjem Bitcoin, a trenutno ta proces še ni zaključen. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Prikazani podatki so morda zastareli. Program ob vzpostavitvi povezave samodejno sinhronizira denarnico z omrežjem NYC3, a trenutno ta proces še ni zaključen. Watch-only: @@ -1021,7 +1021,7 @@ Enter a NYC3 address (e.g. %1) - Vnesite naslov Bitcoin (npr. %1): + Vnesite naslov NYC3 (npr. %1): %1 d @@ -1268,8 +1268,8 @@ &Sporočilo: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Neobvezno sporočilo kot priponka zahtevku za plačilo, ki bo prikazano, ko bo zahtevek odprt. Opomba: Opravljeno plačilo.prek omrežja Bitcoin tega sporočila ne bo vsebovalo. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Neobvezno sporočilo kot priponka zahtevku za plačilo, ki bo prikazano, ko bo zahtevek odprt. Opomba: Opravljeno plačilo.prek omrežja NYC3 tega sporočila ne bo vsebovalo. An optional label to associate with the new receiving address. @@ -1509,7 +1509,7 @@ The NYC3 address to send the payment to - Naslov Bitcoin, na katerega bo plačilo poslano + Naslov NYC3, na katerega bo plačilo poslano Alt+A @@ -1552,8 +1552,8 @@ Če vnesete oznako za zgornji naslov, se bo skupaj z naslovom shranila v imenk že uporabljenih naslovov - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Sporočilo, ki ste ga pripeli na URI tipa bitcoin:. Shranjeno bo skupaj s podatki o transakciji. Opomba: Sporočilo ne bo poslano preko omrežja Bitcoin. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Sporočilo, ki ste ga pripeli na URI tipa bitcoin:. Shranjeno bo skupaj s podatki o transakciji. Opomba: Sporočilo ne bo poslano preko omrežja NYC3. Pay To: @@ -1590,7 +1590,7 @@ The NYC3 address to sign the message with - Naslov Bitcoin, s katerim podpisujete sporočilo + Naslov NYC3, s katerim podpisujete sporočilo Choose previously used address @@ -1646,11 +1646,11 @@ The NYC3 address the message was signed with - Naslov Bitcoin, s katerim je bilo sporočilo podpisano + Naslov NYC3, s katerim je bilo sporočilo podpisano Verify the message to ensure it was signed with the specified NYC3 address - Preverite, ali je bilo sporočilo v resnici podpisano z navedenim naslovom Bitcoin. + Preverite, ali je bilo sporočilo v resnici podpisano z navedenim naslovom NYC3. Verify &Message diff --git a/src/qt/locale/nyc3_sn.ts b/src/qt/locale/nyc3_sn.ts index 0cef82631..d193fdc61 100644 --- a/src/qt/locale/nyc3_sn.ts +++ b/src/qt/locale/nyc3_sn.ts @@ -64,7 +64,7 @@ - BitcoinGUI + NYC3GUI E&xit Buda @@ -90,8 +90,8 @@ Vhura &URI - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -153,8 +153,8 @@ Intro - Bitcoin - Bitcoin + NYC3 + NYC3 @@ -183,7 +183,7 @@ Enter a NYC3 address (e.g. %1) - Nyora kero ye Bitcoin (sekuti %1) + Nyora kero ye NYC3 (sekuti %1) %1 d diff --git a/src/qt/locale/nyc3_sq.ts b/src/qt/locale/nyc3_sq.ts index 97185c93d..be5220e67 100644 --- a/src/qt/locale/nyc3_sq.ts +++ b/src/qt/locale/nyc3_sq.ts @@ -54,12 +54,12 @@ Duke marr adresen - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Këto janë Bitcoin adresat e juaja për të dërguar pagesa. Gjithmon kontrolloni shumën dhe adresën pranuese para se të dërgoni monedha. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Këto janë NYC3 adresat e juaja për të dërguar pagesa. Gjithmon kontrolloni shumën dhe adresën pranuese para se të dërgoni monedha. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Këto janë Bitcoin adresat e juaja për të pranuar pagesa. Rekomandohet që gjithmon të përdorni një adresë të re për çdo transaksion. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Këto janë NYC3 adresat e juaja për të pranuar pagesa. Rekomandohet që gjithmon të përdorni një adresë të re për çdo transaksion. &Copy Address @@ -192,7 +192,7 @@ BanTableModel - BitcoinGUI + NYC3GUI Synchronizing with network... Duke u sinkronizuar me rrjetin... @@ -226,8 +226,8 @@ Ndrysho frazkalimin e përdorur per enkriptimin e portofolit - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -385,8 +385,8 @@ Miresevini - Bitcoin - Bitcoin + NYC3 + NYC3 Error @@ -788,7 +788,7 @@ bitcoin-core NYC3 - Berthama Bitcoin + Berthama NYC3 Information diff --git a/src/qt/locale/nyc3_sr.ts b/src/qt/locale/nyc3_sr.ts index 9d906c2b3..9b77e4dda 100644 --- a/src/qt/locale/nyc3_sr.ts +++ b/src/qt/locale/nyc3_sr.ts @@ -66,11 +66,11 @@ Адресе за примање - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. Ово су ваше Биткоин адресе за слање уплата. Увек добро проверите износ и адресу на коју шаљете пре него што пошаљете уплату. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. Ово су ваше Биткоин адресе за примање уплате. Препоручује се да се за сваку трансакцију користи нова адреса. @@ -236,7 +236,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Потпиши &поруку... @@ -362,7 +362,7 @@ &Верификовање поруке... - Bitcoin + NYC3 Биткоин @@ -386,11 +386,11 @@ Шифрирај приватни клуљ који припада новчанику. - Sign messages with your Bitcoin addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them Потписуј поруку са своје Биткоин адресе као доказ да си њихов власник - Verify messages to ensure they were signed with specified Bitcoin addresses + Verify messages to ensure they were signed with specified NYC3 addresses Верификуј поруке и утврди да ли су потписане од стране спецификованих Биткоин адреса @@ -430,7 +430,7 @@ &Опције командне линије - %n active connection(s) to Bitcoin network + %n active connection(s) to NYC3 network %n aктивна веза са Биткоин мрежом%n aктивних веза са Биткоин мрежом%n aктивних веза са Биткоин мрежом @@ -474,7 +474,7 @@ Ажурно - Show the %1 help message to get a list with possible Bitcoin command-line options + Show the %1 help message to get a list with possible NYC3 command-line options Прикажи поруку помоћи %1 за листу са могућим опцијама Биткоин командне линије @@ -550,7 +550,7 @@ Новчаник јс <b>шифрован</b> и тренутно <b>закључан</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. + A fatal error occurred. NYC3 can no longer continue safely and will quit. Дошло је до критичне грешке. Биткоин не може безбедно да настави са радом и искључиће се. @@ -806,7 +806,7 @@ Користите прилагођени директоријум података: - Bitcoin + NYC3 Биткоин diff --git a/src/qt/locale/nyc3_sr@latin.ts b/src/qt/locale/nyc3_sr@latin.ts index 283c91fed..2423b67f1 100644 --- a/src/qt/locale/nyc3_sr@latin.ts +++ b/src/qt/locale/nyc3_sr@latin.ts @@ -62,12 +62,12 @@ Adresa na koju se prima - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Ovo su Vaše Bitcoin adrese na koju se vrše uplate. Uvek proverite iznos i prijemnu adresu pre slanja novčića. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Ovo su Vaše NYC3 adrese na koju se vrše uplate. Uvek proverite iznos i prijemnu adresu pre slanja novčića. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Ovo su Vaše Bitcoin adrese za primanje uplata. Preporučuje se upotreba nove adrese za svaku transakciju. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Ovo su Vaše NYC3 adrese za primanje uplata. Preporučuje se upotreba nove adrese za svaku transakciju. &Copy Address @@ -228,7 +228,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Potpišite &poruka... @@ -323,7 +323,7 @@ Send coins to a NYC3 address - Pošalji novčiće na Bitcoin adresu + Pošalji novčiće na NYC3 adresu Backup wallet to another location @@ -346,8 +346,8 @@ &Proveri poruku... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -370,12 +370,12 @@ Enkriptuj privatne ključeve novčanika - Sign messages with your Bitcoin addresses to prove you own them - Potpišite poruke sa svojim Bitcoin adresama da biste dokazali njihovo vlasništvo + Sign messages with your NYC3 addresses to prove you own them + Potpišite poruke sa svojim NYC3 adresama da biste dokazali njihovo vlasništvo - Verify messages to ensure they were signed with specified Bitcoin addresses - Proverite poruke da biste utvrdili sa kojim Bitcoin adresama su potpisane + Verify messages to ensure they were signed with specified NYC3 addresses + Proverite poruke da biste utvrdili sa kojim NYC3 adresama su potpisane &File @@ -499,8 +499,8 @@ Intro - Bitcoin - Bitcoin + NYC3 + NYC3 Error diff --git a/src/qt/locale/nyc3_sv.ts b/src/qt/locale/nyc3_sv.ts index 291924ee4..f02c5b850 100644 --- a/src/qt/locale/nyc3_sv.ts +++ b/src/qt/locale/nyc3_sv.ts @@ -66,12 +66,12 @@ Mottagaradresser - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Detta är dina Bitcoin-adresser för att skicka betalningar. Kontrollera alltid summan och den mottagande adressen innan du skickar bitcoin. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Detta är dina NYC3-adresser för att skicka betalningar. Kontrollera alltid summan och den mottagande adressen innan du skickar bitcoin. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Detta är dina Bitcoin-adresser för att ta emot betalningar. Det rekommenderas att använda en ny mottagningsadress för varje transaktion. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Detta är dina NYC3-adresser för att ta emot betalningar. Det rekommenderas att använda en ny mottagningsadress för varje transaktion. &Copy Address @@ -241,7 +241,7 @@ Var vänlig och försök igen. - BitcoinGUI + NYC3GUI Sign &message... Signera &meddelande... @@ -344,7 +344,7 @@ Var vänlig och försök igen. Send coins to a NYC3 address - Skicka bitcoin till en Bitcoin-adress + Skicka bitcoin till en NYC3-adress Backup wallet to another location @@ -367,8 +367,8 @@ Var vänlig och försök igen. &Verifiera meddelande... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -391,12 +391,12 @@ Var vänlig och försök igen. Kryptera de privata nycklar som tillhör din plånbok - Sign messages with your Bitcoin addresses to prove you own them - Signera meddelanden med dina Bitcoin-adresser för att bevisa att du äger dem + Sign messages with your NYC3 addresses to prove you own them + Signera meddelanden med dina NYC3-adresser för att bevisa att du äger dem - Verify messages to ensure they were signed with specified Bitcoin addresses - Verifiera meddelanden för att vara säker på att de signerades med angivna Bitcoin-adresser + Verify messages to ensure they were signed with specified NYC3 addresses + Verifiera meddelanden för att vara säker på att de signerades med angivna NYC3-adresser &File @@ -435,8 +435,8 @@ Var vänlig och försök igen. &Kommandoradsalternativ - %n active connection(s) to Bitcoin network - %n aktiva anslutningar till Bitcoin-nätverket.%n aktiva anslutningar till Bitcoin-nätverket. + %n active connection(s) to NYC3 network + %n aktiva anslutningar till NYC3-nätverket.%n aktiva anslutningar till NYC3-nätverket. Indexing blocks on disk... @@ -503,8 +503,8 @@ Var vänlig och försök igen. Stäng plånboken - Show the %1 help message to get a list with possible Bitcoin command-line options - Visa %1 hjälpmeddelande för att få en lista med möjliga Bitcoin kommandoradsalternativ. + Show the %1 help message to get a list with possible NYC3 command-line options + Visa %1 hjälpmeddelande för att få en lista med möjliga NYC3 kommandoradsalternativ. default wallet @@ -615,8 +615,8 @@ Var vänlig och försök igen. Denna plånbok är <b>krypterad</b> och för närvarande <b>låst</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Ett kritiskt fel uppstod. Bitcoin kan inte fortsätta att köra säkert och kommer att avslutas. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Ett kritiskt fel uppstod. NYC3 kan inte fortsätta att köra säkert och kommer att avslutas. @@ -806,7 +806,7 @@ Var vänlig och försök igen. The entered address "%1" is not a valid NYC3 address. - Den angivna adressen "%1" är inte en giltig Bitcoin-adress. + Den angivna adressen "%1" är inte en giltig NYC3-adress. Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -902,8 +902,8 @@ Var vänlig och försök igen. Använd en anpassad datakatalog: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -914,8 +914,8 @@ Var vänlig och försök igen. Ungefär %1 GB data kommer att lagras i den här katalogen. - %1 will download and store a copy of the Bitcoin block chain. - %1 kommer att ladda ner och lagra en kopia av Bitcoin-blockkedjan. + %1 will download and store a copy of the NYC3 block chain. + %1 kommer att ladda ner och lagra en kopia av NYC3-blockkedjan. The wallet will also be stored in this directory. @@ -946,7 +946,7 @@ Var vänlig och försök igen. Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below. - Nyligen gjorda transaktioner visas inte korrekt och därför kan din plånboks saldo visas felaktigt. Denna information kommer att visas korrekt så snart din plånbok har synkroniserat klart med Bitcoin-nätverket enligt detaljer nedan. + Nyligen gjorda transaktioner visas inte korrekt och därför kan din plånboks saldo visas felaktigt. Denna information kommer att visas korrekt så snart din plånbok har synkroniserat klart med NYC3-nätverket enligt detaljer nedan. Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network. @@ -1131,8 +1131,8 @@ Var vänlig och försök igen. &Spendera obekräftad växel - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Öppna automatiskt Bitcoin-klientens port på routern. Detta fungerar endast om din router stödjer UPnP och det är är aktiverat. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Öppna automatiskt NYC3-klientens port på routern. Detta fungerar endast om din router stödjer UPnP och det är är aktiverat. Map port using &UPnP @@ -1147,8 +1147,8 @@ Var vänlig och försök igen. Tillåt ankommande anslutningar - Connect to the Bitcoin network through a SOCKS5 proxy. - Anslut till Bitcoin-nätverket genom en SOCKS5-proxy. + Connect to the NYC3 network through a SOCKS5 proxy. + Anslut till NYC3-nätverket genom en SOCKS5-proxy. &Connect through SOCKS5 proxy (default proxy): @@ -1183,8 +1183,8 @@ Var vänlig och försök igen. Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Anslut till Bitcoin-nätverket genom en separat SOCKS5-proxy för dolda tjänster i Tor. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Anslut till NYC3-nätverket genom en separat SOCKS5-proxy för dolda tjänster i Tor. &Window @@ -1294,8 +1294,8 @@ Var vänlig och försök igen. Formulär - 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. - Den visade informationen kan vara inaktuell. Plånboken synkroniseras automatiskt med Bitcoin-nätverket efter att anslutningen är upprättad, men denna process har inte slutförts ännu. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Den visade informationen kan vara inaktuell. Plånboken synkroniseras automatiskt med NYC3-nätverket efter att anslutningen är upprättad, men denna process har inte slutförts ännu. Watch-only: @@ -1390,7 +1390,7 @@ Var vänlig och försök igen. URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - URI kan inte parsas! Detta kan orsakas av en ogiltig Bitcoin-adress eller felaktiga URI-parametrar. + URI kan inte parsas! Detta kan orsakas av en ogiltig NYC3-adress eller felaktiga URI-parametrar. Payment request file handling @@ -1492,7 +1492,7 @@ Var vänlig och försök igen. Enter a NYC3 address (e.g. %1) - Ange en Bitcoin-adress (t.ex. %1) + Ange en NYC3-adress (t.ex. %1) %1 d @@ -1935,8 +1935,8 @@ Var vänlig och försök igen. &Meddelande: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Ett valfritt meddelande att bifoga betalningsbegäran, vilket visas när begäran öppnas. Obs: Meddelandet kommer inte att sändas med betalningen över Bitcoin-nätverket. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Ett valfritt meddelande att bifoga betalningsbegäran, vilket visas när begäran öppnas. Obs: Meddelandet kommer inte att sändas med betalningen över NYC3-nätverket. An optional label to associate with the new receiving address. @@ -2357,7 +2357,7 @@ Notera: Då avgiften beräknas per byte kommer en avgift på 50 satoshi tas ut f Warning: Invalid NYC3 address - Varning: Ogiltig Bitcoin-adress + Varning: Ogiltig NYC3-adress Warning: Unknown change address @@ -2400,7 +2400,7 @@ Notera: Då avgiften beräknas per byte kommer en avgift på 50 satoshi tas ut f The NYC3 address to send the payment to - Bitcoin-adress att sända betalning till + NYC3-adress att sända betalning till Alt+A @@ -2447,8 +2447,8 @@ Notera: Då avgiften beräknas per byte kommer en avgift på 50 satoshi tas ut f Ange en etikett för denna adress för att lägga till den i listan med använda adresser - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Ett meddelande som bifogades bitcoin: -URIn och som lagras med transaktionen som referens. NB: Meddelandet kommer inte att sändas över Bitcoin-nätverket. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Ett meddelande som bifogades bitcoin: -URIn och som lagras med transaktionen som referens. NB: Meddelandet kommer inte att sändas över NYC3-nätverket. Pay To: @@ -2497,7 +2497,7 @@ Notera: Då avgiften beräknas per byte kommer en avgift på 50 satoshi tas ut f The NYC3 address to sign the message with - Bitcoin-adress att signera meddelandet med + NYC3-adress att signera meddelandet med Choose previously used address @@ -2529,7 +2529,7 @@ Notera: Då avgiften beräknas per byte kommer en avgift på 50 satoshi tas ut f Sign the message to prove you own this NYC3 address - Signera meddelandet för att bevisa att du äger denna Bitcoin-adress + Signera meddelandet för att bevisa att du äger denna NYC3-adress Sign &Message @@ -2553,11 +2553,11 @@ Notera: Då avgiften beräknas per byte kommer en avgift på 50 satoshi tas ut f The NYC3 address the message was signed with - Bitcoin-adress som meddelandet signerades med + NYC3-adress som meddelandet signerades med Verify the message to ensure it was signed with the specified NYC3 address - Verifiera meddelandet för att vara säker på att det signerades med angiven Bitcoin-adress + Verifiera meddelandet för att vara säker på att det signerades med angiven NYC3-adress Verify &Message @@ -3107,7 +3107,7 @@ Notera: Då avgiften beräknas per byte kommer en avgift på 50 satoshi tas ut f WalletModel Send Coins - Skicka Bitcoins + Skicka NYC3s Fee bump error diff --git a/src/qt/locale/nyc3_szl.ts b/src/qt/locale/nyc3_szl.ts index 4088ef606..2851c532f 100644 --- a/src/qt/locale/nyc3_szl.ts +++ b/src/qt/locale/nyc3_szl.ts @@ -66,12 +66,12 @@ Adresy ôdbiyraniŏ - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Tukej sōm adresy Bitcoin na kere posyłŏsz płaty. Dycki wybaduj wielość i adresã ôdbiyrŏcza przed posłaniym mōnet. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Tukej sōm adresy NYC3 na kere posyłŏsz płaty. Dycki wybaduj wielość i adresã ôdbiyrŏcza przed posłaniym mōnet. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Tukej sōm adresy Bitcoin do ôdbiyraniŏ płatōw. Zalycŏ sie używaniŏ nowych adres ôdbiorczych dlŏ kożdyj transakcyje. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Tukej sōm adresy NYC3 do ôdbiyraniŏ płatōw. Zalycŏ sie używaniŏ nowych adres ôdbiorczych dlŏ kożdyj transakcyje. &Copy Address @@ -236,7 +236,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Szkryftnij &wiadōmość @@ -339,7 +339,7 @@ Send coins to a NYC3 address - Poślij mōnety na adresã Bitcoin + Poślij mōnety na adresã NYC3 Backup wallet to another location @@ -362,8 +362,8 @@ &Weryfikuj wiadōmość... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -386,12 +386,12 @@ Szyfruj klucze prywatne, kere sōm we twojim portmanyju - Sign messages with your Bitcoin addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them Podpisz wiadōmości swojōm adresōm coby dowiyść jejich posiadanie - Verify messages to ensure they were signed with specified Bitcoin addresses - Zweryfikuj wiadōmość, coby wejzdrzeć sie, iże ôstała podpisanŏ podanōm adresōm Bitcoin. + Verify messages to ensure they were signed with specified NYC3 addresses + Zweryfikuj wiadōmość, coby wejzdrzeć sie, iże ôstała podpisanŏ podanōm adresōm NYC3. &File @@ -430,8 +430,8 @@ Ôp&cyje piski nakŏzań - %n active connection(s) to Bitcoin network - %n aktywne połōnczynie do necu Bitcoin%n aktywnych połōnczyń do necu Bitcoin%n aktywnych skuplowań do necu Bitcoin + %n active connection(s) to NYC3 network + %n aktywne połōnczynie do necu NYC3%n aktywnych połōnczyń do necu NYC3%n aktywnych skuplowań do necu NYC3 Indexing blocks on disk... @@ -478,7 +478,7 @@ &Adresy posyłaniŏ - Show the %1 help message to get a list with possible Bitcoin command-line options + Show the %1 help message to get a list with possible NYC3 command-line options Pokŏż pōmoc %1 coby zobŏczyć wykŏz wszyjskich ôpcyji piski nakŏzań. @@ -558,8 +558,8 @@ Portmanyj je <b>zaszyfrowany</b> i terŏźnie <b>zaszperowany</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Przitrefiōł sie krytyczny feler. Bitcoin niy poradzi kōntynuować bezpiycznie i ôstanie zawrzity. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Przitrefiōł sie krytyczny feler. NYC3 niy poradzi kōntynuować bezpiycznie i ôstanie zawrzity. @@ -749,7 +749,7 @@ The entered address "%1" is not a valid NYC3 address. - Wkludzōnŏ adresa "%1" niyma nŏleżnōm adresōm Bitcoin. + Wkludzōnŏ adresa "%1" niyma nŏleżnōm adresōm NYC3. Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -841,8 +841,8 @@ Użyj ôbranego folderu datōw - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -853,8 +853,8 @@ Kole %1 GB datōw ôstanie spamiyntane w tym katalogu. - %1 will download and store a copy of the Bitcoin block chain. - %1 sebiere i spamiyntŏ kopijõ kety blokōw Bitcoin. + %1 will download and store a copy of the NYC3 block chain. + %1 sebiere i spamiyntŏ kopijõ kety blokōw NYC3. The wallet will also be stored in this directory. @@ -1042,8 +1042,8 @@ &Wydej niyprzituplowanõ wydŏwkã - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Autōmatycznie ôdewrzij port klijynta Bitcoin na routerze. Ta ôpcyjŏ funguje ino jeźli twōj router podpiyrŏ UPnP i je ôno zapuszczone. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Autōmatycznie ôdewrzij port klijynta NYC3 na routerze. Ta ôpcyjŏ funguje ino jeźli twōj router podpiyrŏ UPnP i je ôno zapuszczone. Map port using &UPnP @@ -1058,8 +1058,8 @@ Zwōl na skuplowania przichodzōnce - Connect to the Bitcoin network through a SOCKS5 proxy. - Skupluj sie z necym Bitcoin bez SOCKS5 proxy. + Connect to the NYC3 network through a SOCKS5 proxy. + Skupluj sie z necym NYC3 bez SOCKS5 proxy. &Connect through SOCKS5 proxy (default proxy): @@ -1090,8 +1090,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Skupluj sie z necym Bitcoin ze pōmocōm ôsobnego proxy SOCKS5 dlŏ necu TOR + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Skupluj sie z necym NYC3 ze pōmocōm ôsobnego proxy SOCKS5 dlŏ necu TOR &Window @@ -1137,7 +1137,7 @@ Formular - 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. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. Wyświytlanŏ informacyjŏ może być niyterŏźnŏ. Twōj portmanyj synchrōnizuje sie autōmatycznie z necym bitcoin zarŏz po tym, jak zrychtowane je skuplowanie, ale proces tyn niy ôstoł jeszcze skōńczōny. @@ -1219,7 +1219,7 @@ Enter a NYC3 address (e.g. %1) - Wkludź adresã Bitcoin (bp. %1) + Wkludź adresã NYC3 (bp. %1) %1 d @@ -1438,8 +1438,8 @@ &Etyketa: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Ôpcyjōnalnŏ wiadōmość do prziwstōniŏ do żōndaniŏ płatu, kerŏ bydzie wyświytlanŏ, kej żōndanie ôstanie ôdewrzōne. Napōmniynie: wiadōmość ta niy ôstanie wysłanŏ z płatym w nec Bitcoin. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Ôpcyjōnalnŏ wiadōmość do prziwstōniŏ do żōndaniŏ płatu, kerŏ bydzie wyświytlanŏ, kej żōndanie ôstanie ôdewrzōne. Napōmniynie: wiadōmość ta niy ôstanie wysłanŏ z płatym w nec NYC3. Clear @@ -1644,7 +1644,7 @@ Warning: Invalid NYC3 address - Pozōr: niynŏleżnŏ adresa Bitcoin + Pozōr: niynŏleżnŏ adresa NYC3 Warning: Unknown change address @@ -1667,7 +1667,7 @@ The NYC3 address to send the payment to - Adresa Bitcoin, na kerõ chcesz posłać płat + Adresa NYC3, na kerõ chcesz posłać płat Alt+A @@ -1686,8 +1686,8 @@ Wiadōmość: - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Wiadōmość, kerŏ ôstała prziwstōnŏ do URI bitcoin:, kerŏ bydzie przechowowanŏ z transakcyjōm w cylach informacyjnych. Napōmniynie: Ta wiadōmość niy bydzie rozszyrzowanŏ w necu Bitcoin. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Wiadōmość, kerŏ ôstała prziwstōnŏ do URI bitcoin:, kerŏ bydzie przechowowanŏ z transakcyjōm w cylach informacyjnych. Napōmniynie: Ta wiadōmość niy bydzie rozszyrzowanŏ w necu NYC3. diff --git a/src/qt/locale/nyc3_ta.ts b/src/qt/locale/nyc3_ta.ts index e1b9efccb..78a27e5aa 100644 --- a/src/qt/locale/nyc3_ta.ts +++ b/src/qt/locale/nyc3_ta.ts @@ -58,12 +58,12 @@ முகவரிகள் பெறப்படுகின்றன - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. இவை பணம் அனுப்புவதற்கு உங்கள் பிட்கின் முகவரிகள். நாணயங்களை அனுப்புவதற்கு முன் எப்பொழுதும் தொகையும் பெறுதலையும் சரிபார்க்கவும். - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - இவை உங்கள் Bitcoin முகவரிகள் பணம் பெறுவதற்கு. ஒவ்வொரு பரிவர்த்தனைக்கும் புதிய பெறுதல் முகவரியைப் பயன்படுத்த பரிந்துரைக்கப்படுகிறது. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + இவை உங்கள் NYC3 முகவரிகள் பணம் பெறுவதற்கு. ஒவ்வொரு பரிவர்த்தனைக்கும் புதிய பெறுதல் முகவரியைப் பயன்படுத்த பரிந்துரைக்கப்படுகிறது. &Copy Address @@ -228,7 +228,7 @@ - BitcoinGUI + NYC3GUI Sign &message... கையொப்பம் & செய்தி ... @@ -330,8 +330,8 @@ &செய்தியை சரிசெய்... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -354,11 +354,11 @@ உங்கள் பணப்பைச் சேர்ந்த தனிப்பட்ட விசைகளை குறியாக்குக - Sign messages with your Bitcoin addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them உங்கள் பிட்டினின் முகவரியுடன் செய்திகளை உங்களிடம் வைத்திருப்பதை நிரூபிக்க - Verify messages to ensure they were signed with specified Bitcoin addresses + Verify messages to ensure they were signed with specified NYC3 addresses குறிப்பிடப்பட்ட விக்கிபீடியா முகவர்களுடன் கையொப்பமிடப்பட்டதை உறுதிப்படுத்த, செய்திகளை சரிபார்க்கவும் @@ -391,7 +391,7 @@ Open a bitcoin: URI or payment request - ஒரு Bitcoin திறக்க: URI அல்லது பணம் கோரிக்கை + ஒரு NYC3 திறக்க: URI அல்லது பணம் கோரிக்கை &Command-line options @@ -518,7 +518,7 @@ Wallet குறியாக்கப்பட்டு தற்போது பூட்டப்பட்டுள்ளது - A fatal error occurred. Bitcoin can no longer continue safely and will quit. + A fatal error occurred. NYC3 can no longer continue safely and will quit. Wallet குறியாக்கப்பட்டு தற்போது பூட்டப்பட்டுள்ளது @@ -753,8 +753,8 @@ தனிப்பயன் தரவு கோப்பகத்தைப் பயன்படுத்தவும்: - Bitcoin - Bitcoin + NYC3 + NYC3 The wallet will also be stored in this directory. @@ -938,8 +938,8 @@ & உறுதிப்படுத்தப்படாத மாற்றத்தை செலவழிக்கவும் - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - ரூட்டரில் Bitcoin கிளையன்ட் போர்ட் தானாக திறக்க. இது உங்கள் திசைவி UPnP ஐ ஆதரிக்கும் போது மட்டுமே இயங்குகிறது. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + ரூட்டரில் NYC3 கிளையன்ட் போர்ட் தானாக திறக்க. இது உங்கள் திசைவி UPnP ஐ ஆதரிக்கும் போது மட்டுமே இயங்குகிறது. Map port using &UPnP @@ -954,8 +954,8 @@ Incomin & g இணைப்புகளை அனுமதிக்கவும் - Connect to the Bitcoin network through a SOCKS5 proxy. - Bitcoin பிணையத்துடன் SOCKS5 ப்ராக்ஸி மூலம் இணைக்கவும். + Connect to the NYC3 network through a SOCKS5 proxy. + NYC3 பிணையத்துடன் SOCKS5 ப்ராக்ஸி மூலம் இணைக்கவும். &Connect through SOCKS5 proxy (default proxy): @@ -990,7 +990,7 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. டார் மறைக்கப்பட்ட சேவைகளை தனித்த SOCKS5 ப்ராக்ஸி மூலம் பிட்கோடு நெட்வொர்க்குடன் இணைக்கவும். @@ -1097,7 +1097,7 @@ படிவம் - 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. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. காட்டப்படும் தகவல் காலாவதியானதாக இருக்கலாம். ஒரு இணைப்பு நிறுவப்பட்ட பிறகு, உங்கள் பணப்பை தானாக பிட்கோடு நெட்வொர்க்குடன் ஒத்திசைக்கிறது, ஆனால் இந்த செயல்முறை இன்னும் முடிவடையவில்லை. @@ -1173,7 +1173,7 @@ Cannot start bitcoin: click-to-pay handler - Bitcoin தொடங்க முடியாது: கிளிக் க்கு ஊதியம் கையாளுதல் + NYC3 தொடங்க முடியாது: கிளிக் க்கு ஊதியம் கையாளுதல் URI handling @@ -1646,8 +1646,8 @@ &செய்தி: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - கோரிக்கையை திறக்கும் போது காட்டப்படும் இது பணம் கோரிக்கை இணைக்க ஒரு விருப்ப செய்தி. குறிப்பு: Bitcoin நெட்வொர்க்கில் பணம் செலுத்தியவுடன் செய்தி அனுப்பப்படாது. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + கோரிக்கையை திறக்கும் போது காட்டப்படும் இது பணம் கோரிக்கை இணைக்க ஒரு விருப்ப செய்தி. குறிப்பு: NYC3 நெட்வொர்க்கில் பணம் செலுத்தியவுடன் செய்தி அனுப்பப்படாது. An optional label to associate with the new receiving address. @@ -2132,7 +2132,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p bitcoin-core NYC3 - Bitcoin மையம் + NYC3 மையம் Information diff --git a/src/qt/locale/nyc3_th_TH.ts b/src/qt/locale/nyc3_th_TH.ts index 8bb1c73e9..7141aefaa 100644 --- a/src/qt/locale/nyc3_th_TH.ts +++ b/src/qt/locale/nyc3_th_TH.ts @@ -88,7 +88,7 @@ - BitcoinGUI + NYC3GUI Sign &message... เซ็นต์ชื่อด้วย &ข้อความ... @@ -167,7 +167,7 @@ Send coins to a NYC3 address - ส่ง coins ไปยัง ที่เก็บ Bitcoin + ส่ง coins ไปยัง ที่เก็บ NYC3 Backup wallet to another location @@ -190,8 +190,8 @@ &ยืนยันข้อความ... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -214,12 +214,12 @@ เข้ารหัส private keys/ รหัสส่วนตัว สำหรับกระเป๋าเงินของท่าน - Sign messages with your Bitcoin addresses to prove you own them - เซ็นชื่อด้วยข้อความ ที่เก็บ Bitcoin เพื่อแสดงว่าท่านเป็นเจ้าของ bitcoin นี้จริง + Sign messages with your NYC3 addresses to prove you own them + เซ็นชื่อด้วยข้อความ ที่เก็บ NYC3 เพื่อแสดงว่าท่านเป็นเจ้าของ bitcoin นี้จริง - Verify messages to ensure they were signed with specified Bitcoin addresses - ตรวจสอบ ข้อความ เพื่อให้แน่ใจว่า การเซ็นต์ชื่อ ด้วยที่เก็บ Bitcoin แล้ว + Verify messages to ensure they were signed with specified NYC3 addresses + ตรวจสอบ ข้อความ เพื่อให้แน่ใจว่า การเซ็นต์ชื่อ ด้วยที่เก็บ NYC3 แล้ว &File @@ -258,8 +258,8 @@ &ตัวเลือก Command-line - %n active connection(s) to Bitcoin network - %n ช่องการเชื่อมต่อที่ใช้งานได้ เพื่อเชื่อมกับเครือข่าย Bitcoin + %n active connection(s) to NYC3 network + %n ช่องการเชื่อมต่อที่ใช้งานได้ เพื่อเชื่อมกับเครือข่าย NYC3 Indexing blocks on disk... @@ -302,8 +302,8 @@ ทันสมัย - Show the %1 help message to get a list with possible Bitcoin command-line options - แสดง %1 ข้อความช่วยเหลือ เพื่อแสดงรายการ ตัวเลือกที่เป็นไปได้สำหรับ Bitcoin command-line + Show the %1 help message to get a list with possible NYC3 command-line options + แสดง %1 ข้อความช่วยเหลือ เพื่อแสดงรายการ ตัวเลือกที่เป็นไปได้สำหรับ NYC3 command-line &Window @@ -523,8 +523,8 @@ ใช้ไดเร็กทอรี่ข้อมูลที่ตั้งค่าเอง: - Bitcoin - Bitcoin + NYC3 + NYC3 Error: Specified data directory "%1" cannot be created. @@ -644,16 +644,16 @@ &ใช้เงินทอนที่ยังไม่ยืนยัน - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - เปิด Bitcoin ไคล์เอ็นท์พอร์ต/client port บน router โดยอัตโนมัติ วิธีนี้ใช้ได้เมื่อ router สนับสนุน UPnP และสถานะเปิดใช้งาน + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + เปิด NYC3 ไคล์เอ็นท์พอร์ต/client port บน router โดยอัตโนมัติ วิธีนี้ใช้ได้เมื่อ router สนับสนุน UPnP และสถานะเปิดใช้งาน Map port using &UPnP จองพอร์ต โดยใช้ &UPnP - Connect to the Bitcoin network through a SOCKS5 proxy. - เชื่อมต่อกับ Bitcoin เน็ตเวิร์ก ผ่านพร็อกซี่แบบ SOCKS5 + Connect to the NYC3 network through a SOCKS5 proxy. + เชื่อมต่อกับ NYC3 เน็ตเวิร์ก ผ่านพร็อกซี่แบบ SOCKS5 &Connect through SOCKS5 proxy (default proxy): @@ -688,8 +688,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - เชื่อมต่อกับ เครือข่าย Bitcoin ผ่านทาง พร้อกซี่ SOCKS5 แยกต่างหาก สำหรับ Tor เซอร์วิส + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + เชื่อมต่อกับ เครือข่าย NYC3 ผ่านทาง พร้อกซี่ SOCKS5 แยกต่างหาก สำหรับ Tor เซอร์วิส &Window diff --git a/src/qt/locale/nyc3_tr.ts b/src/qt/locale/nyc3_tr.ts index b2ddef95b..3ed67fb97 100644 --- a/src/qt/locale/nyc3_tr.ts +++ b/src/qt/locale/nyc3_tr.ts @@ -66,12 +66,12 @@ Alım adresleri - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Bunlar ödemeleri göndermek için kullanacağınız Bitcoin adreslerinizdir. Bitcoin yollamadan önce tutarı ve alıcının alım adresini her zaman kontrol ediniz. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Bunlar ödemeleri göndermek için kullanacağınız NYC3 adreslerinizdir. NYC3 yollamadan önce tutarı ve alıcının alım adresini her zaman kontrol ediniz. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Bunlar ödemeleri almak için kullanacağınız Bitcoin adreslerinizdir. Her işlem için yeni bir alım adresi kullanmanız tavsiye edilir. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Bunlar ödemeleri almak için kullanacağınız NYC3 adreslerinizdir. Her işlem için yeni bir alım adresi kullanmanız tavsiye edilir. &Copy Address @@ -236,7 +236,7 @@ - BitcoinGUI + NYC3GUI Sign &message... &İleti imzala... @@ -362,8 +362,8 @@ İletiyi &kontrol et... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -386,12 +386,12 @@ Cüzdanınıza ait özel anahtarları şifreleyin - Sign messages with your Bitcoin addresses to prove you own them - İletileri adreslerin size ait olduğunu ispatlamak için Bitcoin adresleri ile imzala + Sign messages with your NYC3 addresses to prove you own them + İletileri adreslerin size ait olduğunu ispatlamak için NYC3 adresleri ile imzala - Verify messages to ensure they were signed with specified Bitcoin addresses - Belirtilen Bitcoin adresleri ile imzalandıklarından emin olmak için iletileri kontrol et + Verify messages to ensure they were signed with specified NYC3 addresses + Belirtilen NYC3 adresleri ile imzalandıklarından emin olmak için iletileri kontrol et &File @@ -430,8 +430,8 @@ &Komut satırı seçenekleri - %n active connection(s) to Bitcoin network - Bitcoin şebekesine %n faal bağlantıBitcoin ağına %n etkin bağlantı var + %n active connection(s) to NYC3 network + NYC3 şebekesine %n faal bağlantıNYC3 ağına %n etkin bağlantı var Indexing blocks on disk... @@ -474,8 +474,8 @@ Güncel - Show the %1 help message to get a list with possible Bitcoin command-line options - Olası Bitcoin komut satırı seçeneklerinin listesini görmek için %1 yardım mesajını göster + Show the %1 help message to get a list with possible NYC3 command-line options + Olası NYC3 komut satırı seçeneklerinin listesini görmek için %1 yardım mesajını göster default wallet @@ -562,15 +562,15 @@ Cüzdan <b>şifrelenmiştir</b> ve şu anda <b>kilitlidir</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Ölümcül bir hata oluştu. Bitcoin yazılımı artık güvenli bir şekilde çalışmaya devam edemediği için kapatılacaktır. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Ölümcül bir hata oluştu. NYC3 yazılımı artık güvenli bir şekilde çalışmaya devam edemediği için kapatılacaktır. CoinControlDialog Coin Selection - Bitcoin Seçimi + NYC3 Seçimi Quantity: @@ -753,7 +753,7 @@ The entered address "%1" is not a valid NYC3 address. - Girilen "%1" adresi geçerli bir Bitcoin adresi değildir. + Girilen "%1" adresi geçerli bir NYC3 adresi değildir. Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -837,8 +837,8 @@ Özel bir veri klasörü kullan: - Bitcoin - Bitcoin + NYC3 + NYC3 Approximately %1 GB of data will be stored in this directory. @@ -1050,8 +1050,8 @@ Doğrulanmamış para üstünü &harca - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Yönlendiricide Bitcoin istemci portlarını otomatik olarak açar. Bu, sadece yönlendiricinizin UPnP desteği bulunuyorsa ve etkinse çalışabilir. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Yönlendiricide NYC3 istemci portlarını otomatik olarak açar. Bu, sadece yönlendiricinizin UPnP desteği bulunuyorsa ve etkinse çalışabilir. Map port using &UPnP @@ -1066,8 +1066,8 @@ Gelen bağlantılara izin ver - Connect to the Bitcoin network through a SOCKS5 proxy. - Bitcoin ağına bir SOCKS5 vekil sunucusu aracılığıyla bağlan. + Connect to the NYC3 network through a SOCKS5 proxy. + NYC3 ağına bir SOCKS5 vekil sunucusu aracılığıyla bağlan. &Connect through SOCKS5 proxy (default proxy): @@ -1102,8 +1102,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Bitcoin ağına gizli Tor servisleri için ayrı bir SOCKS5 vekil sunucusu aracılığıyla bağlan. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + NYC3 ağına gizli Tor servisleri için ayrı bir SOCKS5 vekil sunucusu aracılığıyla bağlan. &Window @@ -1139,7 +1139,7 @@ Choose the default subdivision unit to show in the interface and when sending coins. - Bitcoin gönderildiğinde arayüzde gösterilecek varsayılan alt birimi seçiniz. + NYC3 gönderildiğinde arayüzde gösterilecek varsayılan alt birimi seçiniz. Whether to show coin control features or not. @@ -1209,8 +1209,8 @@ Form - 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. - Görüntülenen bilgiler güncel olmayabilir. Bağlantı kurulduğunda cüzdanınız otomatik olarak Bitcoin ağı ile senkronize olur ancak bu işlem henüz tamamlanmamıştır. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Görüntülenen bilgiler güncel olmayabilir. Bağlantı kurulduğunda cüzdanınız otomatik olarak NYC3 ağı ile senkronize olur ancak bu işlem henüz tamamlanmamıştır. Watch-only: @@ -1285,7 +1285,7 @@ Cannot start bitcoin: click-to-pay handler - Bitcoin başlatılamadı: tıkla-ve-öde yöneticisi + NYC3 başlatılamadı: tıkla-ve-öde yöneticisi URI handling @@ -1305,7 +1305,7 @@ URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - URI ayrıştırılamıyor! Bunun nedeni geçersiz bir Bitcoin adresi veya hatalı biçimlendirilmiş URI değişkenleri olabilir. + URI ayrıştırılamıyor! Bunun nedeni geçersiz bir NYC3 adresi veya hatalı biçimlendirilmiş URI değişkenleri olabilir. Payment request file handling @@ -1407,7 +1407,7 @@ Enter a NYC3 address (e.g. %1) - Bir Bitcoin adresi giriniz (mesela %1) + Bir NYC3 adresi giriniz (mesela %1) %1 d @@ -1788,7 +1788,7 @@ WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command. - UYARI: Bitcoin dolandırıcılarının çok fazla etkin olduğu zamanlarda, dolandırıcılar bazı kullanıcılara buraya komutlar yazmalarını söylerek onların cüzdanlarındaki bitcoinleri çalmışlardır. Bir komutun sonuçlarını tam olarak anlamadan bu konsolu kullanmayın. + UYARI: NYC3 dolandırıcılarının çok fazla etkin olduğu zamanlarda, dolandırıcılar bazı kullanıcılara buraya komutlar yazmalarını söylerek onların cüzdanlarındaki bitcoinleri çalmışlardır. Bir komutun sonuçlarını tam olarak anlamadan bu konsolu kullanmayın. Network activity disabled @@ -1850,8 +1850,8 @@ &İleti: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Talep açıldığında gösterilecek, isteğinize dayalı, ödeme talebi ile ilişkilendirilecek bir ileti. Not: Bu ileti ödeme ile birlikte Bitcoin ağı üzerinden gönderilmeyecektir. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Talep açıldığında gösterilecek, isteğinize dayalı, ödeme talebi ile ilişkilendirilecek bir ileti. Not: Bu ileti ödeme ile birlikte NYC3 ağı üzerinden gönderilmeyecektir. An optional label to associate with the new receiving address. @@ -2012,7 +2012,7 @@ SendCoinsDialog Send Coins - Bitcoin yolla + NYC3 yolla Coin Control Features @@ -2196,7 +2196,7 @@ Confirm send coins - Bitcoin gönderimini onaylayın + NYC3 gönderimini onaylayın The recipient address is not valid. Please recheck. @@ -2236,7 +2236,7 @@ Warning: Invalid NYC3 address - Uyarı: geçersiz Bitcoin adresi + Uyarı: geçersiz NYC3 adresi Warning: Unknown change address @@ -2279,7 +2279,7 @@ The NYC3 address to send the payment to - Ödemenin yollanacağı Bitcoin adresi + Ödemenin yollanacağı NYC3 adresi Alt+A @@ -2326,8 +2326,8 @@ Kullanılmış adres listesine eklemek için bu adrese bir etiket girin - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Referans için bitcoin: URI'siyle iliştirilmiş işlemle birlikte depolanacak bir ileti. Not: Bu mesaj Bitcoin ağı üzerinden gönderilmeyecektir. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Referans için bitcoin: URI'siyle iliştirilmiş işlemle birlikte depolanacak bir ileti. Not: Bu mesaj NYC3 ağı üzerinden gönderilmeyecektir. Pay To: @@ -2376,7 +2376,7 @@ The NYC3 address to sign the message with - İletinin imzalanmasında kullanılacak Bitcoin adresi + İletinin imzalanmasında kullanılacak NYC3 adresi Choose previously used address @@ -2408,7 +2408,7 @@ Sign the message to prove you own this NYC3 address - Bu Bitcoin adresinin sizin olduğunu ispatlamak için iletiyi imzalayın + Bu NYC3 adresinin sizin olduğunu ispatlamak için iletiyi imzalayın Sign &Message @@ -2432,11 +2432,11 @@ The NYC3 address the message was signed with - İletinin imzalanmasında kullanılan Bitcoin adresi + İletinin imzalanmasında kullanılan NYC3 adresi Verify the message to ensure it was signed with the specified NYC3 address - Belirtilen Bitcoin adresi ile imzalandığını doğrulamak için iletiyi kontrol et + Belirtilen NYC3 adresi ile imzalandığını doğrulamak için iletiyi kontrol et Verify &Message @@ -2974,7 +2974,7 @@ WalletModel Send Coins - Bitcoini Gönder + NYC3i Gönder Increasing transaction fee failed @@ -3080,7 +3080,7 @@ NYC3 - Bitcoin Çekirdeği + NYC3 Çekirdeği The %s developers diff --git a/src/qt/locale/nyc3_tr_TR.ts b/src/qt/locale/nyc3_tr_TR.ts index fafe65790..441f3a8cd 100644 --- a/src/qt/locale/nyc3_tr_TR.ts +++ b/src/qt/locale/nyc3_tr_TR.ts @@ -66,12 +66,12 @@ Alınan Adresler - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Bunlar ödeme göndermek için gereken Bitcoin adreslerinizdir. Para göndermeden önce her zaman miktarı ve alıcı adresi kontrol edin. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Bunlar ödeme göndermek için gereken NYC3 adreslerinizdir. Para göndermeden önce her zaman miktarı ve alıcı adresi kontrol edin. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Bunlar ödeme almak için kullanılacak Bitcoin adreslerinizdir. Her işlem için yeni bir ödeme alma adresi kullanılması tavsiye edilir. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Bunlar ödeme almak için kullanılacak NYC3 adreslerinizdir. Her işlem için yeni bir ödeme alma adresi kullanılması tavsiye edilir. &Copy Address @@ -216,7 +216,7 @@ BanTableModel - BitcoinGUI + NYC3GUI Sign &message... İmza &mesaj @@ -287,7 +287,7 @@ Send coins to a NYC3 address - Bitcoin adresine madeni para gönderin + NYC3 adresine madeni para gönderin Backup wallet to another location @@ -302,8 +302,8 @@ Onay mesajı... - Bitcoin - Bitcoin + NYC3 + NYC3 @@ -459,7 +459,7 @@ The entered address "%1" is not a valid NYC3 address. - Girilen adres "%1" Bitcoin adresiyle eşleşmiyor. + Girilen adres "%1" NYC3 adresiyle eşleşmiyor. New key generation failed. @@ -495,8 +495,8 @@ Hoş geldiniz - Bitcoin - Bitcoin + NYC3 + NYC3 @@ -628,7 +628,7 @@ Form - 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. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. Gösterilen bilgi geçerli olmayabilir. Bağlantı tekrar sağlandıktan sonra cüzdanınız otomatik olarak senkronize olacaktır. Henüz senkronize olma işlemi tamamlanmadı. @@ -710,7 +710,7 @@ QObject Enter a NYC3 address (e.g. %1) - Bitcoin adresinizi girin (örneğin %1) + NYC3 adresinizi girin (örneğin %1) N/A @@ -1095,7 +1095,7 @@ Warning: Invalid NYC3 address - Uyarı: Hatalı Bitcoin adresi + Uyarı: Hatalı NYC3 adresi (no label) @@ -1391,7 +1391,7 @@ bitcoin-core NYC3 - Bitcoin Çekirdeği + NYC3 Çekirdeği Copyright (C) %i-%i diff --git a/src/qt/locale/nyc3_uk.ts b/src/qt/locale/nyc3_uk.ts index c902a541b..6e9b2b618 100644 --- a/src/qt/locale/nyc3_uk.ts +++ b/src/qt/locale/nyc3_uk.ts @@ -66,12 +66,12 @@ Адреса отримання - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Це ваші адреси Bitcoin для надсилання платежів. Завжди перевіряйте суму та адресу одержувача перед відправленням монет. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Це ваші адреси NYC3 для надсилання платежів. Завжди перевіряйте суму та адресу одержувача перед відправленням монет. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Це ваші адреси Bitcoin для отримання платежів. Для кожної транзакції рекомендується використовувати нову адресу одержувача. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Це ваші адреси NYC3 для отримання платежів. Для кожної транзакції рекомендується використовувати нову адресу одержувача. &Copy Address @@ -240,7 +240,7 @@ - BitcoinGUI + NYC3GUI Sign &message... &Підписати повідомлення... @@ -366,8 +366,8 @@ П&еревірити повідомлення... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -390,12 +390,12 @@ Зашифрувати закриті ключі, що знаходяться у вашому гаманці - Sign messages with your Bitcoin addresses to prove you own them - Підтвердіть, що Ви є власником повідомлення підписавши його Вашою Bitcoin-адресою + Sign messages with your NYC3 addresses to prove you own them + Підтвердіть, що Ви є власником повідомлення підписавши його Вашою NYC3-адресою - Verify messages to ensure they were signed with specified Bitcoin addresses - Перевірте повідомлення для впевненості, що воно підписано вказаною Bitcoin-адресою + Verify messages to ensure they were signed with specified NYC3 addresses + Перевірте повідомлення для впевненості, що воно підписано вказаною NYC3-адресою &File @@ -434,8 +434,8 @@ П&араметри командного рядка - %n active connection(s) to Bitcoin network - %n активне з'єднання з мережею Bitcoin%n активні з'єднання з мережею Bitcoin%n активних з'єднань з мережею Bitcoin%n активних з'єднань з мережею Bitcoin + %n active connection(s) to NYC3 network + %n активне з'єднання з мережею NYC3%n активні з'єднання з мережею NYC3%n активних з'єднань з мережею NYC3%n активних з'єднань з мережею NYC3 Indexing blocks on disk... @@ -486,7 +486,7 @@ &Адреси для отримання - Show the %1 help message to get a list with possible Bitcoin command-line options + Show the %1 help message to get a list with possible NYC3 command-line options Показати довідку %1 для отримання переліку можливих параметрів командного рядка. @@ -590,7 +590,7 @@ <b>Зашифрований</b> гаманець <b>заблоковано</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. + A fatal error occurred. NYC3 can no longer continue safely and will quit. Сталася фатальна помилка. Гаманець буде закрито. @@ -777,7 +777,7 @@ The entered address "%1" is not a valid NYC3 address. - Введена адреса "%1" не є адресою в мережі Bitcoin. + Введена адреса "%1" не є адресою в мережі NYC3. Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -869,8 +869,8 @@ Використовувати свій каталог даних: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -881,7 +881,7 @@ Близько %1 Гб даних буде збережено в цьому каталозі. - %1 will download and store a copy of the Bitcoin block chain. + %1 will download and store a copy of the NYC3 block chain. %1 буде завантажувати та зберігати копію ланцюжка блоків біткінів. @@ -1086,7 +1086,7 @@ &Витрачати непідтверджену решту - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. Автоматично відкривати порт для клієнту біткоін на роутері. Працює лише якщо ваш роутер підтримує UPnP і ця функція увімкнена. @@ -1102,8 +1102,8 @@ Дозволити вхідні з'єднання - Connect to the Bitcoin network through a SOCKS5 proxy. - Підключення до мережі Bitcoin через SOCKS5 проксі. + Connect to the NYC3 network through a SOCKS5 proxy. + Підключення до мережі NYC3 через SOCKS5 проксі. &Connect through SOCKS5 proxy (default proxy): @@ -1138,8 +1138,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Підключатися до мережі Bitcoin через окремий SOCKS5 проксі для прихованих сервісів Tor. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Підключатися до мережі NYC3 через окремий SOCKS5 проксі для прихованих сервісів Tor. &Window @@ -1249,8 +1249,8 @@ Форма - 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. - Показана інформація вже може бути застарілою. Ваш гаманець буде автоматично синхронізовано з мережею Bitcoin після встановлення підключення, але цей процес ще не завершено. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Показана інформація вже може бути застарілою. Ваш гаманець буде автоматично синхронізовано з мережею NYC3 після встановлення підключення, але цей процес ще не завершено. Watch-only: @@ -1457,7 +1457,7 @@ Enter a NYC3 address (e.g. %1) - Введіть адресу Bitcoin (наприклад %1) + Введіть адресу NYC3 (наприклад %1) %1 d @@ -1912,8 +1912,8 @@ &Повідомлення: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Необов'язкове повідомлення на додаток до запиту платежу, котре буде показане під час відкриття запиту. Примітка: Це повідомлення не буде відправлено з платежем через мережу Bitcoin. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Необов'язкове повідомлення на додаток до запиту платежу, котре буде показане під час відкриття запиту. Примітка: Це повідомлення не буде відправлено з платежем через мережу NYC3. An optional label to associate with the new receiving address. @@ -2385,7 +2385,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p The NYC3 address to send the payment to - Адреса Bitcoin для відправлення платежу + Адреса NYC3 для відправлення платежу Alt+A @@ -2432,8 +2432,8 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p Введіть мітку для цієї адреси для додавання її в список використаних адрес - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Повідомлення, що було додане до bitcoin:URI та буде збережено разом з транзакцією для довідки. Примітка: Це повідомлення не буде відправлено в мережу Bitcoin. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Повідомлення, що було додане до bitcoin:URI та буде збережено разом з транзакцією для довідки. Примітка: Це повідомлення не буде відправлено в мережу NYC3. Pay To: @@ -2482,7 +2482,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p The NYC3 address to sign the message with - Адреса Bitcoin для підпису цього повідомлення + Адреса NYC3 для підпису цього повідомлення Choose previously used address @@ -2538,11 +2538,11 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p The NYC3 address the message was signed with - Адреса Bitcoin, якою було підписано це повідомлення + Адреса NYC3, якою було підписано це повідомлення Verify the message to ensure it was signed with the specified NYC3 address - Перевірте повідомлення для впевненості, що воно підписано вказаною Bitcoin-адресою + Перевірте повідомлення для впевненості, що воно підписано вказаною NYC3-адресою Verify &Message diff --git a/src/qt/locale/nyc3_ur_PK.ts b/src/qt/locale/nyc3_ur_PK.ts index 3c5733432..69187641f 100644 --- a/src/qt/locale/nyc3_ur_PK.ts +++ b/src/qt/locale/nyc3_ur_PK.ts @@ -116,7 +116,7 @@ BanTableModel - BitcoinGUI + NYC3GUI Error نقص diff --git a/src/qt/locale/nyc3_uz@Cyrl.ts b/src/qt/locale/nyc3_uz@Cyrl.ts index f0c5f6749..d094ebea2 100644 --- a/src/qt/locale/nyc3_uz@Cyrl.ts +++ b/src/qt/locale/nyc3_uz@Cyrl.ts @@ -72,7 +72,7 @@ BanTableModel - BitcoinGUI + NYC3GUI Sign &message... &Хабар ёзиш... @@ -139,7 +139,7 @@ Send coins to a NYC3 address - Тангаларни Bitcoin манзилига жўнатиш + Тангаларни NYC3 манзилига жўнатиш Backup wallet to another location @@ -162,8 +162,8 @@ Хабарни &тасдиқлаш... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -186,12 +186,12 @@ Ҳамёнингизга тегишли махфий калитларни кодлаш - Sign messages with your Bitcoin addresses to prove you own them - Bitcoin манзилидан унинг эгаси эканлигингизни исботлаш учун хабарлар ёзинг + Sign messages with your NYC3 addresses to prove you own them + NYC3 манзилидан унинг эгаси эканлигингизни исботлаш учун хабарлар ёзинг - Verify messages to ensure they were signed with specified Bitcoin addresses - Хабарларни махсус Bitcoin манзилларингиз билан ёзилганлигига ишонч ҳосил қилиш учун уларни тасдиқланг + Verify messages to ensure they were signed with specified NYC3 addresses + Хабарларни махсус NYC3 манзилларингиз билан ёзилганлигига ишонч ҳосил қилиш учун уларни тасдиқланг &File @@ -223,15 +223,15 @@ Open a bitcoin: URI or payment request - Bitcoin’ни очиш: URI ёки тўлов сўрови + NYC3’ни очиш: URI ёки тўлов сўрови &Command-line options &Буйруқлар сатри мосламалари - %n active connection(s) to Bitcoin network - %n та Bitcoin тармоғига фаол уланиш мавжуд + %n active connection(s) to NYC3 network + %n та NYC3 тармоғига фаол уланиш мавжуд %1 behind @@ -425,8 +425,8 @@ Бошқа маълумотлар директориясида фойдаланинг: - Bitcoin - Bitcoin + NYC3 + NYC3 Error: Specified data directory "%1" cannot be created. @@ -581,8 +581,8 @@ Шакл - 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. - Кўрсатилган маълумот эскирган бўлиши мумкин. Ҳамёнингиз алоқа ўрнатилгандан сўнг Bitcoin тармоқ билан автоматик тарзда синхронланади, аммо жараён ҳалигача тугалланмади. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Кўрсатилган маълумот эскирган бўлиши мумкин. Ҳамёнингиз алоқа ўрнатилгандан сўнг NYC3 тармоқ билан автоматик тарзда синхронланади, аммо жараён ҳалигача тугалланмади. Watch-only: @@ -663,7 +663,7 @@ Enter a NYC3 address (e.g. %1) - Bitcoin манзилини киритинг (масалан. %1) + NYC3 манзилини киритинг (масалан. %1) %1 m diff --git a/src/qt/locale/nyc3_vi.ts b/src/qt/locale/nyc3_vi.ts index dc5ea6824..21dc38d32 100644 --- a/src/qt/locale/nyc3_vi.ts +++ b/src/qt/locale/nyc3_vi.ts @@ -66,12 +66,12 @@ Địa chỉ đang nhận - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. Đây là những địa chỉ đang thực hiện thanh toán. Luôn kiểm tra số lượng và địa chỉ nhận trước khi gửi coins. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Đây là địa chỉ Bitcoin của bạn để nhận thanh toán. Khuyến cáo nên sử dụng địa chỉ mới cho mỗi giao dịch. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Đây là địa chỉ NYC3 của bạn để nhận thanh toán. Khuyến cáo nên sử dụng địa chỉ mới cho mỗi giao dịch. &Copy Address @@ -236,7 +236,7 @@ - BitcoinGUI + NYC3GUI Sign &message... Chữ ký &lời nhắn... @@ -339,7 +339,7 @@ Send coins to a NYC3 address - Gửi coin đến một địa chỉ Bitcoin + Gửi coin đến một địa chỉ NYC3 Backup wallet to another location @@ -362,8 +362,8 @@ &Lời nhắn xác nhận... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -386,12 +386,12 @@ Mã hóa private key thuộc về ví của bạn - Sign messages with your Bitcoin addresses to prove you own them - Đăng ký lời nhắn với địa chỉ Bitcoin của bạn để chứng minh quyền sở hữu chúng + Sign messages with your NYC3 addresses to prove you own them + Đăng ký lời nhắn với địa chỉ NYC3 của bạn để chứng minh quyền sở hữu chúng - Verify messages to ensure they were signed with specified Bitcoin addresses - Xác minh lời nhắn để chắc chắn đã được đăng ký với địa chỉ Bitcoin xác định + Verify messages to ensure they were signed with specified NYC3 addresses + Xác minh lời nhắn để chắc chắn đã được đăng ký với địa chỉ NYC3 xác định &File @@ -430,8 +430,8 @@ &Tùy chỉnh Command-line - %n active connection(s) to Bitcoin network - %n kết nối đến Bitcoin network + %n active connection(s) to NYC3 network + %n kết nối đến NYC3 network Indexing blocks on disk... @@ -498,8 +498,8 @@ Đông ví - Show the %1 help message to get a list with possible Bitcoin command-line options - Hiển thị %1 tin nhắn hỗ trợ để nhận được danh sách Bitcoin command-line khả dụng + Show the %1 help message to get a list with possible NYC3 command-line options + Hiển thị %1 tin nhắn hỗ trợ để nhận được danh sách NYC3 command-line khả dụng default wallet @@ -580,8 +580,8 @@ Ví thì <b>encrypted</b> và hiện tại <b>locked</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - Một lỗi nghiêm trọng vừa xảy ra. Bitcoin có thể không còn tiếp tục an toàn và sẽ bị bỏ. + A fatal error occurred. NYC3 can no longer continue safely and will quit. + Một lỗi nghiêm trọng vừa xảy ra. NYC3 có thể không còn tiếp tục an toàn và sẽ bị bỏ. @@ -859,8 +859,8 @@ Sử dụng custom danh mục data: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -871,8 +871,8 @@ Gần đúng %1 GB of data sẽ được lưu giữ trong danh mục này. - %1 will download and store a copy of the Bitcoin block chain. - %1 sẽ download và lưu trữ một bản copy của Bitcoin block chain. + %1 will download and store a copy of the NYC3 block chain. + %1 sẽ download và lưu trữ một bản copy của NYC3 block chain. The wallet will also be stored in this directory. @@ -1052,16 +1052,16 @@ &Spend unconfirmed change - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. Map port using &UPnP Map port using &UPnP - Connect to the Bitcoin network through a SOCKS5 proxy. - Kết nối đến Bitcoin network qua một SOCKS5 proxy. + Connect to the NYC3 network through a SOCKS5 proxy. + Kết nối đến NYC3 network qua một SOCKS5 proxy. &Connect through SOCKS5 proxy (default proxy): @@ -1096,8 +1096,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - Kết nối đến Bitcoin network qua một nhánh rời SOCKS5 proxy của Tor hidden services. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + Kết nối đến NYC3 network qua một nhánh rời SOCKS5 proxy của Tor hidden services. &Window @@ -1199,8 +1199,8 @@ Form - 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. - Thông tin được hiển thị có thể đã lỗi thời. Cái wallet tự động đồng bộ với Bitcoin network sau một connection được thiết lập, nhưng quá trình này vẫn chưa completed yet. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + Thông tin được hiển thị có thể đã lỗi thời. Cái wallet tự động đồng bộ với NYC3 network sau một connection được thiết lập, nhưng quá trình này vẫn chưa completed yet. Watch-only: @@ -1804,8 +1804,8 @@ &Message: - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - Một optional lời nhắn để đính kèm đến payment request, cái mà sẽ được hiển thị khi mà request đang mở. Lưu ý: Tin nhắn này sẽ không được gửi với payment over the Bitcoin network. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + Một optional lời nhắn để đính kèm đến payment request, cái mà sẽ được hiển thị khi mà request đang mở. Lưu ý: Tin nhắn này sẽ không được gửi với payment over the NYC3 network. An optional label to associate with the new receiving address. @@ -2268,8 +2268,8 @@ Nhập một label cho cái address này để thêm vào danh sách địa chỉ đã sử dụng - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - Một tin nhắn được đính kèm với số bitcoin: URI mà sẽ được lưu giữ với transaction dành cho tài liệu tham khảo. Lưu ý: Tin nhắn này sẽ không được gửi thông qua Bitcoin network. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + Một tin nhắn được đính kèm với số bitcoin: URI mà sẽ được lưu giữ với transaction dành cho tài liệu tham khảo. Lưu ý: Tin nhắn này sẽ không được gửi thông qua NYC3 network. Pay To: diff --git a/src/qt/locale/nyc3_vi_VN.ts b/src/qt/locale/nyc3_vi_VN.ts index fe3e57001..feb10bd61 100644 --- a/src/qt/locale/nyc3_vi_VN.ts +++ b/src/qt/locale/nyc3_vi_VN.ts @@ -62,12 +62,12 @@ Địa chỉ nhận - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Đây là các địa chỉ Bitcoin để gửi bạn gửi tiền. Trước khi gửi bạn nên kiểm tra lại số tiền bạn muốn gửi và địa chỉ bitcoin của người nhận. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + Đây là các địa chỉ NYC3 để gửi bạn gửi tiền. Trước khi gửi bạn nên kiểm tra lại số tiền bạn muốn gửi và địa chỉ bitcoin của người nhận. - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Đây là các địa chỉ Bitcoin để bạn nhận tiền. Với mỗi giao dịch, bạn nên dùng một địa chỉ Bitcoin mới để nhận tiền. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + Đây là các địa chỉ NYC3 để bạn nhận tiền. Với mỗi giao dịch, bạn nên dùng một địa chỉ NYC3 mới để nhận tiền. &Copy Address @@ -225,7 +225,7 @@ Ví của bạn chưa được mã hóa. - BitcoinGUI + NYC3GUI Sign &message... Chứ ký & Tin nhắn... @@ -320,7 +320,7 @@ Ví của bạn chưa được mã hóa. Send coins to a NYC3 address - Gửi coins đến tài khoản Bitcoin + Gửi coins đến tài khoản NYC3 Backup wallet to another location @@ -343,8 +343,8 @@ Ví của bạn chưa được mã hóa. &Tin nhắn xác thực - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -367,12 +367,12 @@ Ví của bạn chưa được mã hóa. Mã hoá các khoá bí mật trong Ví của bạn. - Sign messages with your Bitcoin addresses to prove you own them - Dùng địa chỉ Bitcoin của bạn ký các tin nhắn để xác minh những nội dung tin nhắn đó là của bạn. + Sign messages with your NYC3 addresses to prove you own them + Dùng địa chỉ NYC3 của bạn ký các tin nhắn để xác minh những nội dung tin nhắn đó là của bạn. - Verify messages to ensure they were signed with specified Bitcoin addresses - Kiểm tra các tin nhắn để chắc chắn rằng chúng được ký bằng các địa chỉ Bitcoin xác định. + Verify messages to ensure they were signed with specified NYC3 addresses + Kiểm tra các tin nhắn để chắc chắn rằng chúng được ký bằng các địa chỉ NYC3 xác định. &File @@ -392,7 +392,7 @@ Ví của bạn chưa được mã hóa. Request payments (generates QR codes and bitcoin: URIs) - Yêu cầu thanh toán(tạo mã QR và địa chỉ Bitcoin: URLs) + Yêu cầu thanh toán(tạo mã QR và địa chỉ NYC3: URLs) Show the list of used sending addresses and labels @@ -411,8 +411,8 @@ Ví của bạn chưa được mã hóa. 7Tùy chọn dòng lệnh - %n active connection(s) to Bitcoin network - %n liên kết hoạt động với mạng lưới Bitcoin + %n active connection(s) to NYC3 network + %n liên kết hoạt động với mạng lưới NYC3 Indexing blocks on disk... @@ -455,8 +455,8 @@ Ví của bạn chưa được mã hóa. Đã cập nhật - Show the %1 help message to get a list with possible Bitcoin command-line options - Hiển thị tin nhắn trợ giúp %1 để có được danh sách với các tùy chọn dòng lệnh Bitcoin. + Show the %1 help message to get a list with possible NYC3 command-line options + Hiển thị tin nhắn trợ giúp %1 để có được danh sách với các tùy chọn dòng lệnh NYC3. Connecting to peers... @@ -620,8 +620,8 @@ Ví của bạn chưa được mã hóa. Sử dụng vị trí dữ liệu mặc định - Bitcoin - Bitcoin + NYC3 + NYC3 Error @@ -669,8 +669,8 @@ Ví của bạn chưa được mã hóa. Ví - Connect to the Bitcoin network through a SOCKS5 proxy. - Kết nối đến máy chủ Bitcoin thông qua SOCKS5 proxy. + Connect to the NYC3 network through a SOCKS5 proxy. + Kết nối đến máy chủ NYC3 thông qua SOCKS5 proxy. Proxy &IP: diff --git a/src/qt/locale/nyc3_zh.ts b/src/qt/locale/nyc3_zh.ts index 7a46fcd18..0787ccc18 100644 --- a/src/qt/locale/nyc3_zh.ts +++ b/src/qt/locale/nyc3_zh.ts @@ -42,11 +42,11 @@ 接收地址 - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. 这些是你的比特币支付地址。在发送之前，一定要核对金额和接收地址。 - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. 这些是您的比特币接收地址。建议每个交易使用一个新的接收地址。 @@ -200,7 +200,7 @@ - BitcoinGUI + NYC3GUI Sign &message... 签名 &消息... @@ -282,7 +282,7 @@ &验证消息... - Bitcoin + NYC3 比特币 @@ -306,11 +306,11 @@ 加密您的钱包私钥 - Sign messages with your Bitcoin addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them 用您的比特币地址签名信息，以证明拥有它们 - Verify messages to ensure they were signed with specified Bitcoin addresses + Verify messages to ensure they were signed with specified NYC3 addresses 验证消息，确保它们是用指定的比特币地址签名的 @@ -346,7 +346,7 @@ &命令行选项 - %n active connection(s) to Bitcoin network + %n active connection(s) to NYC3 network %n 活动的比特币网络连接 @@ -386,8 +386,8 @@ &接受地址 - Show the %1 help message to get a list with possible Bitcoin command-line options - 显示%1帮助消息以获得可能包含Bitcoin命令行选项的列表 + Show the %1 help message to get a list with possible NYC3 command-line options + 显示%1帮助消息以获得可能包含NYC3命令行选项的列表 &Window @@ -442,7 +442,7 @@ 钱包是<b>加密的</b>，目前<b>已锁定</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. + A fatal error occurred. NYC3 can no longer continue safely and will quit. 发生了致命错误。比特币无法继续安全运行，将退出。 @@ -529,7 +529,7 @@ Intro - Bitcoin + NYC3 比特币 @@ -765,7 +765,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p 输入此地址的标签，将其添加到使用的地址列表中 - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. 附在比特币上的消息:URI将与交易一起存储，供参考。注意：此信息不会通过比特币网络发送。 diff --git a/src/qt/locale/nyc3_zh_CN.ts b/src/qt/locale/nyc3_zh_CN.ts index 9b0b0bc74..6ea1cdfd3 100644 --- a/src/qt/locale/nyc3_zh_CN.ts +++ b/src/qt/locale/nyc3_zh_CN.ts @@ -66,11 +66,11 @@ 收款地址 - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. 您可以给这些比特币地址付款。在付款之前，务必要检查金额和收款地址是否正确。 - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. 您可以用这些比特币地址收款。建议在每次交易时，都使用一个新的收款地址。 @@ -240,7 +240,7 @@ - BitcoinGUI + NYC3GUI Sign &message... 消息签名(&M)... @@ -366,7 +366,7 @@ 验证消息(&V)... - Bitcoin + NYC3 比特币 @@ -390,11 +390,11 @@ 对钱包中的私钥加密 - Sign messages with your Bitcoin addresses to prove you own them + Sign messages with your NYC3 addresses to prove you own them 用比特币地址关联的私钥为消息签名，以证明您拥有这个比特币地址 - Verify messages to ensure they were signed with specified Bitcoin addresses + Verify messages to ensure they were signed with specified NYC3 addresses 校验消息，确保该消息是由指定的比特币地址所有者签名的 @@ -434,7 +434,7 @@ 命令行选项(&C) - %n active connection(s) to Bitcoin network + %n active connection(s) to NYC3 network %n 条到比特币网络的活动连接 @@ -502,7 +502,7 @@ 关闭钱包 - Show the %1 help message to get a list with possible Bitcoin command-line options + Show the %1 help message to get a list with possible NYC3 command-line options 显示 %1 帮助信息，获取可用命令行选项列表 @@ -613,7 +613,7 @@ 钱包已被<b>加密</b>，当前为<b>锁定</b>状态 - A fatal error occurred. Bitcoin can no longer continue safely and will quit. + A fatal error occurred. NYC3 can no longer continue safely and will quit. 发生严重错误。客户端无法安全地继续运行，即将退出。 @@ -896,7 +896,7 @@ 使用自定义的数据目录： - Bitcoin + NYC3 比特币 @@ -908,7 +908,7 @@ 会在此目录中存储约 %1 GB 的数据。 - %1 will download and store a copy of the Bitcoin block chain. + %1 will download and store a copy of the NYC3 block chain. %1 将会下载并存储比特币区块链。 @@ -1125,7 +1125,7 @@ 动用尚未确认的找零资金(&S) - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. 自动在路由器中打开比特币端口。只有当您的路由器开启了 UPnP 选项时此功能才有效。 @@ -1141,7 +1141,7 @@ 允许流入连接(&G) - Connect to the Bitcoin network through a SOCKS5 proxy. + Connect to the NYC3 network through a SOCKS5 proxy. 通过 SOCKS5 代理连接比特币网络。 @@ -1177,7 +1177,7 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. 在 Tor 匿名网络下通过不同的 SOCKS5 代理连接比特币网络 @@ -1288,7 +1288,7 @@ 表单 - 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. + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. 现在显示的消息可能是过期的。在连接上比特币网络节点后，您的钱包将自动与网络同步，但是这个过程还没有完成。 @@ -1942,7 +1942,7 @@ 消息(&M)： - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. 可在付款请求上备注一条信息，在打开付款请求时可以看到。注意：该消息不是通过比特币网络传送。 @@ -2462,7 +2462,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p 请为此地址输入一个标签以将它加入用过的地址列表 - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. bitcoin:URI 附带的备注信息，将会和交易一起存储，备查。 注意：该消息不会通过比特币网络传输。 diff --git a/src/qt/locale/nyc3_zh_HK.ts b/src/qt/locale/nyc3_zh_HK.ts index 162016aba..b5b9467ea 100644 --- a/src/qt/locale/nyc3_zh_HK.ts +++ b/src/qt/locale/nyc3_zh_HK.ts @@ -62,12 +62,12 @@ 收款地址 - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - 這些是你要付款過去的 Bitcoin 位址。在付款之前，務必要檢查金額和收款位址是否正確。 + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + 這些是你要付款過去的 NYC3 位址。在付款之前，務必要檢查金額和收款位址是否正確。 - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - 這些是你用來收款的 Bitcoin 位址。建議在每次交易時，都使用一個新的收款位址。 + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + 這些是你用來收款的 NYC3 位址。建議在每次交易時，都使用一個新的收款位址。 &Copy Address @@ -169,7 +169,7 @@ Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! - 警告: 如果你將錢包加密後又忘記密碼，你就會<b>失去所有 Bitcoin 了</b>！ + 警告: 如果你將錢包加密後又忘記密碼，你就會<b>失去所有 NYC3 了</b>！ Are you sure you wish to encrypt your wallet? @@ -228,7 +228,7 @@ - BitcoinGUI + NYC3GUI Sign &message... 簽署訊息... &m @@ -307,7 +307,7 @@ Send coins to a NYC3 address - 付款至一個 Bitcoin 位址 + 付款至一個 NYC3 位址 Backup wallet to another location @@ -330,8 +330,8 @@ 驗證訊息... &V - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -407,8 +407,8 @@ Intro - Bitcoin - Bitcoin + NYC3 + NYC3 Error @@ -449,7 +449,7 @@ QObject Enter a NYC3 address (e.g. %1) - 輸入一個 Bitcoin 位址 (例如 %1) + 輸入一個 NYC3 位址 (例如 %1) %1 d diff --git a/src/qt/locale/nyc3_zh_TW.ts b/src/qt/locale/nyc3_zh_TW.ts index 46985fd6a..e62776d42 100644 --- a/src/qt/locale/nyc3_zh_TW.ts +++ b/src/qt/locale/nyc3_zh_TW.ts @@ -66,12 +66,12 @@ 收款位址 - These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - 這些是你要付款過去的 Bitcoin 位址。在付錢之前，務必要檢查金額和收款位址是否正確。 + These are your NYC3 addresses for sending payments. Always check the amount and the receiving address before sending coins. + 這些是你要付款過去的 NYC3 位址。在付錢之前，務必要檢查金額和收款位址是否正確。 - These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - 這些是你用來收款的 Bitcoin 位址。建議在每次交易時，都使用一個新的收款位址。 + These are your NYC3 addresses for receiving payments. It is recommended to use a new receiving address for each transaction. + 這些是你用來收款的 NYC3 位址。建議在每次交易時，都使用一個新的收款位址。 &Copy Address @@ -177,7 +177,7 @@ Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! - 警告: 如果把錢包加密後又忘記密碼，你就會從此<b>失去其中所有的 Bitcoin 了</b>！ + 警告: 如果把錢包加密後又忘記密碼，你就會從此<b>失去其中所有的 NYC3 了</b>！ Are you sure you wish to encrypt your wallet? @@ -240,7 +240,7 @@ - BitcoinGUI + NYC3GUI Sign &message... 簽署訊息(&M)... @@ -343,7 +343,7 @@ Send coins to a NYC3 address - 付錢給一個 Bitcoin 位址 + 付錢給一個 NYC3 位址 Backup wallet to another location @@ -366,8 +366,8 @@ 驗證訊息(&V)... - Bitcoin - Bitcoin + NYC3 + NYC3 &Send @@ -390,12 +390,12 @@ 把錢包中的密鑰加密 - Sign messages with your Bitcoin addresses to prove you own them - 用 Bitcoin 位址簽署訊息來證明位址是你的 + Sign messages with your NYC3 addresses to prove you own them + 用 NYC3 位址簽署訊息來證明位址是你的 - Verify messages to ensure they were signed with specified Bitcoin addresses - 驗證訊息是用來確定訊息是用指定的 Bitcoin 位址簽署的 + Verify messages to ensure they were signed with specified NYC3 addresses + 驗證訊息是用來確定訊息是用指定的 NYC3 位址簽署的 &File @@ -434,8 +434,8 @@ 命令列選項(&C) - %n active connection(s) to Bitcoin network - %n 個運作中的 Bitcoin 網路連線 + %n active connection(s) to NYC3 network + %n 個運作中的 NYC3 網路連線 Indexing blocks on disk... @@ -502,7 +502,7 @@ 關上錢包 - Show the %1 help message to get a list with possible Bitcoin command-line options + Show the %1 help message to get a list with possible NYC3 command-line options 顯示 %1 的說明訊息，來取得可用命令列選項的列表 @@ -598,8 +598,8 @@ 錢包<b>已加密</b>並且<b>上鎖中</b> - A fatal error occurred. Bitcoin can no longer continue safely and will quit. - 發生了致命的錯誤。Bitcoin 軟體沒辦法再繼續安全執行，只好結束。 + A fatal error occurred. NYC3 can no longer continue safely and will quit. + 發生了致命的錯誤。NYC3 軟體沒辦法再繼續安全執行，只好結束。 @@ -789,7 +789,7 @@ The entered address "%1" is not a valid NYC3 address. - 輸入的位址 %1 並不是有效的 Bitcoin 位址。 + 輸入的位址 %1 並不是有效的 NYC3 位址。 Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address. @@ -885,8 +885,8 @@ 使用自訂的資料目錄: - Bitcoin - Bitcoin + NYC3 + NYC3 At least %1 GB of data will be stored in this directory, and it will grow over time. @@ -897,8 +897,8 @@ 在這個目錄中大約會存放 %1 GB 的資料。 - %1 will download and store a copy of the Bitcoin block chain. - %1 會下載 Bitcoin 區塊鏈並且儲存一份副本。 + %1 will download and store a copy of the NYC3 block chain. + %1 會下載 NYC3 區塊鏈並且儲存一份副本。 The wallet will also be stored in this directory. @@ -1031,7 +1031,7 @@ Use separate SOCKS&5 proxy to reach peers via Tor hidden services: - 透過另外的 SOCKS&5 代理伺服器來連線到 Bitcoin 網路中的 Tor 隱藏服務: + 透過另外的 SOCKS&5 代理伺服器來連線到 NYC3 網路中的 Tor 隱藏服務: Hide the icon from the system tray. @@ -1110,8 +1110,8 @@ 可以花還沒確認的零錢(&S) - Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled. - 自動在路由器上開放 Bitcoin 的客戶端通訊埠。只有在你的路由器支援且開啓「通用即插即用」協定(UPnP)時才有作用。 + Automatically open the NYC3 client port on the router. This only works when your router supports UPnP and it is enabled. + 自動在路由器上開放 NYC3 的客戶端通訊埠。只有在你的路由器支援且開啓「通用即插即用」協定(UPnP)時才有作用。 Map port using &UPnP @@ -1126,8 +1126,8 @@ 接受外來連線(&G) - Connect to the Bitcoin network through a SOCKS5 proxy. - 透過 SOCKS5 代理伺服器來連線到 Bitcoin 網路。 + Connect to the NYC3 network through a SOCKS5 proxy. + 透過 SOCKS5 代理伺服器來連線到 NYC3 網路。 &Connect through SOCKS5 proxy (default proxy): @@ -1162,8 +1162,8 @@ Tor - Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services. - 透過另外的 SOCKS5 代理伺服器來連線到 Bitcoin 網路中的 Tor 隱藏服務。 + Connect to the NYC3 network through a separate SOCKS5 proxy for Tor hidden services. + 透過另外的 SOCKS5 代理伺服器來連線到 NYC3 網路中的 Tor 隱藏服務。 &Window @@ -1269,8 +1269,8 @@ 表單 - 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. - 顯示的資訊可能是過期的。跟 Bitcoin 網路的連線建立後，你的錢包會自動和網路同步，但是這個步驟還沒完成。 + The displayed information may be out of date. Your wallet automatically synchronizes with the NYC3 network after a connection is established, but this process has not completed yet. + 顯示的資訊可能是過期的。跟 NYC3 網路的連線建立後，你的錢包會自動和網路同步，但是這個步驟還沒完成。 Watch-only: @@ -1365,7 +1365,7 @@ URI cannot be parsed! This can be caused by an invalid NYC3 address or malformed URI parameters. - 沒辦法解析 URI 位址！可能是因為 Bitcoin 位址無效，或是 URI 參數格式錯誤。 + 沒辦法解析 URI 位址！可能是因為 NYC3 位址無效，或是 URI 參數格式錯誤。 Payment request file handling @@ -1467,7 +1467,7 @@ Enter a NYC3 address (e.g. %1) - 輸入 Bitcoin 位址 (比如說 %1) + 輸入 NYC3 位址 (比如說 %1) %1 d @@ -1910,8 +1910,8 @@ 訊息(&M): - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network. - 附加在付款要求中的訊息，可以不填，打開要求內容時會顯示。注意: 這個訊息不會隨著付款送到 Bitcoin 網路上。 + An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the NYC3 network. + 附加在付款要求中的訊息，可以不填，打開要求內容時會顯示。注意: 這個訊息不會隨著付款送到 NYC3 網路上。 An optional label to associate with the new receiving address. @@ -2332,7 +2332,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p Warning: Invalid NYC3 address - 警告: Bitcoin 位址無效 + 警告: NYC3 位址無效 Warning: Unknown change address @@ -2375,7 +2375,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p The NYC3 address to send the payment to - 接收付款的 Bitcoin 位址 + 接收付款的 NYC3 位址 Alt+A @@ -2422,8 +2422,8 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p 請輸入這個位址的標記，來把它加進去已使用過位址的清單。 - A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network. - 附加在 Bitcoin 付款協議的資源識別碼(URI)中的訊息，會和交易內容一起存起來，給你自己做參考。注意: 這個訊息不會送到 Bitcoin 網路上。 + A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the NYC3 network. + 附加在 NYC3 付款協議的資源識別碼(URI)中的訊息，會和交易內容一起存起來，給你自己做參考。注意: 這個訊息不會送到 NYC3 網路上。 Pay To: @@ -2472,7 +2472,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p The NYC3 address to sign the message with - 用來簽署訊息的 Bitcoin 位址 + 用來簽署訊息的 NYC3 位址 Choose previously used address @@ -2504,7 +2504,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p Sign the message to prove you own this NYC3 address - 簽署這個訊息來證明這個 Bitcoin 位址是你的 + 簽署這個訊息來證明這個 NYC3 位址是你的 Sign &Message @@ -2528,11 +2528,11 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p The NYC3 address the message was signed with - 簽署這個訊息的 Bitcoin 位址 + 簽署這個訊息的 NYC3 位址 Verify the message to ensure it was signed with the specified NYC3 address - 驗證這個訊息來確定是用指定的 Bitcoin 位址簽署的 + 驗證這個訊息來確定是用指定的 NYC3 位址簽署的 Verify &Message diff --git a/src/qt/macdockiconhandler.h b/src/qt/macdockiconhandler.h index ff867e21a..45859966a 100644 --- a/src/qt/macdockiconhandler.h +++ b/src/qt/macdockiconhandler.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/macdockiconhandler.mm b/src/qt/macdockiconhandler.mm index 102adce6c..1e8ca3cfc 100644 --- a/src/qt/macdockiconhandler.mm +++ b/src/qt/macdockiconhandler.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/macnotificationhandler.h b/src/qt/macnotificationhandler.h index 03c744c12..a9c69fdfa 100644 --- a/src/qt/macnotificationhandler.h +++ b/src/qt/macnotificationhandler.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/macnotificationhandler.mm b/src/qt/macnotificationhandler.mm index a07079eec..ad5f912e1 100644 --- a/src/qt/macnotificationhandler.mm +++ b/src/qt/macnotificationhandler.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2013 The Bitcoin Core developers +// Copyright (c) 2011-2013 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -13,7 +13,7 @@ - (NSString *)__bundleIdentifier { if (self == [NSBundle mainBundle]) { - return @"org.bitcoinfoundation.Bitcoin-Qt"; + return @"org.bitcoinfoundation.NYC3-Qt"; } else { return [self __bundleIdentifier]; } diff --git a/src/qt/macos_appnap.h b/src/qt/macos_appnap.h index 8c2cd840b..ec9096b3b 100644 --- a/src/qt/macos_appnap.h +++ b/src/qt/macos_appnap.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/macos_appnap.mm b/src/qt/macos_appnap.mm index 22a88782a..bb856e512 100644 --- a/src/qt/macos_appnap.mm +++ b/src/qt/macos_appnap.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/main.cpp b/src/qt/main.cpp index f0fa1bc46..f421b5c10 100644 --- a/src/qt/main.cpp +++ b/src/qt/main.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp index 8ecc33da8..aa264d7df 100644 --- a/src/qt/modaloverlay.cpp +++ b/src/qt/modaloverlay.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/modaloverlay.h b/src/qt/modaloverlay.h index cf8b53f2b..ed5797b4d 100644 --- a/src/qt/modaloverlay.h +++ b/src/qt/modaloverlay.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/networkstyle.cpp b/src/qt/networkstyle.cpp index cff18b9e4..5447ff114 100644 --- a/src/qt/networkstyle.cpp +++ b/src/qt/networkstyle.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/networkstyle.h b/src/qt/networkstyle.h index b78a9f594..4eee9ee99 100644 --- a/src/qt/networkstyle.h +++ b/src/qt/networkstyle.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014 The Bitcoin Core developers +// Copyright (c) 2014 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp index 4b91c1976..5966129f3 100644 --- a/src/qt/notificator.cpp +++ b/src/qt/notificator.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/notificator.h b/src/qt/notificator.h index 7d80b43e4..37c904fb9 100644 --- a/src/qt/notificator.h +++ b/src/qt/notificator.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/nyc3.cpp b/src/qt/nyc3.cpp index ad76f8bba..b97c1a8ba 100644 --- a/src/qt/nyc3.cpp +++ b/src/qt/nyc3.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2019 The Bitcoin Core developers +// Copyright (c) 2011-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -133,18 +133,18 @@ void DebugMessageHandler(QtMsgType type, const QMessageLogContext& context, cons } } -BitcoinCore::BitcoinCore(interfaces::Node& node) : +NYC3Core::NYC3Core(interfaces::Node& node) : QObject(), m_node(node) { } -void BitcoinCore::handleRunawayException(const std::exception *e) +void NYC3Core::handleRunawayException(const std::exception *e) { PrintExceptionContinue(e, "Runaway exception"); Q_EMIT runawayException(QString::fromStdString(m_node.getWarnings("gui"))); } -void BitcoinCore::initialize() +void NYC3Core::initialize() { try { @@ -158,7 +158,7 @@ void BitcoinCore::initialize() } } -void BitcoinCore::shutdown() +void NYC3Core::shutdown() { try { @@ -173,7 +173,7 @@ void BitcoinCore::shutdown() } } -BitcoinApplication::BitcoinApplication(interfaces::Node& node, int &argc, char **argv): +NYC3Application::NYC3Application(interfaces::Node& node, int &argc, char **argv): QApplication(argc, argv), coreThread(nullptr), m_node(node), @@ -187,20 +187,20 @@ BitcoinApplication::BitcoinApplication(interfaces::Node& node, int &argc, char * setQuitOnLastWindowClosed(false); } -void BitcoinApplication::setupPlatformStyle() +void NYC3Application::setupPlatformStyle() { // UI per-platform customization - // This must be done inside the BitcoinApplication constructor, or after it, because + // This must be done inside the NYC3Application constructor, or after it, because // PlatformStyle::instantiate requires a QApplication std::string platformName; - platformName = gArgs.GetArg("-uiplatform", BitcoinGUI::DEFAULT_UIPLATFORM); + platformName = gArgs.GetArg("-uiplatform", NYC3GUI::DEFAULT_UIPLATFORM); platformStyle = PlatformStyle::instantiate(QString::fromStdString(platformName)); if (!platformStyle) // Fall back to "other" if specified name not found platformStyle = PlatformStyle::instantiate("other"); assert(platformStyle); } -BitcoinApplication::~BitcoinApplication() +NYC3Application::~NYC3Application() { if(coreThread) { @@ -225,61 +225,61 @@ BitcoinApplication::~BitcoinApplication() } #ifdef ENABLE_WALLET -void BitcoinApplication::createPaymentServer() +void NYC3Application::createPaymentServer() { paymentServer = new PaymentServer(this); } #endif -void BitcoinApplication::createOptionsModel(bool resetSettings) +void NYC3Application::createOptionsModel(bool resetSettings) { optionsModel = new OptionsModel(m_node, nullptr, resetSettings); } -void BitcoinApplication::createWindow(const NetworkStyle *networkStyle) +void NYC3Application::createWindow(const NetworkStyle *networkStyle) { - window = new BitcoinGUI(m_node, platformStyle, networkStyle, nullptr); + window = new NYC3GUI(m_node, platformStyle, networkStyle, nullptr); pollShutdownTimer = new QTimer(window); - connect(pollShutdownTimer, &QTimer::timeout, window, &BitcoinGUI::detectShutdown); + connect(pollShutdownTimer, &QTimer::timeout, window, &NYC3GUI::detectShutdown); } -void BitcoinApplication::createSplashScreen(const NetworkStyle *networkStyle) +void NYC3Application::createSplashScreen(const NetworkStyle *networkStyle) { SplashScreen *splash = new SplashScreen(m_node, nullptr, networkStyle); // We don't hold a direct pointer to the splash screen after creation, but the splash // screen will take care of deleting itself when finish() happens. splash->show(); - connect(this, &BitcoinApplication::splashFinished, splash, &SplashScreen::finish); - connect(this, &BitcoinApplication::requestedShutdown, splash, &QWidget::close); + connect(this, &NYC3Application::splashFinished, splash, &SplashScreen::finish); + connect(this, &NYC3Application::requestedShutdown, splash, &QWidget::close); } -bool BitcoinApplication::baseInitialize() +bool NYC3Application::baseInitialize() { return m_node.baseInitialize(); } -void BitcoinApplication::startThread() +void NYC3Application::startThread() { if(coreThread) return; coreThread = new QThread(this); - BitcoinCore *executor = new BitcoinCore(m_node); + NYC3Core *executor = new NYC3Core(m_node); executor->moveToThread(coreThread); /* communication to and from thread */ - connect(executor, &BitcoinCore::initializeResult, this, &BitcoinApplication::initializeResult); - connect(executor, &BitcoinCore::shutdownResult, this, &BitcoinApplication::shutdownResult); - connect(executor, &BitcoinCore::runawayException, this, &BitcoinApplication::handleRunawayException); - connect(this, &BitcoinApplication::requestedInitialize, executor, &BitcoinCore::initialize); - connect(this, &BitcoinApplication::requestedShutdown, executor, &BitcoinCore::shutdown); + connect(executor, &NYC3Core::initializeResult, this, &NYC3Application::initializeResult); + connect(executor, &NYC3Core::shutdownResult, this, &NYC3Application::shutdownResult); + connect(executor, &NYC3Core::runawayException, this, &NYC3Application::handleRunawayException); + connect(this, &NYC3Application::requestedInitialize, executor, &NYC3Core::initialize); + connect(this, &NYC3Application::requestedShutdown, executor, &NYC3Core::shutdown); /* make sure executor object is deleted in its own thread */ connect(coreThread, &QThread::finished, executor, &QObject::deleteLater); coreThread->start(); } -void BitcoinApplication::parameterSetup() +void NYC3Application::parameterSetup() { // Default printtoconsole to false for the GUI. GUI programs should not // print to the console unnecessarily. @@ -289,14 +289,14 @@ void BitcoinApplication::parameterSetup() m_node.initParameterInteraction(); } -void BitcoinApplication::requestInitialize() +void NYC3Application::requestInitialize() { qDebug() << __func__ << ": Requesting initialize"; startThread(); Q_EMIT requestedInitialize(); } -void BitcoinApplication::requestShutdown() +void NYC3Application::requestShutdown() { // Show a simple window indicating shutdown status // Do this first as some of the steps may take some time below, @@ -324,7 +324,7 @@ void BitcoinApplication::requestShutdown() Q_EMIT requestedShutdown(); } -void BitcoinApplication::initializeResult(bool success) +void NYC3Application::initializeResult(bool success) { qDebug() << __func__ << ": Initialization result: " << success; // Set exit result. @@ -367,8 +367,8 @@ void BitcoinApplication::initializeResult(bool success) // Now that initialization/startup is done, process any command-line // bitcoin: URIs or payment requests: if (paymentServer) { - connect(paymentServer, &PaymentServer::receivedPaymentRequest, window, &BitcoinGUI::handlePaymentRequest); - connect(window, &BitcoinGUI::receivedURI, paymentServer, &PaymentServer::handleURIOrFile); + connect(paymentServer, &PaymentServer::receivedPaymentRequest, window, &NYC3GUI::handlePaymentRequest); + connect(window, &NYC3GUI::receivedURI, paymentServer, &PaymentServer::handleURIOrFile); connect(paymentServer, &PaymentServer::message, [this](const QString& title, const QString& message, unsigned int style) { window->message(title, message, style); }); @@ -382,18 +382,18 @@ void BitcoinApplication::initializeResult(bool success) } } -void BitcoinApplication::shutdownResult() +void NYC3Application::shutdownResult() { quit(); // Exit second main loop invocation after shutdown finished } -void BitcoinApplication::handleRunawayException(const QString &message) +void NYC3Application::handleRunawayException(const QString &message) { - QMessageBox::critical(nullptr, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Bitcoin can no longer continue safely and will quit.") + QString("\n\n") + message); + QMessageBox::critical(nullptr, "Runaway exception", NYC3GUI::tr("A fatal error occurred. NYC3 can no longer continue safely and will quit.") + QString("\n\n") + message); ::exit(EXIT_FAILURE); } -WId BitcoinApplication::getMainWinId() const +WId NYC3Application::getMainWinId() const { if (!window) return 0; @@ -412,7 +412,7 @@ static void SetupUIArgs() gArgs.AddArg("-resetguisettings", "Reset all settings changed in the GUI", false, OptionsCategory::GUI); gArgs.AddArg("-rootcertificates=", "Set SSL root certificates for payment request (default: -system-)", false, OptionsCategory::GUI); gArgs.AddArg("-splash", strprintf("Show splash screen on startup (default: %u)", DEFAULT_SPLASHSCREEN), false, OptionsCategory::GUI); - gArgs.AddArg("-uiplatform", strprintf("Select platform to customize UI for (one of windows, macosx, other; default: %s)", BitcoinGUI::DEFAULT_UIPLATFORM), true, OptionsCategory::GUI); + gArgs.AddArg("-uiplatform", strprintf("Select platform to customize UI for (one of windows, macosx, other; default: %s)", NYC3GUI::DEFAULT_UIPLATFORM), true, OptionsCategory::GUI); } #ifndef BITCOIN_QT_TEST @@ -437,7 +437,7 @@ int GuiMain(int argc, char* argv[]) Q_INIT_RESOURCE(nyc3); Q_INIT_RESOURCE(nyc3_locale); - BitcoinApplication app(*node, argc, argv); + NYC3Application app(*node, argc, argv); // Generate high-dpi pixmaps QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); #if QT_VERSION >= 0x050600 diff --git a/src/qt/nyc3.h b/src/qt/nyc3.h index 9fc9fd75c..5e0731d81 100644 --- a/src/qt/nyc3.h +++ b/src/qt/nyc3.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2016 The Bitcoin Core developers +// Copyright (c) 2011-2016 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -13,7 +13,7 @@ #include #include -class BitcoinGUI; +class NYC3GUI; class ClientModel; class NetworkStyle; class OptionsModel; @@ -30,11 +30,11 @@ class Node; /** Class encapsulating NYC3 startup and shutdown. * Allows running startup and shutdown in a different thread from the UI thread. */ -class BitcoinCore: public QObject +class NYC3Core: public QObject { Q_OBJECT public: - explicit BitcoinCore(interfaces::Node& node); + explicit NYC3Core(interfaces::Node& node); public Q_SLOTS: void initialize(); @@ -52,13 +52,13 @@ private: interfaces::Node& m_node; }; -/** Main Bitcoin application object */ -class BitcoinApplication: public QApplication +/** Main NYC3 application object */ +class NYC3Application: public QApplication { Q_OBJECT public: - explicit BitcoinApplication(interfaces::Node& node, int &argc, char **argv); - ~BitcoinApplication(); + explicit NYC3Application(interfaces::Node& node, int &argc, char **argv); + ~NYC3Application(); #ifdef ENABLE_WALLET /// Create payment server @@ -83,7 +83,7 @@ public: /// Get process return value int getReturnValue() const { return returnValue; } - /// Get window identifier of QMainWindow (BitcoinGUI) + /// Get window identifier of QMainWindow (NYC3GUI) WId getMainWinId() const; /// Setup platform style @@ -99,14 +99,14 @@ Q_SIGNALS: void requestedInitialize(); void requestedShutdown(); void splashFinished(); - void windowShown(BitcoinGUI* window); + void windowShown(NYC3GUI* window); private: QThread *coreThread; interfaces::Node& m_node; OptionsModel *optionsModel; ClientModel *clientModel; - BitcoinGUI *window; + NYC3GUI *window; QTimer *pollShutdownTimer; #ifdef ENABLE_WALLET PaymentServer* paymentServer{nullptr}; diff --git a/src/qt/nyc3addressvalidator.cpp b/src/qt/nyc3addressvalidator.cpp index 3ae6414d6..b7fc83134 100644 --- a/src/qt/nyc3addressvalidator.cpp +++ b/src/qt/nyc3addressvalidator.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -15,12 +15,12 @@ - All lower-case letters except for 'l' */ -BitcoinAddressEntryValidator::BitcoinAddressEntryValidator(QObject *parent) : +NYC3AddressEntryValidator::NYC3AddressEntryValidator(QObject *parent) : QValidator(parent) { } -QValidator::State BitcoinAddressEntryValidator::validate(QString &input, int &pos) const +QValidator::State NYC3AddressEntryValidator::validate(QString &input, int &pos) const { Q_UNUSED(pos); @@ -80,12 +80,12 @@ QValidator::State BitcoinAddressEntryValidator::validate(QString &input, int &po return state; } -BitcoinAddressCheckValidator::BitcoinAddressCheckValidator(QObject *parent) : +NYC3AddressCheckValidator::NYC3AddressCheckValidator(QObject *parent) : QValidator(parent) { } -QValidator::State BitcoinAddressCheckValidator::validate(QString &input, int &pos) const +QValidator::State NYC3AddressCheckValidator::validate(QString &input, int &pos) const { Q_UNUSED(pos); // Validate the passed NYC3 address diff --git a/src/qt/nyc3addressvalidator.h b/src/qt/nyc3addressvalidator.h index 78f1b3c0d..1e27b51e2 100644 --- a/src/qt/nyc3addressvalidator.h +++ b/src/qt/nyc3addressvalidator.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2014 The Bitcoin Core developers +// Copyright (c) 2011-2014 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -10,24 +10,24 @@ /** Base58 entry widget validator, checks for valid characters and * removes some whitespace. */ -class BitcoinAddressEntryValidator : public QValidator +class NYC3AddressEntryValidator : public QValidator { Q_OBJECT public: - explicit BitcoinAddressEntryValidator(QObject *parent); + explicit NYC3AddressEntryValidator(QObject *parent); State validate(QString &input, int &pos) const; }; /** NYC3 address widget validator, checks for a valid bitcoin address. */ -class BitcoinAddressCheckValidator : public QValidator +class NYC3AddressCheckValidator : public QValidator { Q_OBJECT public: - explicit BitcoinAddressCheckValidator(QObject *parent); + explicit NYC3AddressCheckValidator(QObject *parent); State validate(QString &input, int &pos) const; }; diff --git a/src/qt/nyc3amountfield.cpp b/src/qt/nyc3amountfield.cpp index ef32d5216..f37532d47 100644 --- a/src/qt/nyc3amountfield.cpp +++ b/src/qt/nyc3amountfield.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -55,7 +55,7 @@ public: if (valid) { val = qBound(m_min_amount, val, m_max_amount); - input = BitcoinUnits::format(currentUnit, val, false, BitcoinUnits::separatorAlways); + input = NYC3Units::format(currentUnit, val, false, NYC3Units::separatorAlways); lineEdit()->setText(input); } } @@ -67,7 +67,7 @@ public: void setValue(const CAmount& value) { - lineEdit()->setText(BitcoinUnits::format(currentUnit, value, false, BitcoinUnits::separatorAlways)); + lineEdit()->setText(NYC3Units::format(currentUnit, value, false, NYC3Units::separatorAlways)); Q_EMIT valueChanged(); } @@ -121,7 +121,7 @@ public: const QFontMetrics fm(fontMetrics()); int h = lineEdit()->minimumSizeHint().height(); - int w = fm.width(BitcoinUnits::format(BitcoinUnits::NYC3, BitcoinUnits::maxMoney(), false, BitcoinUnits::separatorAlways)); + int w = fm.width(NYC3Units::format(NYC3Units::NYC3, NYC3Units::maxMoney(), false, NYC3Units::separatorAlways)); w += 2; // cursor blinking space QStyleOptionSpinBox opt; @@ -147,12 +147,12 @@ public: } private: - int currentUnit{BitcoinUnits::NYC3}; + int currentUnit{NYC3Units::NYC3}; CAmount singleStep{CAmount(100000)}; // satoshis mutable QSize cachedMinimumSizeHint; bool m_allow_empty{true}; CAmount m_min_amount{CAmount(0)}; - CAmount m_max_amount{BitcoinUnits::maxMoney()}; + CAmount m_max_amount{NYC3Units::maxMoney()}; /** * Parse a string into a number of base monetary units and @@ -162,10 +162,10 @@ private: CAmount parse(const QString &text, bool *valid_out=nullptr) const { CAmount val = 0; - bool valid = BitcoinUnits::parse(currentUnit, text, &val); + bool valid = NYC3Units::parse(currentUnit, text, &val); if(valid) { - if(val < 0 || val > BitcoinUnits::maxMoney()) + if(val < 0 || val > NYC3Units::maxMoney()) valid = false; } if(valid_out) @@ -226,7 +226,7 @@ nyc3amountfield::nyc3amountfield(QWidget *parent) : QHBoxLayout *layout = new QHBoxLayout(this); layout->addWidget(amount); unit = new QValueComboBox(this); - unit->setModel(new BitcoinUnits(this)); + unit->setModel(new NYC3Units(this)); layout->addWidget(unit); layout->addStretch(1); layout->setContentsMargins(0,0,0,0); @@ -325,7 +325,7 @@ void nyc3amountfield::unitChanged(int idx) unit->setToolTip(unit->itemData(idx, Qt::ToolTipRole).toString()); // Determine new unit ID - int newUnit = unit->itemData(idx, BitcoinUnits::UnitRole).toInt(); + int newUnit = unit->itemData(idx, NYC3Units::UnitRole).toInt(); amount->setDisplayUnit(newUnit); } diff --git a/src/qt/nyc3amountfield.h b/src/qt/nyc3amountfield.h index ef7cf879e..d00bc7902 100644 --- a/src/qt/nyc3amountfield.h +++ b/src/qt/nyc3amountfield.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/nyc3gui.cpp b/src/qt/nyc3gui.cpp index 7fa9afb53..4e1f463b5 100644 --- a/src/qt/nyc3gui.cpp +++ b/src/qt/nyc3gui.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2019 The Bitcoin Core developers +// Copyright (c) 2011-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -64,7 +64,7 @@ #include -const std::string BitcoinGUI::DEFAULT_UIPLATFORM = +const std::string NYC3GUI::DEFAULT_UIPLATFORM = #if defined(Q_OS_MAC) "macosx" #elif defined(Q_OS_WIN) @@ -74,7 +74,7 @@ const std::string BitcoinGUI::DEFAULT_UIPLATFORM = #endif ; -BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformStyle, const NetworkStyle *networkStyle, QWidget *parent) : +NYC3GUI::NYC3GUI(interfaces::Node& node, const PlatformStyle *_platformStyle, const NetworkStyle *networkStyle, QWidget *parent) : QMainWindow(parent), m_node(node), trayIconMenu{new QMenu()}, @@ -204,9 +204,9 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty modalOverlay = new ModalOverlay(this->centralWidget()); #ifdef ENABLE_WALLET if(enableWallet) { - connect(walletFrame, &WalletFrame::requestedSyncWarningInfo, this, &BitcoinGUI::showModalOverlay); - connect(labelBlocksIcon, &GUIUtil::ClickableLabel::clicked, this, &BitcoinGUI::showModalOverlay); - connect(progressBar, &GUIUtil::ClickableProgressBar::clicked, this, &BitcoinGUI::showModalOverlay); + connect(walletFrame, &WalletFrame::requestedSyncWarningInfo, this, &NYC3GUI::showModalOverlay); + connect(labelBlocksIcon, &GUIUtil::ClickableLabel::clicked, this, &NYC3GUI::showModalOverlay); + connect(progressBar, &GUIUtil::ClickableProgressBar::clicked, this, &NYC3GUI::showModalOverlay); } #endif @@ -215,7 +215,7 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty #endif } -BitcoinGUI::~BitcoinGUI() +NYC3GUI::~NYC3GUI() { // Unsubscribe from notifications from core unsubscribeFromCoreSignals(); @@ -233,7 +233,7 @@ BitcoinGUI::~BitcoinGUI() delete rpcConsole; } -void BitcoinGUI::createActions() +void NYC3GUI::createActions() { QActionGroup *tabGroup = new QActionGroup(this); @@ -277,17 +277,17 @@ void BitcoinGUI::createActions() // These showNormalIfMinimized are needed because Send Coins and Receive Coins // can be triggered from the tray menu, and need to show the GUI to be useful. connect(overviewAction, &QAction::triggered, [this]{ showNormalIfMinimized(); }); - connect(overviewAction, &QAction::triggered, this, &BitcoinGUI::gotoOverviewPage); + connect(overviewAction, &QAction::triggered, this, &NYC3GUI::gotoOverviewPage); connect(sendCoinsAction, &QAction::triggered, [this]{ showNormalIfMinimized(); }); connect(sendCoinsAction, &QAction::triggered, [this]{ gotoSendCoinsPage(); }); connect(sendCoinsMenuAction, &QAction::triggered, [this]{ showNormalIfMinimized(); }); connect(sendCoinsMenuAction, &QAction::triggered, [this]{ gotoSendCoinsPage(); }); connect(receiveCoinsAction, &QAction::triggered, [this]{ showNormalIfMinimized(); }); - connect(receiveCoinsAction, &QAction::triggered, this, &BitcoinGUI::gotoReceiveCoinsPage); + connect(receiveCoinsAction, &QAction::triggered, this, &NYC3GUI::gotoReceiveCoinsPage); connect(receiveCoinsMenuAction, &QAction::triggered, [this]{ showNormalIfMinimized(); }); - connect(receiveCoinsMenuAction, &QAction::triggered, this, &BitcoinGUI::gotoReceiveCoinsPage); + connect(receiveCoinsMenuAction, &QAction::triggered, this, &NYC3GUI::gotoReceiveCoinsPage); connect(historyAction, &QAction::triggered, [this]{ showNormalIfMinimized(); }); - connect(historyAction, &QAction::triggered, this, &BitcoinGUI::gotoHistoryPage); + connect(historyAction, &QAction::triggered, this, &NYC3GUI::gotoHistoryPage); #endif // ENABLE_WALLET quitAction = new QAction(platformStyle->TextColorIcon(":/icons/quit"), tr("E&xit"), this); @@ -346,12 +346,12 @@ void BitcoinGUI::createActions() showHelpMessageAction->setStatusTip(tr("Show the %1 help message to get a list with possible NYC3 command-line options").arg(tr(PACKAGE_NAME))); connect(quitAction, &QAction::triggered, qApp, QApplication::quit); - connect(aboutAction, &QAction::triggered, this, &BitcoinGUI::aboutClicked); + connect(aboutAction, &QAction::triggered, this, &NYC3GUI::aboutClicked); connect(aboutQtAction, &QAction::triggered, qApp, QApplication::aboutQt); - connect(optionsAction, &QAction::triggered, this, &BitcoinGUI::optionsClicked); - connect(toggleHideAction, &QAction::triggered, this, &BitcoinGUI::toggleHidden); - connect(showHelpMessageAction, &QAction::triggered, this, &BitcoinGUI::showHelpMessageClicked); - connect(openRPCConsoleAction, &QAction::triggered, this, &BitcoinGUI::showDebugWindow); + connect(optionsAction, &QAction::triggered, this, &NYC3GUI::optionsClicked); + connect(toggleHideAction, &QAction::triggered, this, &NYC3GUI::toggleHidden); + connect(showHelpMessageAction, &QAction::triggered, this, &NYC3GUI::showHelpMessageClicked); + connect(openRPCConsoleAction, &QAction::triggered, this, &NYC3GUI::showDebugWindow); // prevents an open debug window from becoming stuck/unusable on client shutdown connect(quitAction, &QAction::triggered, rpcConsole, &QWidget::hide); @@ -367,7 +367,7 @@ void BitcoinGUI::createActions() connect(verifyMessageAction, &QAction::triggered, [this]{ gotoVerifyMessageTab(); }); connect(usedSendingAddressesAction, &QAction::triggered, walletFrame, &WalletFrame::usedSendingAddresses); connect(usedReceivingAddressesAction, &QAction::triggered, walletFrame, &WalletFrame::usedReceivingAddresses); - connect(openAction, &QAction::triggered, this, &BitcoinGUI::openClicked); + connect(openAction, &QAction::triggered, this, &NYC3GUI::openClicked); connect(m_open_wallet_action->menu(), &QMenu::aboutToShow, [this] { m_open_wallet_action->menu()->clear(); for (std::string path : m_wallet_controller->getWalletsAvailableToOpen()) { @@ -393,7 +393,7 @@ void BitcoinGUI::createActions() connect(this, &QObject::destroyed, &box, &QDialog::accept); box.exec(); }); - connect(activity, &OpenWalletActivity::opened, this, &BitcoinGUI::setCurrentWallet); + connect(activity, &OpenWalletActivity::opened, this, &NYC3GUI::setCurrentWallet); connect(activity, &OpenWalletActivity::finished, activity, &QObject::deleteLater); connect(activity, &OpenWalletActivity::finished, dialog, &QObject::deleteLater); bool invoked = QMetaObject::invokeMethod(activity, "open"); @@ -407,11 +407,11 @@ void BitcoinGUI::createActions() } #endif // ENABLE_WALLET - connect(new QShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_C), this), &QShortcut::activated, this, &BitcoinGUI::showDebugWindowActivateConsole); - connect(new QShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_D), this), &QShortcut::activated, this, &BitcoinGUI::showDebugWindow); + connect(new QShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_C), this), &QShortcut::activated, this, &NYC3GUI::showDebugWindowActivateConsole); + connect(new QShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_D), this), &QShortcut::activated, this, &NYC3GUI::showDebugWindow); } -void BitcoinGUI::createMenuBar() +void NYC3GUI::createMenuBar() { #ifdef Q_OS_MAC // Create a decoupled menu bar on Mac which stays even if the window is closed @@ -509,7 +509,7 @@ void BitcoinGUI::createMenuBar() help->addAction(aboutQtAction); } -void BitcoinGUI::createToolBars() +void NYC3GUI::createToolBars() { if(walletFrame) { @@ -531,7 +531,7 @@ void BitcoinGUI::createToolBars() m_wallet_selector = new QComboBox(); m_wallet_selector->setSizeAdjustPolicy(QComboBox::AdjustToContents); - connect(m_wallet_selector, static_cast(&QComboBox::currentIndexChanged), this, &BitcoinGUI::setCurrentWalletBySelectorIndex); + connect(m_wallet_selector, static_cast(&QComboBox::currentIndexChanged), this, &NYC3GUI::setCurrentWalletBySelectorIndex); m_wallet_selector_label = new QLabel(); m_wallet_selector_label->setText(tr("Wallet:") + " "); @@ -546,7 +546,7 @@ void BitcoinGUI::createToolBars() } } -void BitcoinGUI::setClientModel(ClientModel *_clientModel) +void NYC3GUI::setClientModel(ClientModel *_clientModel) { this->clientModel = _clientModel; if(_clientModel) @@ -557,12 +557,12 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel) // Keep up to date with client updateNetworkState(); - connect(_clientModel, &ClientModel::numConnectionsChanged, this, &BitcoinGUI::setNumConnections); - connect(_clientModel, &ClientModel::networkActiveChanged, this, &BitcoinGUI::setNetworkActive); + connect(_clientModel, &ClientModel::numConnectionsChanged, this, &NYC3GUI::setNumConnections); + connect(_clientModel, &ClientModel::networkActiveChanged, this, &NYC3GUI::setNetworkActive); modalOverlay->setKnownBestHeight(_clientModel->getHeaderTipHeight(), QDateTime::fromTime_t(_clientModel->getHeaderTipTime())); setNumBlocks(m_node.getNumBlocks(), QDateTime::fromTime_t(m_node.getLastBlockTime()), m_node.getVerificationProgress(), false); - connect(_clientModel, &ClientModel::numBlocksChanged, this, &BitcoinGUI::setNumBlocks); + connect(_clientModel, &ClientModel::numBlocksChanged, this, &NYC3GUI::setNumBlocks); // Receive and report messages from client model connect(_clientModel, &ClientModel::message, [this](const QString &title, const QString &message, unsigned int style){ @@ -570,7 +570,7 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel) }); // Show progress dialog - connect(_clientModel, &ClientModel::showProgress, this, &BitcoinGUI::showProgress); + connect(_clientModel, &ClientModel::showProgress, this, &NYC3GUI::showProgress); rpcConsole->setClientModel(_clientModel); @@ -587,7 +587,7 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel) OptionsModel* optionsModel = _clientModel->getOptionsModel(); if (optionsModel && trayIcon) { // be aware of the tray icon disable state change reported by the OptionsModel object. - connect(optionsModel, &OptionsModel::hideTrayIconChanged, this, &BitcoinGUI::setTrayIconVisible); + connect(optionsModel, &OptionsModel::hideTrayIconChanged, this, &NYC3GUI::setTrayIconVisible); // initialize the disable state of the tray icon with the current value in the model. setTrayIconVisible(optionsModel->getHideTrayIcon()); @@ -613,22 +613,22 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel) } #ifdef ENABLE_WALLET -void BitcoinGUI::setWalletController(WalletController* wallet_controller) +void NYC3GUI::setWalletController(WalletController* wallet_controller) { assert(!m_wallet_controller); assert(wallet_controller); m_wallet_controller = wallet_controller; - connect(wallet_controller, &WalletController::walletAdded, this, &BitcoinGUI::addWallet); - connect(wallet_controller, &WalletController::walletRemoved, this, &BitcoinGUI::removeWallet); + connect(wallet_controller, &WalletController::walletAdded, this, &NYC3GUI::addWallet); + connect(wallet_controller, &WalletController::walletRemoved, this, &NYC3GUI::removeWallet); for (WalletModel* wallet_model : m_wallet_controller->getWallets()) { addWallet(wallet_model); } } -void BitcoinGUI::addWallet(WalletModel* walletModel) +void NYC3GUI::addWallet(WalletModel* walletModel) { if (!walletFrame) return; const QString display_name = walletModel->getDisplayName(); @@ -642,7 +642,7 @@ void BitcoinGUI::addWallet(WalletModel* walletModel) } } -void BitcoinGUI::removeWallet(WalletModel* walletModel) +void NYC3GUI::removeWallet(WalletModel* walletModel) { if (!walletFrame) return; int index = m_wallet_selector->findData(QVariant::fromValue(walletModel)); @@ -658,7 +658,7 @@ void BitcoinGUI::removeWallet(WalletModel* walletModel) updateWindowTitle(); } -void BitcoinGUI::setCurrentWallet(WalletModel* wallet_model) +void NYC3GUI::setCurrentWallet(WalletModel* wallet_model) { if (!walletFrame) return; walletFrame->setCurrentWallet(wallet_model); @@ -671,13 +671,13 @@ void BitcoinGUI::setCurrentWallet(WalletModel* wallet_model) updateWindowTitle(); } -void BitcoinGUI::setCurrentWalletBySelectorIndex(int index) +void NYC3GUI::setCurrentWalletBySelectorIndex(int index) { WalletModel* wallet_model = m_wallet_selector->itemData(index).value(); if (wallet_model) setCurrentWallet(wallet_model); } -void BitcoinGUI::removeAllWallets() +void NYC3GUI::removeAllWallets() { if(!walletFrame) return; @@ -686,7 +686,7 @@ void BitcoinGUI::removeAllWallets() } #endif // ENABLE_WALLET -void BitcoinGUI::setWalletActionsEnabled(bool enabled) +void NYC3GUI::setWalletActionsEnabled(bool enabled) { overviewAction->setEnabled(enabled); sendCoinsAction->setEnabled(enabled); @@ -705,7 +705,7 @@ void BitcoinGUI::setWalletActionsEnabled(bool enabled) m_close_wallet_action->setEnabled(enabled); } -void BitcoinGUI::createTrayIcon() +void NYC3GUI::createTrayIcon() { assert(QSystemTrayIcon::isSystemTrayAvailable()); @@ -718,7 +718,7 @@ void BitcoinGUI::createTrayIcon() #endif } -void BitcoinGUI::createTrayIconMenu() +void NYC3GUI::createTrayIconMenu() { #ifndef Q_OS_MAC // return if trayIcon is unset (only on non-macOSes) @@ -726,11 +726,11 @@ void BitcoinGUI::createTrayIconMenu() return; trayIcon->setContextMenu(trayIconMenu.get()); - connect(trayIcon, &QSystemTrayIcon::activated, this, &BitcoinGUI::trayIconActivated); + connect(trayIcon, &QSystemTrayIcon::activated, this, &NYC3GUI::trayIconActivated); #else // Note: On macOS, the Dock icon is used to provide the tray's functionality. MacDockIconHandler *dockIconHandler = MacDockIconHandler::instance(); - connect(dockIconHandler, &MacDockIconHandler::dockIconClicked, this, &BitcoinGUI::macosDockIconActivated); + connect(dockIconHandler, &MacDockIconHandler::dockIconClicked, this, &NYC3GUI::macosDockIconActivated); trayIconMenu->setAsDockMenu(); #endif @@ -757,7 +757,7 @@ void BitcoinGUI::createTrayIconMenu() } #ifndef Q_OS_MAC -void BitcoinGUI::trayIconActivated(QSystemTrayIcon::ActivationReason reason) +void NYC3GUI::trayIconActivated(QSystemTrayIcon::ActivationReason reason) { if(reason == QSystemTrayIcon::Trigger) { @@ -766,19 +766,19 @@ void BitcoinGUI::trayIconActivated(QSystemTrayIcon::ActivationReason reason) } } #else -void BitcoinGUI::macosDockIconActivated() +void NYC3GUI::macosDockIconActivated() { show(); activateWindow(); } #endif -void BitcoinGUI::optionsClicked() +void NYC3GUI::optionsClicked() { openOptionsDialogWithTab(OptionsDialog::TAB_MAIN); } -void BitcoinGUI::aboutClicked() +void NYC3GUI::aboutClicked() { if(!clientModel) return; @@ -787,25 +787,25 @@ void BitcoinGUI::aboutClicked() dlg.exec(); } -void BitcoinGUI::showDebugWindow() +void NYC3GUI::showDebugWindow() { GUIUtil::bringToFront(rpcConsole); Q_EMIT consoleShown(rpcConsole); } -void BitcoinGUI::showDebugWindowActivateConsole() +void NYC3GUI::showDebugWindowActivateConsole() { rpcConsole->setTabFocus(RPCConsole::TAB_CONSOLE); showDebugWindow(); } -void BitcoinGUI::showHelpMessageClicked() +void NYC3GUI::showHelpMessageClicked() { helpMessageDialog->show(); } #ifdef ENABLE_WALLET -void BitcoinGUI::openClicked() +void NYC3GUI::openClicked() { OpenURIDialog dlg(this); if(dlg.exec()) @@ -814,42 +814,42 @@ void BitcoinGUI::openClicked() } } -void BitcoinGUI::gotoOverviewPage() +void NYC3GUI::gotoOverviewPage() { overviewAction->setChecked(true); if (walletFrame) walletFrame->gotoOverviewPage(); } -void BitcoinGUI::gotoHistoryPage() +void NYC3GUI::gotoHistoryPage() { historyAction->setChecked(true); if (walletFrame) walletFrame->gotoHistoryPage(); } -void BitcoinGUI::gotoReceiveCoinsPage() +void NYC3GUI::gotoReceiveCoinsPage() { receiveCoinsAction->setChecked(true); if (walletFrame) walletFrame->gotoReceiveCoinsPage(); } -void BitcoinGUI::gotoSendCoinsPage(QString addr) +void NYC3GUI::gotoSendCoinsPage(QString addr) { sendCoinsAction->setChecked(true); if (walletFrame) walletFrame->gotoSendCoinsPage(addr); } -void BitcoinGUI::gotoSignMessageTab(QString addr) +void NYC3GUI::gotoSignMessageTab(QString addr) { if (walletFrame) walletFrame->gotoSignMessageTab(addr); } -void BitcoinGUI::gotoVerifyMessageTab(QString addr) +void NYC3GUI::gotoVerifyMessageTab(QString addr) { if (walletFrame) walletFrame->gotoVerifyMessageTab(addr); } #endif // ENABLE_WALLET -void BitcoinGUI::updateNetworkState() +void NYC3GUI::updateNetworkState() { int count = clientModel->getNumConnections(); QString icon; @@ -878,17 +878,17 @@ void BitcoinGUI::updateNetworkState() connectionsControl->setPixmap(platformStyle->SingleColorIcon(icon).pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE)); } -void BitcoinGUI::setNumConnections(int count) +void NYC3GUI::setNumConnections(int count) { updateNetworkState(); } -void BitcoinGUI::setNetworkActive(bool networkActive) +void NYC3GUI::setNetworkActive(bool networkActive) { updateNetworkState(); } -void BitcoinGUI::updateHeadersSyncProgressLabel() +void NYC3GUI::updateHeadersSyncProgressLabel() { int64_t headersTipTime = clientModel->getHeaderTipTime(); int headersTipHeight = clientModel->getHeaderTipHeight(); @@ -897,7 +897,7 @@ void BitcoinGUI::updateHeadersSyncProgressLabel() progressBarLabel->setText(tr("Syncing Headers (%1%)...").arg(QString::number(100.0 / (headersTipHeight+estHeadersLeft)*headersTipHeight, 'f', 1))); } -void BitcoinGUI::openOptionsDialogWithTab(OptionsDialog::Tab tab) +void NYC3GUI::openOptionsDialogWithTab(OptionsDialog::Tab tab) { if (!clientModel || !clientModel->getOptionsModel()) return; @@ -908,7 +908,7 @@ void BitcoinGUI::openOptionsDialogWithTab(OptionsDialog::Tab tab) dlg.exec(); } -void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool header) +void NYC3GUI::setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool header) { // Disabling macOS App Nap on initial sync, disk and reindex operations. #ifdef Q_OS_MAC @@ -1022,9 +1022,9 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer progressBar->setToolTip(tooltip); } -void BitcoinGUI::message(const QString &title, const QString &message, unsigned int style, bool *ret) +void NYC3GUI::message(const QString &title, const QString &message, unsigned int style, bool *ret) { - QString strTitle = tr("Bitcoin"); // default title + QString strTitle = tr("NYC3"); // default title // Default to information icon int nMBoxIcon = QMessageBox::Information; int nNotifyIcon = Notificator::Information; @@ -1082,7 +1082,7 @@ void BitcoinGUI::message(const QString &title, const QString &message, unsigned notificator->notify(static_cast(nNotifyIcon), strTitle, message); } -void BitcoinGUI::changeEvent(QEvent *e) +void NYC3GUI::changeEvent(QEvent *e) { QMainWindow::changeEvent(e); #ifndef Q_OS_MAC // Ignored on Mac @@ -1093,12 +1093,12 @@ void BitcoinGUI::changeEvent(QEvent *e) QWindowStateChangeEvent *wsevt = static_cast(e); if(!(wsevt->oldState() & Qt::WindowMinimized) && isMinimized()) { - QTimer::singleShot(0, this, &BitcoinGUI::hide); + QTimer::singleShot(0, this, &NYC3GUI::hide); e->ignore(); } else if((wsevt->oldState() & Qt::WindowMinimized) && !isMinimized()) { - QTimer::singleShot(0, this, &BitcoinGUI::show); + QTimer::singleShot(0, this, &NYC3GUI::show); e->ignore(); } } @@ -1106,7 +1106,7 @@ void BitcoinGUI::changeEvent(QEvent *e) #endif } -void BitcoinGUI::closeEvent(QCloseEvent *event) +void NYC3GUI::closeEvent(QCloseEvent *event) { #ifndef Q_OS_MAC // Ignored on Mac if(clientModel && clientModel->getOptionsModel()) @@ -1129,7 +1129,7 @@ void BitcoinGUI::closeEvent(QCloseEvent *event) #endif } -void BitcoinGUI::showEvent(QShowEvent *event) +void NYC3GUI::showEvent(QShowEvent *event) { // enable the debug window when the main window shows up openRPCConsoleAction->setEnabled(true); @@ -1138,11 +1138,11 @@ void BitcoinGUI::showEvent(QShowEvent *event) } #ifdef ENABLE_WALLET -void BitcoinGUI::incomingTransaction(const QString& date, int unit, const CAmount& amount, const QString& type, const QString& address, const QString& label, const QString& walletName) +void NYC3GUI::incomingTransaction(const QString& date, int unit, const CAmount& amount, const QString& type, const QString& address, const QString& label, const QString& walletName) { // On new transaction, make an info balloon QString msg = tr("Date: %1\n").arg(date) + - tr("Amount: %1\n").arg(BitcoinUnits::formatWithUnit(unit, amount, true)); + tr("Amount: %1\n").arg(NYC3Units::formatWithUnit(unit, amount, true)); if (m_node.getWallets().size() > 1 && !walletName.isEmpty()) { msg += tr("Wallet: %1\n").arg(walletName); } @@ -1156,14 +1156,14 @@ void BitcoinGUI::incomingTransaction(const QString& date, int unit, const CAmoun } #endif // ENABLE_WALLET -void BitcoinGUI::dragEnterEvent(QDragEnterEvent *event) +void NYC3GUI::dragEnterEvent(QDragEnterEvent *event) { // Accept only URIs if(event->mimeData()->hasUrls()) event->acceptProposedAction(); } -void BitcoinGUI::dropEvent(QDropEvent *event) +void NYC3GUI::dropEvent(QDropEvent *event) { if(event->mimeData()->hasUrls()) { @@ -1175,7 +1175,7 @@ void BitcoinGUI::dropEvent(QDropEvent *event) event->acceptProposedAction(); } -bool BitcoinGUI::eventFilter(QObject *object, QEvent *event) +bool NYC3GUI::eventFilter(QObject *object, QEvent *event) { // Catch status tip events if (event->type() == QEvent::StatusTip) @@ -1188,7 +1188,7 @@ bool BitcoinGUI::eventFilter(QObject *object, QEvent *event) } #ifdef ENABLE_WALLET -bool BitcoinGUI::handlePaymentRequest(const SendCoinsRecipient& recipient) +bool NYC3GUI::handlePaymentRequest(const SendCoinsRecipient& recipient) { // URI has to be valid if (walletFrame && walletFrame->handlePaymentRequest(recipient)) @@ -1200,7 +1200,7 @@ bool BitcoinGUI::handlePaymentRequest(const SendCoinsRecipient& recipient) return false; } -void BitcoinGUI::setHDStatus(bool privkeyDisabled, int hdEnabled) +void NYC3GUI::setHDStatus(bool privkeyDisabled, int hdEnabled) { labelWalletHDStatusIcon->setPixmap(platformStyle->SingleColorIcon(privkeyDisabled ? ":/icons/eye" : hdEnabled ? ":/icons/hd_enabled" : ":/icons/hd_disabled").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE)); labelWalletHDStatusIcon->setToolTip(privkeyDisabled ? tr("Private key disabled") : hdEnabled ? tr("HD key generation is enabled") : tr("HD key generation is disabled")); @@ -1209,7 +1209,7 @@ void BitcoinGUI::setHDStatus(bool privkeyDisabled, int hdEnabled) labelWalletHDStatusIcon->setEnabled(hdEnabled); } -void BitcoinGUI::setEncryptionStatus(int status) +void NYC3GUI::setEncryptionStatus(int status) { switch(status) { @@ -1238,7 +1238,7 @@ void BitcoinGUI::setEncryptionStatus(int status) } } -void BitcoinGUI::updateWalletStatus() +void NYC3GUI::updateWalletStatus() { if (!walletFrame) { return; @@ -1253,7 +1253,7 @@ void BitcoinGUI::updateWalletStatus() } #endif // ENABLE_WALLET -void BitcoinGUI::updateProxyIcon() +void NYC3GUI::updateProxyIcon() { std::string ip_port; bool proxy_enabled = clientModel->getProxyInfo(ip_port); @@ -1271,7 +1271,7 @@ void BitcoinGUI::updateProxyIcon() } } -void BitcoinGUI::updateWindowTitle() +void NYC3GUI::updateWindowTitle() { QString window_title = tr(PACKAGE_NAME); #ifdef ENABLE_WALLET @@ -1288,7 +1288,7 @@ void BitcoinGUI::updateWindowTitle() setWindowTitle(window_title); } -void BitcoinGUI::showNormalIfMinimized(bool fToggleHidden) +void NYC3GUI::showNormalIfMinimized(bool fToggleHidden) { if(!clientModel) return; @@ -1300,12 +1300,12 @@ void BitcoinGUI::showNormalIfMinimized(bool fToggleHidden) } } -void BitcoinGUI::toggleHidden() +void NYC3GUI::toggleHidden() { showNormalIfMinimized(true); } -void BitcoinGUI::detectShutdown() +void NYC3GUI::detectShutdown() { if (m_node.shutdownRequested()) { @@ -1315,7 +1315,7 @@ void BitcoinGUI::detectShutdown() } } -void BitcoinGUI::showProgress(const QString &title, int nProgress) +void NYC3GUI::showProgress(const QString &title, int nProgress) { if (nProgress == 0) { progressDialog = new QProgressDialog(title, QString(), 0, 100); @@ -1334,7 +1334,7 @@ void BitcoinGUI::showProgress(const QString &title, int nProgress) } } -void BitcoinGUI::setTrayIconVisible(bool fHideTrayIcon) +void NYC3GUI::setTrayIconVisible(bool fHideTrayIcon) { if (trayIcon) { @@ -1342,13 +1342,13 @@ void BitcoinGUI::setTrayIconVisible(bool fHideTrayIcon) } } -void BitcoinGUI::showModalOverlay() +void NYC3GUI::showModalOverlay() { if (modalOverlay && (progressBar->isVisible() || modalOverlay->isLayerVisible())) modalOverlay->toggleVisibility(); } -static bool ThreadSafeMessageBox(BitcoinGUI* gui, const std::string& message, const std::string& caption, unsigned int style) +static bool ThreadSafeMessageBox(NYC3GUI* gui, const std::string& message, const std::string& caption, unsigned int style) { bool modal = (style & CClientUIInterface::MODAL); // The SECURE flag has no effect in the Qt GUI. @@ -1365,14 +1365,14 @@ static bool ThreadSafeMessageBox(BitcoinGUI* gui, const std::string& message, co return ret; } -void BitcoinGUI::subscribeToCoreSignals() +void NYC3GUI::subscribeToCoreSignals() { // Connect signals to client m_handler_message_box = m_node.handleMessageBox(std::bind(ThreadSafeMessageBox, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)); m_handler_question = m_node.handleQuestion(std::bind(ThreadSafeMessageBox, this, std::placeholders::_1, std::placeholders::_3, std::placeholders::_4)); } -void BitcoinGUI::unsubscribeFromCoreSignals() +void NYC3GUI::unsubscribeFromCoreSignals() { // Disconnect signals from client m_handler_message_box->disconnect(); @@ -1385,12 +1385,12 @@ UnitDisplayStatusBarControl::UnitDisplayStatusBarControl(const PlatformStyle *pl { createContextMenu(); setToolTip(tr("Unit to show amounts in. Click to select another unit.")); - QList units = BitcoinUnits::availableUnits(); + QList units = NYC3Units::availableUnits(); int max_width = 0; const QFontMetrics fm(font()); - for (const BitcoinUnits::Unit unit : units) + for (const NYC3Units::Unit unit : units) { - max_width = qMax(max_width, fm.width(BitcoinUnits::longName(unit))); + max_width = qMax(max_width, fm.width(NYC3Units::longName(unit))); } setMinimumSize(max_width, 0); setAlignment(Qt::AlignRight | Qt::AlignVCenter); @@ -1407,9 +1407,9 @@ void UnitDisplayStatusBarControl::mousePressEvent(QMouseEvent *event) void UnitDisplayStatusBarControl::createContextMenu() { menu = new QMenu(this); - for (const BitcoinUnits::Unit u : BitcoinUnits::availableUnits()) + for (const NYC3Units::Unit u : NYC3Units::availableUnits()) { - QAction *menuAction = new QAction(QString(BitcoinUnits::longName(u)), this); + QAction *menuAction = new QAction(QString(NYC3Units::longName(u)), this); menuAction->setData(QVariant(u)); menu->addAction(menuAction); } @@ -1434,7 +1434,7 @@ void UnitDisplayStatusBarControl::setOptionsModel(OptionsModel *_optionsModel) /** When Display Units are changed on OptionsModel it will refresh the display text of the control on the status bar */ void UnitDisplayStatusBarControl::updateDisplayUnit(int newUnits) { - setText(BitcoinUnits::longName(newUnits)); + setText(NYC3Units::longName(newUnits)); } /** Shows context menu with Display Unit options by the mouse coordinates */ diff --git a/src/qt/nyc3gui.h b/src/qt/nyc3gui.h index b58ccbb45..76ea83b50 100644 --- a/src/qt/nyc3gui.h +++ b/src/qt/nyc3gui.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2019 The Bitcoin Core developers +// Copyright (c) 2011-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -58,18 +58,18 @@ class ClickableProgressBar; } /** - Bitcoin GUI main class. This class represents the main window of the Bitcoin UI. It communicates with both the client and + NYC3 GUI main class. This class represents the main window of the NYC3 UI. It communicates with both the client and wallet models to give the user an up-to-date view of the current core state. */ -class BitcoinGUI : public QMainWindow +class NYC3GUI : public QMainWindow { Q_OBJECT public: static const std::string DEFAULT_UIPLATFORM; - explicit BitcoinGUI(interfaces::Node& node, const PlatformStyle *platformStyle, const NetworkStyle *networkStyle, QWidget *parent = nullptr); - ~BitcoinGUI(); + explicit NYC3GUI(interfaces::Node& node, const PlatformStyle *platformStyle, const NetworkStyle *networkStyle, QWidget *parent = nullptr); + ~NYC3GUI(); /** Set the client model. The client model represents the part of the core that communicates with the P2P network, and is wallet-agnostic. diff --git a/src/qt/nyc3units.cpp b/src/qt/nyc3units.cpp index 0047ecbf7..4a1429d44 100644 --- a/src/qt/nyc3units.cpp +++ b/src/qt/nyc3units.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -8,15 +8,15 @@ #include -BitcoinUnits::BitcoinUnits(QObject *parent): +NYC3Units::NYC3Units(QObject *parent): QAbstractListModel(parent), unitlist(availableUnits()) { } -QList BitcoinUnits::availableUnits() +QList NYC3Units::availableUnits() { - QList unitlist; + QList unitlist; unitlist.append(NYC3); unitlist.append(mNYC3); unitlist.append(uNYC3); @@ -24,7 +24,7 @@ QList BitcoinUnits::availableUnits() return unitlist; } -bool BitcoinUnits::valid(int unit) +bool NYC3Units::valid(int unit) { switch(unit) { @@ -38,7 +38,7 @@ bool BitcoinUnits::valid(int unit) } } -QString BitcoinUnits::longName(int unit) +QString NYC3Units::longName(int unit) { switch(unit) { @@ -50,7 +50,7 @@ QString BitcoinUnits::longName(int unit) } } -QString BitcoinUnits::shortName(int unit) +QString NYC3Units::shortName(int unit) { switch(unit) { @@ -60,7 +60,7 @@ QString BitcoinUnits::shortName(int unit) } } -QString BitcoinUnits::description(int unit) +QString NYC3Units::description(int unit) { switch(unit) { @@ -72,7 +72,7 @@ QString BitcoinUnits::description(int unit) } } -qint64 BitcoinUnits::factor(int unit) +qint64 NYC3Units::factor(int unit) { switch(unit) { @@ -84,7 +84,7 @@ qint64 BitcoinUnits::factor(int unit) } } -int BitcoinUnits::decimals(int unit) +int NYC3Units::decimals(int unit) { switch(unit) { @@ -96,7 +96,7 @@ int BitcoinUnits::decimals(int unit) } } -QString BitcoinUnits::format(int unit, const CAmount& nIn, bool fPlus, SeparatorStyle separators) +QString NYC3Units::format(int unit, const CAmount& nIn, bool fPlus, SeparatorStyle separators) { // Note: not using straight sprintf here because we do NOT want // localized number formatting. @@ -140,12 +140,12 @@ QString BitcoinUnits::format(int unit, const CAmount& nIn, bool fPlus, Separator // Please take care to use formatHtmlWithUnit instead, when // appropriate. -QString BitcoinUnits::formatWithUnit(int unit, const CAmount& amount, bool plussign, SeparatorStyle separators) +QString NYC3Units::formatWithUnit(int unit, const CAmount& amount, bool plussign, SeparatorStyle separators) { return format(unit, amount, plussign, separators) + QString(" ") + shortName(unit); } -QString BitcoinUnits::formatHtmlWithUnit(int unit, const CAmount& amount, bool plussign, SeparatorStyle separators) +QString NYC3Units::formatHtmlWithUnit(int unit, const CAmount& amount, bool plussign, SeparatorStyle separators) { QString str(formatWithUnit(unit, amount, plussign, separators)); str.replace(QChar(THIN_SP_CP), QString(THIN_SP_HTML)); @@ -153,7 +153,7 @@ QString BitcoinUnits::formatHtmlWithUnit(int unit, const CAmount& amount, bool p } -bool BitcoinUnits::parse(int unit, const QString &value, CAmount *val_out) +bool NYC3Units::parse(int unit, const QString &value, CAmount *val_out) { if(!valid(unit) || value.isEmpty()) return false; // Refuse to parse invalid unit or empty string @@ -192,23 +192,23 @@ bool BitcoinUnits::parse(int unit, const QString &value, CAmount *val_out) return ok; } -QString BitcoinUnits::getAmountColumnTitle(int unit) +QString NYC3Units::getAmountColumnTitle(int unit) { QString amountTitle = QObject::tr("Amount"); - if (BitcoinUnits::valid(unit)) + if (NYC3Units::valid(unit)) { - amountTitle += " ("+BitcoinUnits::shortName(unit) + ")"; + amountTitle += " ("+NYC3Units::shortName(unit) + ")"; } return amountTitle; } -int BitcoinUnits::rowCount(const QModelIndex &parent) const +int NYC3Units::rowCount(const QModelIndex &parent) const { Q_UNUSED(parent); return unitlist.size(); } -QVariant BitcoinUnits::data(const QModelIndex &index, int role) const +QVariant NYC3Units::data(const QModelIndex &index, int role) const { int row = index.row(); if(row >= 0 && row < unitlist.size()) @@ -228,7 +228,7 @@ QVariant BitcoinUnits::data(const QModelIndex &index, int role) const return QVariant(); } -CAmount BitcoinUnits::maxMoney() +CAmount NYC3Units::maxMoney() { return MAX_MONEY; } diff --git a/src/qt/nyc3units.h b/src/qt/nyc3units.h index e806526b0..810a05c64 100644 --- a/src/qt/nyc3units.h +++ b/src/qt/nyc3units.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -41,17 +41,17 @@ #define THIN_SP_UTF8 REAL_THIN_SP_UTF8 #define THIN_SP_HTML HTML_HACK_SP -/** Bitcoin unit definitions. Encapsulates parsing and formatting +/** NYC3 unit definitions. Encapsulates parsing and formatting and serves as list model for drop-down selection boxes. */ -class BitcoinUnits: public QAbstractListModel +class NYC3Units: public QAbstractListModel { Q_OBJECT public: - explicit BitcoinUnits(QObject *parent); + explicit NYC3Units(QObject *parent); - /** Bitcoin units. + /** NYC3 units. @note Source: https://en.bitcoin.it/wiki/Units . Please add only sensible ones */ enum Unit @@ -124,8 +124,8 @@ public: static CAmount maxMoney(); private: - QList unitlist; + QList unitlist; }; -typedef BitcoinUnits::Unit BitcoinUnit; +typedef NYC3Units::Unit NYC3Unit; #endif // BITCOIN_QT_BITCOINUNITS_H diff --git a/src/qt/openuridialog.cpp b/src/qt/openuridialog.cpp index 48db95679..4c7f6a2ba 100644 --- a/src/qt/openuridialog.cpp +++ b/src/qt/openuridialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -31,7 +31,7 @@ QString OpenURIDialog::getURI() void OpenURIDialog::accept() { SendCoinsRecipient rcp; - if(GUIUtil::parseBitcoinURI(getURI(), &rcp)) + if(GUIUtil::parseNYC3URI(getURI(), &rcp)) { /* Only accept value URIs */ QDialog::accept(); diff --git a/src/qt/openuridialog.h b/src/qt/openuridialog.h index e94593d5b..598439f21 100644 --- a/src/qt/openuridialog.h +++ b/src/qt/openuridialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2015 The Bitcoin Core developers +// Copyright (c) 2011-2015 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 2d140abf2..544f258d1 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -90,7 +90,7 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) : ui->bitcoinAtStartup->setToolTip(ui->bitcoinAtStartup->toolTip().arg(tr(PACKAGE_NAME))); ui->bitcoinAtStartup->setText(ui->bitcoinAtStartup->text().arg(tr(PACKAGE_NAME))); - ui->openBitcoinConfButton->setToolTip(ui->openBitcoinConfButton->toolTip().arg(tr(PACKAGE_NAME))); + ui->openNYC3ConfButton->setToolTip(ui->openNYC3ConfButton->toolTip().arg(tr(PACKAGE_NAME))); ui->lang->setToolTip(ui->lang->toolTip().arg(tr(PACKAGE_NAME))); ui->lang->addItem(QString("(") + tr("default") + QString(")"), QVariant("")); @@ -112,7 +112,7 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) : } ui->thirdPartyTxUrls->setPlaceholderText("https://example.com/tx/%s"); - ui->unit->setModel(new BitcoinUnits(this)); + ui->unit->setModel(new NYC3Units(this)); /* Widget-to-option mapper */ mapper = new QDataWidgetMapper(this); @@ -262,7 +262,7 @@ void OptionsDialog::on_resetButton_clicked() } } -void OptionsDialog::on_openBitcoinConfButton_clicked() +void OptionsDialog::on_openNYC3ConfButton_clicked() { /* explain the purpose of the config file */ QMessageBox::information(this, tr("Configuration options"), @@ -270,7 +270,7 @@ void OptionsDialog::on_openBitcoinConfButton_clicked() "Additionally, any command-line options will override this configuration file.")); /* show an error if there was some problem opening the file */ - if (!GUIUtil::openBitcoinConf()) + if (!GUIUtil::openNYC3Conf()) QMessageBox::critical(this, tr("Error"), tr("The configuration file could not be opened.")); } diff --git a/src/qt/optionsdialog.h b/src/qt/optionsdialog.h index 9bc1c8ae4..c7665719a 100644 --- a/src/qt/optionsdialog.h +++ b/src/qt/optionsdialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -53,7 +53,7 @@ private Q_SLOTS: /* set OK button state (enabled / disabled) */ void setOkButtonState(bool fState); void on_resetButton_clicked(); - void on_openBitcoinConfButton_clicked(); + void on_openNYC3ConfButton_clicked(); void on_okButton_clicked(); void on_cancelButton_clicked(); diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index fc1a748d9..a4ec6264e 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -69,7 +69,7 @@ void OptionsModel::Init(bool resetSettings) // Display if (!settings.contains("nDisplayUnit")) - settings.setValue("nDisplayUnit", BitcoinUnits::NYC3); + settings.setValue("nDisplayUnit", NYC3Units::NYC3); nDisplayUnit = settings.value("nDisplayUnit").toInt(); if (!settings.contains("strThirdPartyTxUrls")) diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h index 1af3a72b9..4297cbb7a 100644 --- a/src/qt/optionsmodel.h +++ b/src/qt/optionsmodel.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -20,7 +20,7 @@ QT_END_NAMESPACE extern const char *DEFAULT_GUI_PROXY_HOST; static constexpr unsigned short DEFAULT_GUI_PROXY_PORT = 9050; -/** Interface from Qt to configuration data structure for Bitcoin client. +/** Interface from Qt to configuration data structure for NYC3 client. To Qt, the options are presented as a list with the different options laid out vertically. This can be changed to a tree once the settings become sufficiently @@ -45,7 +45,7 @@ public: ProxyUseTor, // bool ProxyIPTor, // QString ProxyPortTor, // int - DisplayUnit, // BitcoinUnits::Unit + DisplayUnit, // NYC3Units::Unit ThirdPartyTxUrls, // QString Language, // QString CoinControlFeatures, // bool diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index ca7726240..9d588d678 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -28,7 +28,7 @@ class TxViewDelegate : public QAbstractItemDelegate Q_OBJECT public: explicit TxViewDelegate(const PlatformStyle *_platformStyle, QObject *parent=nullptr): - QAbstractItemDelegate(parent), unit(BitcoinUnits::NYC3), + QAbstractItemDelegate(parent), unit(NYC3Units::NYC3), platformStyle(_platformStyle) { @@ -86,7 +86,7 @@ public: foreground = option.palette.color(QPalette::Text); } painter->setPen(foreground); - QString amountText = BitcoinUnits::formatWithUnit(unit, amount, true, BitcoinUnits::separatorAlways); + QString amountText = NYC3Units::formatWithUnit(unit, amount, true, NYC3Units::separatorAlways); if(!confirmed) { amountText = QString("[") + amountText + QString("]"); @@ -162,19 +162,19 @@ void OverviewPage::setBalance(const interfaces::WalletBalances& balances) int unit = walletModel->getOptionsModel()->getDisplayUnit(); m_balances = balances; if (walletModel->privateKeysDisabled()) { - ui->labelBalance->setText(BitcoinUnits::formatWithUnit(unit, balances.watch_only_balance, false, BitcoinUnits::separatorAlways)); - ui->labelUnconfirmed->setText(BitcoinUnits::formatWithUnit(unit, balances.unconfirmed_watch_only_balance, false, BitcoinUnits::separatorAlways)); - ui->labelImmature->setText(BitcoinUnits::formatWithUnit(unit, balances.immature_watch_only_balance, false, BitcoinUnits::separatorAlways)); - ui->labelTotal->setText(BitcoinUnits::formatWithUnit(unit, balances.watch_only_balance + balances.unconfirmed_watch_only_balance + balances.immature_watch_only_balance, false, BitcoinUnits::separatorAlways)); + ui->labelBalance->setText(NYC3Units::formatWithUnit(unit, balances.watch_only_balance, false, NYC3Units::separatorAlways)); + ui->labelUnconfirmed->setText(NYC3Units::formatWithUnit(unit, balances.unconfirmed_watch_only_balance, false, NYC3Units::separatorAlways)); + ui->labelImmature->setText(NYC3Units::formatWithUnit(unit, balances.immature_watch_only_balance, false, NYC3Units::separatorAlways)); + ui->labelTotal->setText(NYC3Units::formatWithUnit(unit, balances.watch_only_balance + balances.unconfirmed_watch_only_balance + balances.immature_watch_only_balance, false, NYC3Units::separatorAlways)); } else { - ui->labelBalance->setText(BitcoinUnits::formatWithUnit(unit, balances.balance, false, BitcoinUnits::separatorAlways)); - ui->labelUnconfirmed->setText(BitcoinUnits::formatWithUnit(unit, balances.unconfirmed_balance, false, BitcoinUnits::separatorAlways)); - ui->labelImmature->setText(BitcoinUnits::formatWithUnit(unit, balances.immature_balance, false, BitcoinUnits::separatorAlways)); - ui->labelTotal->setText(BitcoinUnits::formatWithUnit(unit, balances.balance + balances.unconfirmed_balance + balances.immature_balance, false, BitcoinUnits::separatorAlways)); - ui->labelWatchAvailable->setText(BitcoinUnits::formatWithUnit(unit, balances.watch_only_balance, false, BitcoinUnits::separatorAlways)); - ui->labelWatchPending->setText(BitcoinUnits::formatWithUnit(unit, balances.unconfirmed_watch_only_balance, false, BitcoinUnits::separatorAlways)); - ui->labelWatchImmature->setText(BitcoinUnits::formatWithUnit(unit, balances.immature_watch_only_balance, false, BitcoinUnits::separatorAlways)); - ui->labelWatchTotal->setText(BitcoinUnits::formatWithUnit(unit, balances.watch_only_balance + balances.unconfirmed_watch_only_balance + balances.immature_watch_only_balance, false, BitcoinUnits::separatorAlways)); + ui->labelBalance->setText(NYC3Units::formatWithUnit(unit, balances.balance, false, NYC3Units::separatorAlways)); + ui->labelUnconfirmed->setText(NYC3Units::formatWithUnit(unit, balances.unconfirmed_balance, false, NYC3Units::separatorAlways)); + ui->labelImmature->setText(NYC3Units::formatWithUnit(unit, balances.immature_balance, false, NYC3Units::separatorAlways)); + ui->labelTotal->setText(NYC3Units::formatWithUnit(unit, balances.balance + balances.unconfirmed_balance + balances.immature_balance, false, NYC3Units::separatorAlways)); + ui->labelWatchAvailable->setText(NYC3Units::formatWithUnit(unit, balances.watch_only_balance, false, NYC3Units::separatorAlways)); + ui->labelWatchPending->setText(NYC3Units::formatWithUnit(unit, balances.unconfirmed_watch_only_balance, false, NYC3Units::separatorAlways)); + ui->labelWatchImmature->setText(NYC3Units::formatWithUnit(unit, balances.immature_watch_only_balance, false, NYC3Units::separatorAlways)); + ui->labelWatchTotal->setText(NYC3Units::formatWithUnit(unit, balances.watch_only_balance + balances.unconfirmed_watch_only_balance + balances.immature_watch_only_balance, false, NYC3Units::separatorAlways)); } // only show immature (newly mined) balance if it's non-zero, so as not to complicate things // for the non-mining users diff --git a/src/qt/overviewpage.h b/src/qt/overviewpage.h index 00ba7ad4c..b719da997 100644 --- a/src/qt/overviewpage.h +++ b/src/qt/overviewpage.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/paymentrequest.proto b/src/qt/paymentrequest.proto index d2721a34b..47875c995 100644 --- a/src/qt/paymentrequest.proto +++ b/src/qt/paymentrequest.proto @@ -1,5 +1,5 @@ // -// Simple Bitcoin Payment Protocol messages +// Simple NYC3 Payment Protocol messages // // Use fields 100+ for extensions; // to avoid conflicts, register extensions at: diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp index b962ab1ef..0e4dc4ed5 100644 --- a/src/qt/paymentrequestplus.cpp +++ b/src/qt/paymentrequestplus.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/paymentrequestplus.h b/src/qt/paymentrequestplus.h index 301462880..dc5fcdeba 100644 --- a/src/qt/paymentrequestplus.h +++ b/src/qt/paymentrequestplus.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 76447a072..14a28286a 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -66,7 +66,7 @@ const char* BIP71_MIMETYPE_PAYMENTREQUEST = "application/bitcoin-paymentrequest" // static QString ipcServerName() { - QString name("BitcoinQt"); + QString name("NYC3Qt"); // Append a simple hash of the datadir // Note that GetDataDir(true) returns a different path @@ -110,7 +110,7 @@ void PaymentServer::ipcParseCommandLine(interfaces::Node& node, int argc, char* savedPaymentRequests.append(arg); SendCoinsRecipient r; - if (GUIUtil::parseBitcoinURI(arg, &r) && !r.address.isEmpty()) + if (GUIUtil::parseNYC3URI(arg, &r) && !r.address.isEmpty()) { auto tempChainParams = CreateChainParams(CBaseChainParams::MAIN); @@ -322,7 +322,7 @@ void PaymentServer::handleURIOrFile(const QString& s) // normal URI { SendCoinsRecipient recipient; - if (GUIUtil::parseBitcoinURI(s, &recipient)) + if (GUIUtil::parseNYC3URI(s, &recipient)) { if (!IsValidDestinationString(recipient.address.toStdString())) { #ifndef ENABLE_BIP70 @@ -600,7 +600,7 @@ bool PaymentServer::processPaymentRequest(const PaymentRequestPlus& request, Sen return false; } - // Bitcoin amounts are stored as (optional) uint64 in the protobuf messages (see paymentrequest.proto), + // NYC3 amounts are stored as (optional) uint64 in the protobuf messages (see paymentrequest.proto), // but CAmount is defined as int64_t. Because of that we need to verify that amounts are in a valid range // and no overflow has happened. if (!verifyAmount(sendingTo.second)) { @@ -612,7 +612,7 @@ bool PaymentServer::processPaymentRequest(const PaymentRequestPlus& request, Sen CTxOut txOut(sendingTo.second, sendingTo.first); if (IsDust(txOut, optionsModel->node().getDustRelayFee())) { Q_EMIT message(tr("Payment request error"), tr("Requested payment amount of %1 is too small (considered dust).") - .arg(BitcoinUnits::formatWithUnit(optionsModel->getDisplayUnit(), sendingTo.second)), + .arg(NYC3Units::formatWithUnit(optionsModel->getDisplayUnit(), sendingTo.second)), CClientUIInterface::MSG_ERROR); return false; diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h index 30b5bc3b6..77284a46d 100644 --- a/src/qt/paymentserver.h +++ b/src/qt/paymentserver.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp index 496aeebf7..39cf11fab 100644 --- a/src/qt/peertablemodel.cpp +++ b/src/qt/peertablemodel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/peertablemodel.h b/src/qt/peertablemodel.h index b3f5dd7db..3d6f83f75 100644 --- a/src/qt/peertablemodel.h +++ b/src/qt/peertablemodel.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/platformstyle.cpp b/src/qt/platformstyle.cpp index d537d759d..879a3ee5d 100644 --- a/src/qt/platformstyle.cpp +++ b/src/qt/platformstyle.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/platformstyle.h b/src/qt/platformstyle.h index 4e763e760..3e61b4cc2 100644 --- a/src/qt/platformstyle.h +++ b/src/qt/platformstyle.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015 The Bitcoin Core developers +// Copyright (c) 2015 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/qvalidatedlineedit.cpp b/src/qt/qvalidatedlineedit.cpp index e3ad0bb6e..5227694f1 100644 --- a/src/qt/qvalidatedlineedit.cpp +++ b/src/qt/qvalidatedlineedit.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/qvalidatedlineedit.h b/src/qt/qvalidatedlineedit.h index 815d5e004..b207398e5 100644 --- a/src/qt/qvalidatedlineedit.h +++ b/src/qt/qvalidatedlineedit.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/qvaluecombobox.cpp b/src/qt/qvaluecombobox.cpp index 76f94ecf8..c1fbf3440 100644 --- a/src/qt/qvaluecombobox.cpp +++ b/src/qt/qvaluecombobox.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/qvaluecombobox.h b/src/qt/qvaluecombobox.h index 8892071fb..bd2f22c49 100644 --- a/src/qt/qvaluecombobox.h +++ b/src/qt/qvaluecombobox.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2015 The Bitcoin Core developers +// Copyright (c) 2011-2015 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp index 261fa9bb3..d5b112473 100644 --- a/src/qt/receivecoinsdialog.cpp +++ b/src/qt/receivecoinsdialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -277,7 +277,7 @@ void ReceiveCoinsDialog::copyURI() } const RecentRequestsTableModel * const submodel = model->getRecentRequestsTableModel(); - const QString uri = GUIUtil::formatBitcoinURI(submodel->entry(sel.row()).recipient); + const QString uri = GUIUtil::formatNYC3URI(submodel->entry(sel.row()).recipient); GUIUtil::setClipboard(uri); } diff --git a/src/qt/receivecoinsdialog.h b/src/qt/receivecoinsdialog.h index 5bca2f46e..8519eec52 100644 --- a/src/qt/receivecoinsdialog.h +++ b/src/qt/receivecoinsdialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp index d4397afc0..448546121 100644 --- a/src/qt/receiverequestdialog.cpp +++ b/src/qt/receiverequestdialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -131,7 +131,7 @@ void ReceiveRequestDialog::update() target = info.address; setWindowTitle(tr("Request payment to %1").arg(target)); - QString uri = GUIUtil::formatBitcoinURI(info); + QString uri = GUIUtil::formatNYC3URI(info); ui->btnSaveAs->setEnabled(false); QString html; html += ""; @@ -140,7 +140,7 @@ void ReceiveRequestDialog::update() html += "" + GUIUtil::HtmlEscape(uri) + "
"; html += ""+tr("Address")+": " + GUIUtil::HtmlEscape(info.address) + "
"; if(info.amount) - html += ""+tr("Amount")+": " + BitcoinUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), info.amount) + "
"; + html += ""+tr("Amount")+": " + NYC3Units::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), info.amount) + "
"; if(!info.label.isEmpty()) html += ""+tr("Label")+": " + GUIUtil::HtmlEscape(info.label) + "
"; if(!info.message.isEmpty()) @@ -203,7 +203,7 @@ void ReceiveRequestDialog::update() void ReceiveRequestDialog::on_btnCopyURI_clicked() { - GUIUtil::setClipboard(GUIUtil::formatBitcoinURI(info)); + GUIUtil::setClipboard(GUIUtil::formatNYC3URI(info)); } void ReceiveRequestDialog::on_btnCopyAddress_clicked() diff --git a/src/qt/receiverequestdialog.h b/src/qt/receiverequestdialog.h index dd28fd73c..5a3218aff 100644 --- a/src/qt/receiverequestdialog.h +++ b/src/qt/receiverequestdialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp index 5d88f2b6d..ef2154c69 100644 --- a/src/qt/recentrequeststablemodel.cpp +++ b/src/qt/recentrequeststablemodel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -80,9 +80,9 @@ QVariant RecentRequestsTableModel::data(const QModelIndex &index, int role) cons if (rec->recipient.amount == 0 && role == Qt::DisplayRole) return tr("(no amount requested)"); else if (role == Qt::EditRole) - return BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount, false, BitcoinUnits::separatorNever); + return NYC3Units::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount, false, NYC3Units::separatorNever); else - return BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount); + return NYC3Units::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount); } } else if (role == Qt::TextAlignmentRole) @@ -120,7 +120,7 @@ void RecentRequestsTableModel::updateAmountColumnTitle() /** Gets title for amount column including current display unit if optionsModel reference available. */ QString RecentRequestsTableModel::getAmountTitle() { - return (this->walletModel->getOptionsModel() != nullptr) ? tr("Requested") + " ("+BitcoinUnits::shortName(this->walletModel->getOptionsModel()->getDisplayUnit()) + ")" : ""; + return (this->walletModel->getOptionsModel() != nullptr) ? tr("Requested") + " ("+NYC3Units::shortName(this->walletModel->getOptionsModel()->getDisplayUnit()) + ")" : ""; } QModelIndex RecentRequestsTableModel::index(int row, int column, const QModelIndex &parent) const diff --git a/src/qt/recentrequeststablemodel.h b/src/qt/recentrequeststablemodel.h index 8a1140e95..d71041235 100644 --- a/src/qt/recentrequeststablemodel.h +++ b/src/qt/recentrequeststablemodel.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/res/icons/1.png b/src/qt/res/icons/1.png index c7318f090..f0c541185 100644 Binary files a/src/qt/res/icons/1.png and b/src/qt/res/icons/1.png differ diff --git a/src/qt/res/icons/2.png b/src/qt/res/icons/2.png index 5b35b5e2a..f0c541185 100644 Binary files a/src/qt/res/icons/2.png and b/src/qt/res/icons/2.png differ diff --git a/src/qt/res/icons/3.png b/src/qt/res/icons/3.png index d72fb3d6c..f0c541185 100644 Binary files a/src/qt/res/icons/3.png and b/src/qt/res/icons/3.png differ diff --git a/src/qt/res/icons/4.png b/src/qt/res/icons/4.png index 9bbc00886..f0c541185 100644 Binary files a/src/qt/res/icons/4.png and b/src/qt/res/icons/4.png differ diff --git a/src/qt/res/icons/bitcoin.ico b/src/qt/res/icons/bitcoin.ico index 5cb0bef6f..dc293f14a 100644 Binary files a/src/qt/res/icons/bitcoin.ico and b/src/qt/res/icons/bitcoin.ico differ diff --git a/src/qt/res/icons/nyc3.icns b/src/qt/res/icons/nyc3.icns index 54d02d34d..6a43ae29b 100644 Binary files a/src/qt/res/icons/nyc3.icns and b/src/qt/res/icons/nyc3.icns differ diff --git a/src/qt/res/icons/nyc3.ico b/src/qt/res/icons/nyc3.ico index 5cb0bef6f..dc293f14a 100644 Binary files a/src/qt/res/icons/nyc3.ico and b/src/qt/res/icons/nyc3.ico differ diff --git a/src/qt/res/icons/nyc3.png b/src/qt/res/icons/nyc3.png index 01413ec32..6dcad18e6 100644 Binary files a/src/qt/res/icons/nyc3.png and b/src/qt/res/icons/nyc3.png differ diff --git a/src/qt/res/movies/makespinner.sh b/src/qt/res/movies/makespinner.sh index f47c66e02..eccfc371b 100755 --- a/src/qt/res/movies/makespinner.sh +++ b/src/qt/res/movies/makespinner.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2014-2015 The Bitcoin Core developers +# Copyright (c) 2014-2015 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/res/nyc3-qt-res.rc b/src/qt/res/nyc3-qt-res.rc index 94ae25647..35b295341 100644 --- a/src/qt/res/nyc3-qt-res.rc +++ b/src/qt/res/nyc3-qt-res.rc @@ -19,8 +19,8 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Bitcoin" - VALUE "FileDescription", PACKAGE_NAME " (GUI node for Bitcoin)" + VALUE "CompanyName", "NYC3" + VALUE "FileDescription", PACKAGE_NAME " (GUI node for NYC3)" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "bitcoin-qt" VALUE "LegalCopyright", COPYRIGHT_STR diff --git a/src/qt/res/src/bitcoin.svg b/src/qt/res/src/bitcoin.svg index 14cf0c5e1..012799be5 100644 --- a/src/qt/res/src/bitcoin.svg +++ b/src/qt/res/src/bitcoin.svg @@ -1,58 +1,2869 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index fc1e14b03..902d478df 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2019 The Bitcoin Core developers +// Copyright (c) 2011-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h index 79b0f3b19..ffce546a8 100644 --- a/src/qt/rpcconsole.h +++ b/src/qt/rpcconsole.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2019 The Bitcoin Core developers +// Copyright (c) 2011-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -32,7 +32,7 @@ class QMenu; class QItemSelection; QT_END_NAMESPACE -/** Local Bitcoin RPC console. */ +/** Local NYC3 RPC console. */ class RPCConsole: public QWidget { Q_OBJECT diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 6c6a84771..2f51c0291 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -266,7 +266,7 @@ void SendCoinsDialog::on_sendButton_clicked() // process prepareStatus and on error generate message shown to user processSendCoinsReturn(prepareStatus, - BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), currentTransaction.getTransactionFee())); + NYC3Units::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), currentTransaction.getTransactionFee())); if(prepareStatus.status != WalletModel::OK) { fNewRecipientAllowed = true; @@ -280,7 +280,7 @@ void SendCoinsDialog::on_sendButton_clicked() for (const SendCoinsRecipient &rcp : currentTransaction.getRecipients()) { // generate bold amount string with wallet name in case of multiwallet - QString amount = "" + BitcoinUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), rcp.amount); + QString amount = "" + NYC3Units::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), rcp.amount); if (model->isMultiwallet()) { amount.append(" "+tr("from wallet %1").arg(GUIUtil::HtmlEscape(model->getWalletName()))+" "); } @@ -337,7 +337,7 @@ void SendCoinsDialog::on_sendButton_clicked() // append transaction fee value questionString.append(""); - questionString.append(BitcoinUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), txFee)); + questionString.append(NYC3Units::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), txFee)); questionString.append("
"); // append RBF message according to transaction's signalling @@ -354,13 +354,13 @@ void SendCoinsDialog::on_sendButton_clicked() questionString.append("
"); CAmount totalAmount = currentTransaction.getTotalTransactionAmount() + txFee; QStringList alternativeUnits; - for (const BitcoinUnits::Unit u : BitcoinUnits::availableUnits()) + for (const NYC3Units::Unit u : NYC3Units::availableUnits()) { if(u != model->getOptionsModel()->getDisplayUnit()) - alternativeUnits.append(BitcoinUnits::formatHtmlWithUnit(u, totalAmount)); + alternativeUnits.append(NYC3Units::formatHtmlWithUnit(u, totalAmount)); } questionString.append(QString("%1: %2").arg(tr("Total Amount")) - .arg(BitcoinUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), totalAmount))); + .arg(NYC3Units::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), totalAmount))); questionString.append(QString("
(=%1)") .arg(alternativeUnits.join(" " + tr("or") + " "))); @@ -532,7 +532,7 @@ void SendCoinsDialog::setBalance(const interfaces::WalletBalances& balances) { if(model && model->getOptionsModel()) { - ui->labelBalance->setText(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), balances.balance)); + ui->labelBalance->setText(NYC3Units::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), balances.balance)); } } @@ -578,7 +578,7 @@ void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn msgParams.second = CClientUIInterface::MSG_ERROR; break; case WalletModel::AbsurdFee: - msgParams.first = tr("A fee higher than %1 is considered an absurdly high fee.").arg(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), model->node().getMaxTxFee())); + msgParams.first = tr("A fee higher than %1 is considered an absurdly high fee.").arg(NYC3Units::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), model->node().getMaxTxFee())); break; case WalletModel::PaymentRequestExpired: msgParams.first = tr("Payment request expired."); @@ -659,7 +659,7 @@ void SendCoinsDialog::updateFeeMinimizedLabel() if (ui->radioSmartFee->isChecked()) ui->labelFeeMinimized->setText(ui->labelSmartFee->text()); else { - ui->labelFeeMinimized->setText(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), ui->customFee->value()) + "/kB"); + ui->labelFeeMinimized->setText(NYC3Units::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), ui->customFee->value()) + "/kB"); } } @@ -687,7 +687,7 @@ void SendCoinsDialog::updateSmartFeeLabel() FeeReason reason; CFeeRate feeRate = CFeeRate(model->wallet().getMinimumFee(1000, coin_control, &returned_target, &reason)); - ui->labelSmartFee->setText(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), feeRate.GetFeePerK()) + "/kB"); + ui->labelSmartFee->setText(NYC3Units::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), feeRate.GetFeePerK()) + "/kB"); if (reason == FeeReason::FALLBACK) { ui->labelSmartFee2->show(); // (Smart fee not initialized yet. This usually takes a few blocks...) diff --git a/src/qt/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h index 337a72b87..100135893 100644 --- a/src/qt/sendcoinsdialog.h +++ b/src/qt/sendcoinsdialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index f18182440..bed451a7f 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/sendcoinsentry.h b/src/qt/sendcoinsentry.h index 42e221713..eebf87835 100644 --- a/src/qt/sendcoinsentry.h +++ b/src/qt/sendcoinsentry.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp index d37a78fa8..7ede8c1ff 100644 --- a/src/qt/signverifymessagedialog.cpp +++ b/src/qt/signverifymessagedialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/signverifymessagedialog.h b/src/qt/signverifymessagedialog.h index d2e04cd4f..c372d5f41 100644 --- a/src/qt/signverifymessagedialog.h +++ b/src/qt/signverifymessagedialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2015 The Bitcoin Core developers +// Copyright (c) 2011-2015 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index e4000c2ee..e472df691 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/splashscreen.h b/src/qt/splashscreen.h index 489e2c4ac..22d8f94db 100644 --- a/src/qt/splashscreen.h +++ b/src/qt/splashscreen.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/apptests.cpp b/src/qt/test/apptests.cpp index 3fb75f1d1..a0ca92444 100644 --- a/src/qt/test/apptests.cpp +++ b/src/qt/test/apptests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -51,7 +51,7 @@ void TestRpcCommand(RPCConsole* console) } } // namespace -//! Entry point for BitcoinApplication tests. +//! Entry point for NYC3Application tests. void AppTests::appTests() { #ifdef Q_OS_MAC @@ -72,7 +72,7 @@ void AppTests::appTests() NetworkStyle::instantiate(QString::fromStdString(Params().NetworkIDString()))); m_app.setupPlatformStyle(); m_app.createWindow(style.data()); - connect(&m_app, &BitcoinApplication::windowShown, this, &AppTests::guiTests); + connect(&m_app, &NYC3Application::windowShown, this, &AppTests::guiTests); expectCallback("guiTests"); m_app.baseInitialize(); m_app.requestInitialize(); @@ -85,11 +85,11 @@ void AppTests::appTests() UnloadBlockIndex(); } -//! Entry point for BitcoinGUI tests. -void AppTests::guiTests(BitcoinGUI* window) +//! Entry point for NYC3GUI tests. +void AppTests::guiTests(NYC3GUI* window) { HandleCallback callback{"guiTests", *this}; - connect(window, &BitcoinGUI::consoleShown, this, &AppTests::consoleTests); + connect(window, &NYC3GUI::consoleShown, this, &AppTests::consoleTests); expectCallback("consoleTests"); QAction* action = window->findChild("openRPCConsoleAction"); action->activate(QAction::Trigger); diff --git a/src/qt/test/apptests.h b/src/qt/test/apptests.h index 83bf56f1e..ce9f62882 100644 --- a/src/qt/test/apptests.h +++ b/src/qt/test/apptests.h @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -10,19 +10,19 @@ #include #include -class BitcoinApplication; -class BitcoinGUI; +class NYC3Application; +class NYC3GUI; class RPCConsole; class AppTests : public QObject { Q_OBJECT public: - explicit AppTests(BitcoinApplication& app) : m_app(app) {} + explicit AppTests(NYC3Application& app) : m_app(app) {} private Q_SLOTS: void appTests(); - void guiTests(BitcoinGUI* window); + void guiTests(NYC3GUI* window); void consoleTests(RPCConsole* console); private: @@ -37,8 +37,8 @@ private: ~HandleCallback(); }; - //! Bitcoin application. - BitcoinApplication& m_app; + //! NYC3 application. + NYC3Application& m_app; //! Set of pending callback names. Used to track expected callbacks and shut //! down the app after the last callback has been handled and all tests have diff --git a/src/qt/test/compattests.cpp b/src/qt/test/compattests.cpp index 6750c543d..582533acb 100644 --- a/src/qt/test/compattests.cpp +++ b/src/qt/test/compattests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/compattests.h b/src/qt/test/compattests.h index 1af97696b..1d52ed6be 100644 --- a/src/qt/test/compattests.h +++ b/src/qt/test/compattests.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2016 The Bitcoin Core developers +// Copyright (c) 2009-2016 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/paymentrequestdata.h b/src/qt/test/paymentrequestdata.h index 7f45d3097..d155bf7f4 100644 --- a/src/qt/test/paymentrequestdata.h +++ b/src/qt/test/paymentrequestdata.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp index f0eca899f..17b67aecf 100644 --- a/src/qt/test/paymentservertests.cpp +++ b/src/qt/test/paymentservertests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/paymentservertests.h b/src/qt/test/paymentservertests.h index 7ef7a0a64..6f3d23238 100644 --- a/src/qt/test/paymentservertests.h +++ b/src/qt/test/paymentservertests.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp index 9485fe87d..f030bd02b 100644 --- a/src/qt/test/rpcnestedtests.cpp +++ b/src/qt/test/rpcnestedtests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/rpcnestedtests.h b/src/qt/test/rpcnestedtests.h index e33f4e3da..e9ecde613 100644 --- a/src/qt/test/rpcnestedtests.h +++ b/src/qt/test/rpcnestedtests.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index e008b0835..c4de6d468 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -71,8 +71,8 @@ int main(int argc, char *argv[]) // Don't remove this, it's needed to access // QApplication:: and QCoreApplication:: in the tests - BitcoinApplication app(*node, argc, argv); - app.setApplicationName("Bitcoin-Qt-test"); + NYC3Application app(*node, argc, argv); + app.setApplicationName("NYC3-Qt-test"); SSL_library_init(); diff --git a/src/qt/test/uritests.cpp b/src/qt/test/uritests.cpp index b87d3b21c..bc1b12cb6 100644 --- a/src/qt/test/uritests.cpp +++ b/src/qt/test/uritests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -14,53 +14,53 @@ void URITests::uriTests() SendCoinsRecipient rv; QUrl uri; uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?req-dontexist=")); - QVERIFY(!GUIUtil::parseBitcoinURI(uri, &rv)); + QVERIFY(!GUIUtil::parseNYC3URI(uri, &rv)); uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?dontexist=")); - QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); + QVERIFY(GUIUtil::parseNYC3URI(uri, &rv)); QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W")); QVERIFY(rv.label == QString()); QVERIFY(rv.amount == 0); uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?label=Wikipedia Example Address")); - QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); + QVERIFY(GUIUtil::parseNYC3URI(uri, &rv)); QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W")); QVERIFY(rv.label == QString("Wikipedia Example Address")); QVERIFY(rv.amount == 0); uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=0.001")); - QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); + QVERIFY(GUIUtil::parseNYC3URI(uri, &rv)); QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W")); QVERIFY(rv.label == QString()); QVERIFY(rv.amount == 100000); uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=1.001")); - QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); + QVERIFY(GUIUtil::parseNYC3URI(uri, &rv)); QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W")); QVERIFY(rv.label == QString()); QVERIFY(rv.amount == 100100000); uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=100&label=Wikipedia Example")); - QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); + QVERIFY(GUIUtil::parseNYC3URI(uri, &rv)); QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W")); QVERIFY(rv.amount == 10000000000LL); QVERIFY(rv.label == QString("Wikipedia Example")); uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?message=Wikipedia Example Address")); - QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); + QVERIFY(GUIUtil::parseNYC3URI(uri, &rv)); QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W")); QVERIFY(rv.label == QString()); - QVERIFY(GUIUtil::parseBitcoinURI("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?message=Wikipedia Example Address", &rv)); + QVERIFY(GUIUtil::parseNYC3URI("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?message=Wikipedia Example Address", &rv)); QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W")); QVERIFY(rv.label == QString()); uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?req-message=Wikipedia Example Address")); - QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); + QVERIFY(GUIUtil::parseNYC3URI(uri, &rv)); uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=1,000&label=Wikipedia Example")); - QVERIFY(!GUIUtil::parseBitcoinURI(uri, &rv)); + QVERIFY(!GUIUtil::parseNYC3URI(uri, &rv)); uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=1,000.0&label=Wikipedia Example")); - QVERIFY(!GUIUtil::parseBitcoinURI(uri, &rv)); + QVERIFY(!GUIUtil::parseNYC3URI(uri, &rv)); } diff --git a/src/qt/test/uritests.h b/src/qt/test/uritests.h index 499484279..8e798905c 100644 --- a/src/qt/test/uritests.h +++ b/src/qt/test/uritests.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2015 The Bitcoin Core developers +// Copyright (c) 2009-2015 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp index 2ecf74749..f66c36938 100644 --- a/src/qt/test/wallettests.cpp +++ b/src/qt/test/wallettests.cpp @@ -188,7 +188,7 @@ void TestGUI() QString balanceText = balanceLabel->text(); int unit = walletModel.getOptionsModel()->getDisplayUnit(); CAmount balance = walletModel.wallet().getBalance(); - QString balanceComparison = BitcoinUnits::formatWithUnit(unit, balance, false, BitcoinUnits::separatorAlways); + QString balanceComparison = NYC3Units::formatWithUnit(unit, balance, false, NYC3Units::separatorAlways); QCOMPARE(balanceText, balanceComparison); // Check Request Payment button diff --git a/src/qt/trafficgraphwidget.cpp b/src/qt/trafficgraphwidget.cpp index 1588be8da..23ff5c410 100644 --- a/src/qt/trafficgraphwidget.cpp +++ b/src/qt/trafficgraphwidget.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/trafficgraphwidget.h b/src/qt/trafficgraphwidget.h index 48bd246b3..560ff46b5 100644 --- a/src/qt/trafficgraphwidget.h +++ b/src/qt/trafficgraphwidget.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2015 The Bitcoin Core developers +// Copyright (c) 2011-2015 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 0fc745122..8a6469bf9 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -140,7 +140,7 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall nUnmatured += wallet.getCredit(txout, ISMINE_ALL); strHTML += "" + tr("Credit") + ": "; if (status.is_in_main_chain) - strHTML += BitcoinUnits::formatHtmlWithUnit(unit, nUnmatured)+ " (" + tr("matures in %n more block(s)", "", status.blocks_to_maturity) + ")"; + strHTML += NYC3Units::formatHtmlWithUnit(unit, nUnmatured)+ " (" + tr("matures in %n more block(s)", "", status.blocks_to_maturity) + ")"; else strHTML += "(" + tr("not accepted") + ")"; strHTML += "
"; @@ -150,7 +150,7 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall // // Credit // - strHTML += "" + tr("Credit") + ": " + BitcoinUnits::formatHtmlWithUnit(unit, nNet) + "
"; + strHTML += "" + tr("Credit") + ": " + NYC3Units::formatHtmlWithUnit(unit, nNet) + "
"; } else { @@ -202,9 +202,9 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall } } - strHTML += "" + tr("Debit") + ": " + BitcoinUnits::formatHtmlWithUnit(unit, -txout.nValue) + "
"; + strHTML += "" + tr("Debit") + ": " + NYC3Units::formatHtmlWithUnit(unit, -txout.nValue) + "
"; if(toSelf) - strHTML += "" + tr("Credit") + ": " + BitcoinUnits::formatHtmlWithUnit(unit, txout.nValue) + "
"; + strHTML += "" + tr("Credit") + ": " + NYC3Units::formatHtmlWithUnit(unit, txout.nValue) + "
"; } if (fAllToMe) @@ -212,13 +212,13 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall // Payment to self CAmount nChange = wtx.change; CAmount nValue = nCredit - nChange; - strHTML += "" + tr("Total debit") + ": " + BitcoinUnits::formatHtmlWithUnit(unit, -nValue) + "
"; - strHTML += "" + tr("Total credit") + ": " + BitcoinUnits::formatHtmlWithUnit(unit, nValue) + "
"; + strHTML += "" + tr("Total debit") + ": " + NYC3Units::formatHtmlWithUnit(unit, -nValue) + "
"; + strHTML += "" + tr("Total credit") + ": " + NYC3Units::formatHtmlWithUnit(unit, nValue) + "
"; } CAmount nTxFee = nDebit - wtx.tx->GetValueOut(); if (nTxFee > 0) - strHTML += "" + tr("Transaction fee") + ": " + BitcoinUnits::formatHtmlWithUnit(unit, -nTxFee) + "
"; + strHTML += "" + tr("Transaction fee") + ": " + NYC3Units::formatHtmlWithUnit(unit, -nTxFee) + "
"; } else { @@ -228,19 +228,19 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall auto mine = wtx.txin_is_mine.begin(); for (const CTxIn& txin : wtx.tx->vin) { if (*(mine++)) { - strHTML += "" + tr("Debit") + ": " + BitcoinUnits::formatHtmlWithUnit(unit, -wallet.getDebit(txin, ISMINE_ALL)) + "
"; + strHTML += "" + tr("Debit") + ": " + NYC3Units::formatHtmlWithUnit(unit, -wallet.getDebit(txin, ISMINE_ALL)) + "
"; } } mine = wtx.txout_is_mine.begin(); for (const CTxOut& txout : wtx.tx->vout) { if (*(mine++)) { - strHTML += "" + tr("Credit") + ": " + BitcoinUnits::formatHtmlWithUnit(unit, wallet.getCredit(txout, ISMINE_ALL)) + "
"; + strHTML += "" + tr("Credit") + ": " + NYC3Units::formatHtmlWithUnit(unit, wallet.getCredit(txout, ISMINE_ALL)) + "
"; } } } } - strHTML += "" + tr("Net amount") + ": " + BitcoinUnits::formatHtmlWithUnit(unit, nNet, true) + "
"; + strHTML += "" + tr("Net amount") + ": " + NYC3Units::formatHtmlWithUnit(unit, nNet, true) + "
"; // // Message @@ -291,10 +291,10 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall strHTML += "

" + tr("Debug information") + "

"; for (const CTxIn& txin : wtx.tx->vin) if(wallet.txinIsMine(txin)) - strHTML += "" + tr("Debit") + ": " + BitcoinUnits::formatHtmlWithUnit(unit, -wallet.getDebit(txin, ISMINE_ALL)) + "
"; + strHTML += "" + tr("Debit") + ": " + NYC3Units::formatHtmlWithUnit(unit, -wallet.getDebit(txin, ISMINE_ALL)) + "
"; for (const CTxOut& txout : wtx.tx->vout) if(wallet.txoutIsMine(txout)) - strHTML += "" + tr("Credit") + ": " + BitcoinUnits::formatHtmlWithUnit(unit, wallet.getCredit(txout, ISMINE_ALL)) + "
"; + strHTML += "" + tr("Credit") + ": " + NYC3Units::formatHtmlWithUnit(unit, wallet.getCredit(txout, ISMINE_ALL)) + "
"; strHTML += "
" + tr("Transaction") + ":
"; strHTML += GUIUtil::HtmlEscape(wtx.tx->ToString(), true); @@ -320,7 +320,7 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall strHTML += GUIUtil::HtmlEscape(name) + " "; strHTML += QString::fromStdString(EncodeDestination(address)); } - strHTML = strHTML + " " + tr("Amount") + "=" + BitcoinUnits::formatHtmlWithUnit(unit, vout.nValue); + strHTML = strHTML + " " + tr("Amount") + "=" + NYC3Units::formatHtmlWithUnit(unit, vout.nValue); strHTML = strHTML + " IsMine=" + (wallet.txoutIsMine(vout) & ISMINE_SPENDABLE ? tr("true") : tr("false")) + ""; strHTML = strHTML + " IsWatchOnly=" + (wallet.txoutIsMine(vout) & ISMINE_WATCH_ONLY ? tr("true") : tr("false")) + ""; } diff --git a/src/qt/transactiondesc.h b/src/qt/transactiondesc.h index cf955a433..d24431f40 100644 --- a/src/qt/transactiondesc.h +++ b/src/qt/transactiondesc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactiondescdialog.cpp b/src/qt/transactiondescdialog.cpp index ca72720e0..8ade31113 100644 --- a/src/qt/transactiondescdialog.cpp +++ b/src/qt/transactiondescdialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactiondescdialog.h b/src/qt/transactiondescdialog.h index 8fd3f3166..a670ab90f 100644 --- a/src/qt/transactiondescdialog.h +++ b/src/qt/transactiondescdialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2014 The Bitcoin Core developers +// Copyright (c) 2011-2014 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactionfilterproxy.cpp b/src/qt/transactionfilterproxy.cpp index a631f497a..307247cc4 100644 --- a/src/qt/transactionfilterproxy.cpp +++ b/src/qt/transactionfilterproxy.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactionfilterproxy.h b/src/qt/transactionfilterproxy.h index 685f8d3a2..44ec62310 100644 --- a/src/qt/transactionfilterproxy.h +++ b/src/qt/transactionfilterproxy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index aa785553c..ab4e7371c 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -55,7 +55,7 @@ QList TransactionRecord::decomposeTransaction(const interface sub.involvesWatchAddress = mine & ISMINE_WATCH_ONLY; if (wtx.txout_address_is_mine[i]) { - // Received by Bitcoin Address + // Received by NYC3 Address sub.type = TransactionRecord::RecvWithAddress; sub.address = EncodeDestination(wtx.txout_address[i]); } @@ -124,7 +124,7 @@ QList TransactionRecord::decomposeTransaction(const interface if (!boost::get(&wtx.txout_address[nOut])) { - // Sent to Bitcoin Address + // Sent to NYC3 Address sub.type = TransactionRecord::SendToAddress; sub.address = EncodeDestination(wtx.txout_address[nOut]); } diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h index 3f64cefd0..aca075259 100644 --- a/src/qt/transactionrecord.h +++ b/src/qt/transactionrecord.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index 631a9b891..0c3c018d4 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -224,7 +224,7 @@ TransactionTableModel::TransactionTableModel(const PlatformStyle *_platformStyle fProcessingQueuedTransactions(false), platformStyle(_platformStyle) { - columns << QString() << QString() << tr("Date") << tr("Type") << tr("Label") << BitcoinUnits::getAmountColumnTitle(walletModel->getOptionsModel()->getDisplayUnit()); + columns << QString() << QString() << tr("Date") << tr("Type") << tr("Label") << NYC3Units::getAmountColumnTitle(walletModel->getOptionsModel()->getDisplayUnit()); priv->refreshWallet(walletModel->wallet()); connect(walletModel->getOptionsModel(), &OptionsModel::displayUnitChanged, this, &TransactionTableModel::updateDisplayUnit); @@ -241,7 +241,7 @@ TransactionTableModel::~TransactionTableModel() /** Updates the column title to "Amount (DisplayUnit)" and emits headerDataChanged() signal for table headers to react. */ void TransactionTableModel::updateAmountColumnTitle() { - columns[Amount] = BitcoinUnits::getAmountColumnTitle(walletModel->getOptionsModel()->getDisplayUnit()); + columns[Amount] = NYC3Units::getAmountColumnTitle(walletModel->getOptionsModel()->getDisplayUnit()); Q_EMIT headerDataChanged(Qt::Horizontal,Amount,Amount); } @@ -422,9 +422,9 @@ QVariant TransactionTableModel::addressColor(const TransactionRecord *wtx) const return QVariant(); } -QString TransactionTableModel::formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed, BitcoinUnits::SeparatorStyle separators) const +QString TransactionTableModel::formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed, NYC3Units::SeparatorStyle separators) const { - QString str = BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), wtx->credit + wtx->debit, false, separators); + QString str = NYC3Units::format(walletModel->getOptionsModel()->getDisplayUnit(), wtx->credit + wtx->debit, false, separators); if(showUnconfirmed) { if(!wtx->status.countsForBalance) @@ -524,7 +524,7 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const case ToAddress: return formatTxToAddress(rec, false); case Amount: - return formatTxAmount(rec, true, BitcoinUnits::separatorAlways); + return formatTxAmount(rec, true, NYC3Units::separatorAlways); } break; case Qt::EditRole: @@ -614,14 +614,14 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const details.append(QString::fromStdString(rec->address)); details.append(" "); } - details.append(formatTxAmount(rec, false, BitcoinUnits::separatorNever)); + details.append(formatTxAmount(rec, false, NYC3Units::separatorNever)); return details; } case ConfirmedRole: return rec->status.countsForBalance; case FormattedAmountRole: // Used for copy/export, so don't include separators - return formatTxAmount(rec, false, BitcoinUnits::separatorNever); + return formatTxAmount(rec, false, NYC3Units::separatorNever); case StatusRole: return rec->status.status; } diff --git a/src/qt/transactiontablemodel.h b/src/qt/transactiontablemodel.h index fa48a6968..ba5a28d14 100644 --- a/src/qt/transactiontablemodel.h +++ b/src/qt/transactiontablemodel.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -101,7 +101,7 @@ private: QString formatTxDate(const TransactionRecord *wtx) const; QString formatTxType(const TransactionRecord *wtx) const; QString formatTxToAddress(const TransactionRecord *wtx, bool tooltip) const; - QString formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed=true, BitcoinUnits::SeparatorStyle separators=BitcoinUnits::separatorStandard) const; + QString formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed=true, NYC3Units::SeparatorStyle separators=NYC3Units::separatorStandard) const; QString formatTooltip(const TransactionRecord *rec) const; QVariant txStatusDecoration(const TransactionRecord *wtx) const; QVariant txWatchonlyDecoration(const TransactionRecord *wtx) const; diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp index d092eb48c..9ff51ca35 100644 --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -343,7 +343,7 @@ void TransactionView::changedAmount() if(!transactionProxyModel) return; CAmount amount_parsed = 0; - if (BitcoinUnits::parse(model->getOptionsModel()->getDisplayUnit(), amountWidget->text(), &amount_parsed)) { + if (NYC3Units::parse(model->getOptionsModel()->getDisplayUnit(), amountWidget->text(), &amount_parsed)) { transactionProxyModel->setMinAmount(amount_parsed); } else @@ -377,7 +377,7 @@ void TransactionView::exportClicked() writer.addColumn(tr("Type"), TransactionTableModel::Type, Qt::EditRole); writer.addColumn(tr("Label"), 0, TransactionTableModel::LabelRole); writer.addColumn(tr("Address"), 0, TransactionTableModel::AddressRole); - writer.addColumn(BitcoinUnits::getAmountColumnTitle(model->getOptionsModel()->getDisplayUnit()), 0, TransactionTableModel::FormattedAmountRole); + writer.addColumn(NYC3Units::getAmountColumnTitle(model->getOptionsModel()->getDisplayUnit()), 0, TransactionTableModel::FormattedAmountRole); writer.addColumn(tr("ID"), 0, TransactionTableModel::TxHashRole); if(!writer.write()) { diff --git a/src/qt/transactionview.h b/src/qt/transactionview.h index e07181d1c..dab97db2e 100644 --- a/src/qt/transactionview.h +++ b/src/qt/transactionview.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 22d0d2401..75aef9532 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -160,7 +160,7 @@ ShutdownWindow::ShutdownWindow(QWidget *parent, Qt::WindowFlags f): setLayout(layout); } -QWidget *ShutdownWindow::showShutdownWindow(BitcoinGUI *window) +QWidget *ShutdownWindow::showShutdownWindow(NYC3GUI *window) { if (!window) return nullptr; diff --git a/src/qt/utilitydialog.h b/src/qt/utilitydialog.h index f1cedff28..5e697a550 100644 --- a/src/qt/utilitydialog.h +++ b/src/qt/utilitydialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -8,7 +8,7 @@ #include #include -class BitcoinGUI; +class NYC3GUI; namespace interfaces { class Node; @@ -46,7 +46,7 @@ class ShutdownWindow : public QWidget public: explicit ShutdownWindow(QWidget *parent=nullptr, Qt::WindowFlags f=Qt::Widget); - static QWidget *showShutdownWindow(BitcoinGUI *window); + static QWidget *showShutdownWindow(NYC3GUI *window); protected: void closeEvent(QCloseEvent *event); diff --git a/src/qt/walletcontroller.cpp b/src/qt/walletcontroller.cpp index 019bd6582..fec01eb63 100644 --- a/src/qt/walletcontroller.cpp +++ b/src/qt/walletcontroller.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2019 The Bitcoin Core developers +// Copyright (c) 2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletcontroller.h b/src/qt/walletcontroller.h index 19b3a8225..29d013d78 100644 --- a/src/qt/walletcontroller.h +++ b/src/qt/walletcontroller.h @@ -1,4 +1,4 @@ -// Copyright (c) 2019 The Bitcoin Core developers +// Copyright (c) 2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp index 40c8fe443..5916df416 100644 --- a/src/qt/walletframe.cpp +++ b/src/qt/walletframe.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2019 The Bitcoin Core developers +// Copyright (c) 2011-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -14,7 +14,7 @@ #include #include -WalletFrame::WalletFrame(const PlatformStyle *_platformStyle, BitcoinGUI *_gui) : +WalletFrame::WalletFrame(const PlatformStyle *_platformStyle, NYC3GUI *_gui) : QFrame(_gui), gui(_gui), platformStyle(_platformStyle) @@ -51,7 +51,7 @@ bool WalletFrame::addWallet(WalletModel *walletModel) } WalletView *walletView = new WalletView(platformStyle, this); - walletView->setBitcoinGUI(gui); + walletView->setNYC3GUI(gui); walletView->setClientModel(clientModel); walletView->setWalletModel(walletModel); walletView->showOutOfSyncWarning(bOutOfSync); diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h index 6a74fde9f..a0daf13e3 100644 --- a/src/qt/walletframe.h +++ b/src/qt/walletframe.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2019 The Bitcoin Core developers +// Copyright (c) 2011-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -8,7 +8,7 @@ #include #include -class BitcoinGUI; +class NYC3GUI; class ClientModel; class PlatformStyle; class SendCoinsRecipient; @@ -21,9 +21,9 @@ QT_END_NAMESPACE /** * A container for embedding all wallet-related - * controls into BitcoinGUI. The purpose of this class is to allow future + * controls into NYC3GUI. The purpose of this class is to allow future * refinements of the wallet controls with minimal need for further - * modifications to BitcoinGUI, thus greatly simplifying merges while + * modifications to NYC3GUI, thus greatly simplifying merges while * reducing the risk of breaking top-level stuff. */ class WalletFrame : public QFrame @@ -31,7 +31,7 @@ class WalletFrame : public QFrame Q_OBJECT public: - explicit WalletFrame(const PlatformStyle *platformStyle, BitcoinGUI *_gui = nullptr); + explicit WalletFrame(const PlatformStyle *platformStyle, NYC3GUI *_gui = nullptr); ~WalletFrame(); void setClientModel(ClientModel *clientModel); @@ -51,7 +51,7 @@ Q_SIGNALS: private: QStackedWidget *walletStack; - BitcoinGUI *gui; + NYC3GUI *gui; ClientModel *clientModel; QMap mapWalletViews; diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index f4f3be8f4..389c7c44c 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2019 The Bitcoin Core developers +// Copyright (c) 2011-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -529,15 +529,15 @@ bool WalletModel::bumpFee(uint256 hash, uint256& new_hash) questionString.append(""); questionString.append(tr("Current fee:")); questionString.append(""); - questionString.append(BitcoinUnits::formatHtmlWithUnit(getOptionsModel()->getDisplayUnit(), old_fee)); + questionString.append(NYC3Units::formatHtmlWithUnit(getOptionsModel()->getDisplayUnit(), old_fee)); questionString.append(""); questionString.append(tr("Increase:")); questionString.append(""); - questionString.append(BitcoinUnits::formatHtmlWithUnit(getOptionsModel()->getDisplayUnit(), new_fee - old_fee)); + questionString.append(NYC3Units::formatHtmlWithUnit(getOptionsModel()->getDisplayUnit(), new_fee - old_fee)); questionString.append(""); questionString.append(tr("New fee:")); questionString.append(""); - questionString.append(BitcoinUnits::formatHtmlWithUnit(getOptionsModel()->getDisplayUnit(), new_fee)); + questionString.append(NYC3Units::formatHtmlWithUnit(getOptionsModel()->getDisplayUnit(), new_fee)); questionString.append(""); SendConfirmationDialog confirmationDialog(tr("Confirm fee bump"), questionString); confirmationDialog.exec(); diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index b123befbb..079bb63f5 100644 --- a/src/qt/walletmodel.h +++ b/src/qt/walletmodel.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2019 The Bitcoin Core developers +// Copyright (c) 2011-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -121,7 +121,7 @@ public: } }; -/** Interface to Bitcoin wallet from Qt view code. */ +/** Interface to NYC3 wallet from Qt view code. */ class WalletModel : public QObject { Q_OBJECT diff --git a/src/qt/walletmodeltransaction.cpp b/src/qt/walletmodeltransaction.cpp index eb3b0baf0..2683d4793 100644 --- a/src/qt/walletmodeltransaction.cpp +++ b/src/qt/walletmodeltransaction.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletmodeltransaction.h b/src/qt/walletmodeltransaction.h index 289aee847..08f81e82b 100644 --- a/src/qt/walletmodeltransaction.h +++ b/src/qt/walletmodeltransaction.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp index 1f0368256..ed66cc293 100644 --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -86,15 +86,15 @@ WalletView::~WalletView() { } -void WalletView::setBitcoinGUI(BitcoinGUI *gui) +void WalletView::setNYC3GUI(NYC3GUI *gui) { if (gui) { // Clicking on a transaction on the overview page simply sends you to transaction history page - connect(overviewPage, &OverviewPage::transactionClicked, gui, &BitcoinGUI::gotoHistoryPage); + connect(overviewPage, &OverviewPage::transactionClicked, gui, &NYC3GUI::gotoHistoryPage); // Navigate to transaction history page after send - connect(sendCoinsPage, &SendCoinsDialog::coinsSent, gui, &BitcoinGUI::gotoHistoryPage); + connect(sendCoinsPage, &SendCoinsDialog::coinsSent, gui, &NYC3GUI::gotoHistoryPage); // Receive and report messages connect(this, &WalletView::message, [gui](const QString &title, const QString &message, unsigned int style) { @@ -102,13 +102,13 @@ void WalletView::setBitcoinGUI(BitcoinGUI *gui) }); // Pass through encryption status changed signals - connect(this, &WalletView::encryptionStatusChanged, gui, &BitcoinGUI::updateWalletStatus); + connect(this, &WalletView::encryptionStatusChanged, gui, &NYC3GUI::updateWalletStatus); // Pass through transaction notifications - connect(this, &WalletView::incomingTransaction, gui, &BitcoinGUI::incomingTransaction); + connect(this, &WalletView::incomingTransaction, gui, &NYC3GUI::incomingTransaction); // Connect HD enabled state signal - connect(this, &WalletView::hdEnabledStatusChanged, gui, &BitcoinGUI::updateWalletStatus); + connect(this, &WalletView::hdEnabledStatusChanged, gui, &NYC3GUI::updateWalletStatus); } } diff --git a/src/qt/walletview.h b/src/qt/walletview.h index e29c4c52f..0adc3eaff 100644 --- a/src/qt/walletview.h +++ b/src/qt/walletview.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -9,7 +9,7 @@ #include -class BitcoinGUI; +class NYC3GUI; class ClientModel; class OverviewPage; class PlatformStyle; @@ -39,7 +39,7 @@ public: explicit WalletView(const PlatformStyle *platformStyle, QWidget *parent); ~WalletView(); - void setBitcoinGUI(BitcoinGUI *gui); + void setNYC3GUI(NYC3GUI *gui); /** Set the client model. The client model represents the part of the core that communicates with the P2P network, and is wallet-agnostic. */ diff --git a/src/qt/winshutdownmonitor.cpp b/src/qt/winshutdownmonitor.cpp index 08cae76ad..4676b44c6 100644 --- a/src/qt/winshutdownmonitor.cpp +++ b/src/qt/winshutdownmonitor.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/winshutdownmonitor.h b/src/qt/winshutdownmonitor.h index 8edb98c74..e62f777b8 100644 --- a/src/qt/winshutdownmonitor.h +++ b/src/qt/winshutdownmonitor.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/random.cpp b/src/random.cpp index 1aa78a903..8b8b08349 100644 --- a/src/random.cpp +++ b/src/random.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/random.h b/src/random.h index 1c035f87b..5c544438d 100644 --- a/src/random.h +++ b/src/random.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rest.cpp b/src/rest.cpp index 326f7ae1d..a8cec660c 100644 --- a/src/rest.cpp +++ b/src/rest.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/reverselock.h b/src/reverselock.h index 9d9cc9fd7..ef43b7943 100644 --- a/src/reverselock.h +++ b/src/reverselock.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2016 The Bitcoin Core developers +// Copyright (c) 2015-2016 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 18e247923..0eaf22ce9 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2019 The Bitcoin Core developers +// Copyright (c) 2009-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/blockchain.h b/src/rpc/blockchain.h index 529132d03..99e8ccc24 100644 --- a/src/rpc/blockchain.h +++ b/src/rpc/blockchain.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp index 0dfbf00b2..c8f1da302 100644 --- a/src/rpc/client.cpp +++ b/src/rpc/client.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/client.h b/src/rpc/client.h index b9fee5bbb..f7f1b95b7 100644 --- a/src/rpc/client.h +++ b/src/rpc/client.h @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 4e65b423e..b64c342dc 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -444,10 +444,10 @@ static UniValue getblocktemplate(const JSONRPCRequest& request) throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled"); if (g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL) == 0) - throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Bitcoin is not connected!"); + throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "NYC3 is not connected!"); if (IsInitialBlockDownload()) - throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Bitcoin is downloading blocks..."); + throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "NYC3 is downloading blocks..."); static unsigned int nTransactionsUpdatedLast; diff --git a/src/rpc/mining.h b/src/rpc/mining.h index be9a97331..b36c4a25b 100644 --- a/src/rpc/mining.h +++ b/src/rpc/mining.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017 The Bitcoin Core developers +// Copyright (c) 2017 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index 0a97f8029..ea3701212 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index c7b3478f4..2d58e4e63 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2019 The Bitcoin Core developers +// Copyright (c) 2009-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/protocol.cpp b/src/rpc/protocol.cpp index 23999b305..bb0af67e3 100644 --- a/src/rpc/protocol.cpp +++ b/src/rpc/protocol.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -13,7 +13,7 @@ #include /** - * JSON-RPC protocol. Bitcoin speaks version 1.0 for maximum compatibility, + * JSON-RPC protocol. NYC3 speaks version 1.0 for maximum compatibility, * but uses JSON-RPC 1.1/2.0 standards for parts of the 1.0 standard that were * unspecified (HTTP errors and contents of 'error'). * diff --git a/src/rpc/protocol.h b/src/rpc/protocol.h index 6bcbccbd4..7b2efcb1b 100644 --- a/src/rpc/protocol.h +++ b/src/rpc/protocol.h @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -28,7 +28,7 @@ enum HTTPStatusCode HTTP_SERVICE_UNAVAILABLE = 503, }; -//! Bitcoin RPC error codes +//! NYC3 RPC error codes enum RPCErrorCode { //! Standard JSON-RPC 2.0 errors @@ -64,7 +64,7 @@ enum RPCErrorCode RPC_TRANSACTION_ALREADY_IN_CHAIN= RPC_VERIFY_ALREADY_IN_CHAIN, //! P2P client errors - RPC_CLIENT_NOT_CONNECTED = -9, //!< Bitcoin is not connected + RPC_CLIENT_NOT_CONNECTED = -9, //!< NYC3 is not connected RPC_CLIENT_IN_INITIAL_DOWNLOAD = -10, //!< Still downloading initial blocks RPC_CLIENT_NODE_ALREADY_ADDED = -23, //!< Node is already added RPC_CLIENT_NODE_NOT_ADDED = -24, //!< Node has not been added before diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 8cffee71b..c3d367148 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2019 The Bitcoin Core developers +// Copyright (c) 2009-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -1185,7 +1185,7 @@ UniValue decodepsbt(const JSONRPCRequest& request) if (request.fHelp || request.params.size() != 1) throw std::runtime_error( RPCHelpMan{"decodepsbt", - "\nReturn a JSON object representing the serialized, base64-encoded partially signed Bitcoin transaction.\n", + "\nReturn a JSON object representing the serialized, base64-encoded partially signed NYC3 transaction.\n", { {"psbt", RPCArg::Type::STR, RPCArg::Optional::NO, "The PSBT base64 string"}, }, @@ -1460,7 +1460,7 @@ UniValue combinepsbt(const JSONRPCRequest& request) if (request.fHelp || request.params.size() != 1) throw std::runtime_error( RPCHelpMan{"combinepsbt", - "\nCombine multiple partially signed Bitcoin transactions into one transaction.\n" + "\nCombine multiple partially signed NYC3 transactions into one transaction.\n" "Implements the Combiner role.\n", { {"txs", RPCArg::Type::ARR, RPCArg::Optional::NO, "A json array of base64 strings of partially signed transactions", diff --git a/src/rpc/rawtransaction.h b/src/rpc/rawtransaction.h index 52d701d1c..1c6133d99 100644 --- a/src/rpc/rawtransaction.h +++ b/src/rpc/rawtransaction.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/register.h b/src/rpc/register.h index 374a1e3db..58cb21006 100644 --- a/src/rpc/register.h +++ b/src/rpc/register.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index 6ebde86b5..ef9a51eaf 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2019 The Bitcoin Core developers +// Copyright (c) 2009-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -256,7 +256,7 @@ UniValue stop(const JSONRPCRequest& jsonRequest) if (jsonRequest.fHelp || jsonRequest.params.size() > 1) throw std::runtime_error( RPCHelpMan{"stop", - "\nStop Bitcoin server.", + "\nStop NYC3 server.", {}, RPCResults{}, RPCExamples{""}, @@ -267,7 +267,7 @@ UniValue stop(const JSONRPCRequest& jsonRequest) if (jsonRequest.params[0].isNum()) { MilliSleep(jsonRequest.params[0].get_int()); } - return "Bitcoin server stopping"; + return "NYC3 server stopping"; } static UniValue uptime(const JSONRPCRequest& jsonRequest) diff --git a/src/rpc/server.h b/src/rpc/server.h index 2d62a76f3..48aadacf6 100644 --- a/src/rpc/server.h +++ b/src/rpc/server.h @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -138,7 +138,7 @@ public: }; /** - * Bitcoin RPC command dispatcher. + * NYC3 RPC command dispatcher. */ class CRPCTable { diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp index 40ac13318..17aeffee9 100644 --- a/src/rpc/util.cpp +++ b/src/rpc/util.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2019 The Bitcoin Core developers +// Copyright (c) 2017-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/util.h b/src/rpc/util.h index f1bd2c89d..ca1db77cd 100644 --- a/src/rpc/util.h +++ b/src/rpc/util.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2019 The Bitcoin Core developers +// Copyright (c) 2017-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/scheduler.cpp b/src/scheduler.cpp index fdc859b3a..b5d9a9d20 100644 --- a/src/scheduler.cpp +++ b/src/scheduler.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/scheduler.h b/src/scheduler.h index 436f661c5..535826c5c 100644 --- a/src/scheduler.h +++ b/src/scheduler.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp index a333d4d4a..8bd277629 100644 --- a/src/script/descriptor.cpp +++ b/src/script/descriptor.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/descriptor.h b/src/script/descriptor.h index 907a10228..024b76f3d 100644 --- a/src/script/descriptor.h +++ b/src/script/descriptor.h @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index 95b25b491..917066a96 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/interpreter.h b/src/script/interpreter.h index 276ff9a58..303062ce8 100644 --- a/src/script/interpreter.h +++ b/src/script/interpreter.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/ismine.cpp b/src/script/ismine.cpp index 51bd2d6e9..5154b977a 100644 --- a/src/script/ismine.cpp +++ b/src/script/ismine.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/ismine.h b/src/script/ismine.h index 601e70f70..30abfc6b5 100644 --- a/src/script/ismine.h +++ b/src/script/ismine.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/nyc3consensus.cpp b/src/script/nyc3consensus.cpp index ebef4f221..cfed32273 100644 --- a/src/script/nyc3consensus.cpp +++ b/src/script/nyc3consensus.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/nyc3consensus.h b/src/script/nyc3consensus.h index c5dceac84..cf4d11fac 100644 --- a/src/script/nyc3consensus.h +++ b/src/script/nyc3consensus.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/script.cpp b/src/script/script.cpp index 982aa241e..2adb5dbd6 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/script.h b/src/script/script.h index 1d8ddba2f..35261234b 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -522,7 +522,7 @@ public: } /** - * Pre-version-0.6, Bitcoin always counted CHECKMULTISIGs + * Pre-version-0.6, NYC3 always counted CHECKMULTISIGs * as 20 sigops. With pay-to-script-hash, that changed: * CHECKMULTISIGs serialized in scriptSigs are * counted more accurately, assuming they are of the form diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp index 9d7deffc7..60847e24a 100644 --- a/src/script/script_error.cpp +++ b/src/script/script_error.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/script_error.h b/src/script/script_error.h index 400f63ff0..af3fbc589 100644 --- a/src/script/script_error.h +++ b/src/script/script_error.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp index 94005cf6f..b57a75be8 100644 --- a/src/script/sigcache.cpp +++ b/src/script/sigcache.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/sigcache.h b/src/script/sigcache.h index 807b61b54..3579f38c2 100644 --- a/src/script/sigcache.h +++ b/src/script/sigcache.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/sign.cpp b/src/script/sign.cpp index 36dd68a3d..b41aca385 100644 --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/sign.h b/src/script/sign.h index f746325b9..0a3497780 100644 --- a/src/script/sign.h +++ b/src/script/sign.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 31bfd04b0..b353d3605 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/standard.h b/src/script/standard.h index fc20fb6a0..af3387c43 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -163,7 +163,7 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet) bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, std::vector& addressRet, int& nRequiredRet); /** - * Generate a Bitcoin scriptPubKey for the given CTxDestination. Returns a P2PKH + * Generate a NYC3 scriptPubKey for the given CTxDestination. Returns a P2PKH * script for a CKeyID destination, a P2SH script for a CScriptID, and an empty * script for CNoDestination. */ diff --git a/src/secp256k1/contrib/lax_der_parsing.h b/src/secp256k1/contrib/lax_der_parsing.h index 7eaf63bf6..d5c8abfbc 100644 --- a/src/secp256k1/contrib/lax_der_parsing.h +++ b/src/secp256k1/contrib/lax_der_parsing.h @@ -68,7 +68,7 @@ extern "C" { * This function will accept any valid DER encoded signature, even if the * encoded numbers are out of range. In addition, it will accept signatures * which violate the DER spec in various ways. Its purpose is to allow - * validation of the Bitcoin blockchain, which includes non-DER signatures + * validation of the NYC3 blockchain, which includes non-DER signatures * from before the network rules were updated to enforce DER. Note that * the set of supported violations is a strict subset of what OpenSSL will * accept. diff --git a/src/serialize.h b/src/serialize.h index 2d0cfbbbf..12f16f875 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/shutdown.cpp b/src/shutdown.cpp index dec497d8e..64363d75b 100644 --- a/src/shutdown.cpp +++ b/src/shutdown.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/shutdown.h b/src/shutdown.h index 3ed851c78..a56d92104 100644 --- a/src/shutdown.h +++ b/src/shutdown.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/span.h b/src/span.h index 77de059fa..1ad8555ba 100644 --- a/src/span.h +++ b/src/span.h @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/streams.h b/src/streams.h index 4e600f182..23edc617c 100644 --- a/src/streams.h +++ b/src/streams.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/support/allocators/secure.h b/src/support/allocators/secure.h index 57f5b1f73..885fe4661 100644 --- a/src/support/allocators/secure.h +++ b/src/support/allocators/secure.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/support/allocators/zeroafterfree.h b/src/support/allocators/zeroafterfree.h index c7ed5ef30..9cc2b6415 100644 --- a/src/support/allocators/zeroafterfree.h +++ b/src/support/allocators/zeroafterfree.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/support/cleanse.cpp b/src/support/cleanse.cpp index 17a4a4c2b..55cd9648d 100644 --- a/src/support/cleanse.cpp +++ b/src/support/cleanse.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/support/cleanse.h b/src/support/cleanse.h index 5298214e4..8b009c972 100644 --- a/src/support/cleanse.h +++ b/src/support/cleanse.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/support/events.h b/src/support/events.h index 0a74d0236..f91ec4b03 100644 --- a/src/support/events.h +++ b/src/support/events.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp index 5c2050e4a..4db316c7f 100644 --- a/src/support/lockedpool.cpp +++ b/src/support/lockedpool.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/support/lockedpool.h b/src/support/lockedpool.h index b420c909f..b08061c2c 100644 --- a/src/support/lockedpool.h +++ b/src/support/lockedpool.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/sync.cpp b/src/sync.cpp index 23ca866e5..e2cf995f7 100644 --- a/src/sync.cpp +++ b/src/sync.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/sync.h b/src/sync.h index 3857eda56..5ef648830 100644 --- a/src/sync.h +++ b/src/sync.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp index 22347fbc5..d57255073 100644 --- a/src/test/addrman_tests.cpp +++ b/src/test/addrman_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include diff --git a/src/test/allocator_tests.cpp b/src/test/allocator_tests.cpp index 9eded4f5b..12a9cf9d4 100644 --- a/src/test/allocator_tests.cpp +++ b/src/test/allocator_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/amount_tests.cpp b/src/test/amount_tests.cpp index 1ff040b07..bc77bb733 100644 --- a/src/test/amount_tests.cpp +++ b/src/test/amount_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/arith_uint256_tests.cpp b/src/test/arith_uint256_tests.cpp index 77b6008fd..93eec7223 100644 --- a/src/test/arith_uint256_tests.cpp +++ b/src/test/arith_uint256_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/base32_tests.cpp b/src/test/base32_tests.cpp index 32af843bf..ad025875a 100644 --- a/src/test/base32_tests.cpp +++ b/src/test/base32_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp index f8f9b3c1a..c4327e09a 100644 --- a/src/test/base58_tests.cpp +++ b/src/test/base58_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/base64_tests.cpp b/src/test/base64_tests.cpp index 0abbb682a..c55bb5d5d 100644 --- a/src/test/base64_tests.cpp +++ b/src/test/base64_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/bip32_tests.cpp b/src/test/bip32_tests.cpp index c9951f4b7..875c7bd86 100644 --- a/src/test/bip32_tests.cpp +++ b/src/test/bip32_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2013-2018 The Bitcoin Core developers +// Copyright (c) 2013-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp index 607af8a32..8bc889093 100644 --- a/src/test/blockencodings_tests.cpp +++ b/src/test/blockencodings_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/blockfilter_tests.cpp b/src/test/blockfilter_tests.cpp index 625362f44..446f2e29f 100644 --- a/src/test/blockfilter_tests.cpp +++ b/src/test/blockfilter_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp index f58dd20ef..1816586d0 100644 --- a/src/test/bloom_tests.cpp +++ b/src/test/bloom_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/bswap_tests.cpp b/src/test/bswap_tests.cpp index 857292619..da09f9239 100644 --- a/src/test/bswap_tests.cpp +++ b/src/test/bswap_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp index 3469c6dfb..949ba833a 100644 --- a/src/test/checkqueue_tests.cpp +++ b/src/test/checkqueue_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp index f6b97a686..10ad8ef39 100644 --- a/src/test/coins_tests.cpp +++ b/src/test/coins_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/compress_tests.cpp b/src/test/compress_tests.cpp index e686c0516..a05f2c4ea 100644 --- a/src/test/compress_tests.cpp +++ b/src/test/compress_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/crypto_tests.cpp b/src/test/crypto_tests.cpp index 86cb00a78..e96254cf7 100644 --- a/src/test/crypto_tests.cpp +++ b/src/test/crypto_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -261,7 +261,7 @@ BOOST_AUTO_TEST_CASE(sha256_testvectors) { "f08a78cbbaee082b052ae0708f32fa1e50c5c421aa772ba5dbb406a2ea6be342"); TestSHA256("This is exactly 64 bytes long, not counting the terminating byte", "ab64eff7e88e2e46165e29f2bce41826bd4c7b3552f6b382a9e7d3af47c245f8"); - TestSHA256("As Bitcoin relies on 80 byte header hashes, we want to have an example for that.", + TestSHA256("As NYC3 relies on 80 byte header hashes, we want to have an example for that.", "7406e8de7d6e4fffc573daef05aefb8806e7790f55eab5576f31349743cca743"); TestSHA256(std::string(1000000, 'a'), "cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0"); diff --git a/src/test/cuckoocache_tests.cpp b/src/test/cuckoocache_tests.cpp index d8286520e..fa4299e2f 100644 --- a/src/test/cuckoocache_tests.cpp +++ b/src/test/cuckoocache_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include diff --git a/src/test/data/README.md b/src/test/data/README.md index 2463daa42..347227966 100644 --- a/src/test/data/README.md +++ b/src/test/data/README.md @@ -1,7 +1,7 @@ Description ------------ -This directory contains data-driven tests for various aspects of Bitcoin. +This directory contains data-driven tests for various aspects of NYC3. License -------- diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp index 94e8c9534..49bebdaec 100644 --- a/src/test/dbwrapper_tests.cpp +++ b/src/test/dbwrapper_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp index e5d62a3ab..7c3ff489e 100644 --- a/src/test/denialofservice_tests.cpp +++ b/src/test/denialofservice_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/descriptor_tests.cpp b/src/test/descriptor_tests.cpp index 826615cb5..ab6ed1b4f 100644 --- a/src/test/descriptor_tests.cpp +++ b/src/test/descriptor_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/fs_tests.cpp b/src/test/fs_tests.cpp index 93aee10bb..8a41f27dc 100644 --- a/src/test/fs_tests.cpp +++ b/src/test/fs_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. // diff --git a/src/test/fuzz/deserialize.cpp b/src/test/fuzz/deserialize.cpp index 859fba0bd..9c765221d 100644 --- a/src/test/fuzz/deserialize.cpp +++ b/src/test/fuzz/deserialize.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/fuzz/fuzz.cpp b/src/test/fuzz/fuzz.cpp index 0709da556..878814d59 100644 --- a/src/test/fuzz/fuzz.cpp +++ b/src/test/fuzz/fuzz.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2019 The Bitcoin Core developers +// Copyright (c) 2009-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/fuzz/fuzz.h b/src/test/fuzz/fuzz.h index ad62a5faf..0e73cd5ec 100644 --- a/src/test/fuzz/fuzz.h +++ b/src/test/fuzz/fuzz.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2019 The Bitcoin Core developers +// Copyright (c) 2009-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/fuzz/script_flags.cpp b/src/test/fuzz/script_flags.cpp index 2c0bfa360..ce163b0a7 100644 --- a/src/test/fuzz/script_flags.cpp +++ b/src/test/fuzz/script_flags.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2019 The Bitcoin Core developers +// Copyright (c) 2009-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/gen/crypto_gen.cpp b/src/test/gen/crypto_gen.cpp index ca8c65806..efca1387a 100644 --- a/src/test/gen/crypto_gen.cpp +++ b/src/test/gen/crypto_gen.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include diff --git a/src/test/gen/crypto_gen.h b/src/test/gen/crypto_gen.h index 7c2fb0350..8b2884867 100644 --- a/src/test/gen/crypto_gen.h +++ b/src/test/gen/crypto_gen.h @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_TEST_GEN_CRYPTO_GEN_H diff --git a/src/test/getarg_tests.cpp b/src/test/getarg_tests.cpp index 804823802..1ca21f092 100644 --- a/src/test/getarg_tests.cpp +++ b/src/test/getarg_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/hash_tests.cpp b/src/test/hash_tests.cpp index e8e504085..9f16aa784 100644 --- a/src/test/hash_tests.cpp +++ b/src/test/hash_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2013-2018 The Bitcoin Core developers +// Copyright (c) 2013-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -20,7 +20,7 @@ BOOST_AUTO_TEST_CASE(murmurhash3) // Test MurmurHash3 with various inputs. Of course this is retested in the // bloom filter tests - they would fail if MurmurHash3() had any problems - - // but is useful for those trying to implement Bitcoin libraries as a + // but is useful for those trying to implement NYC3 libraries as a // source of test data for their MurmurHash3() primitive during // development. // diff --git a/src/test/key_io_tests.cpp b/src/test/key_io_tests.cpp index bf295042d..45ba53a7e 100644 --- a/src/test/key_io_tests.cpp +++ b/src/test/key_io_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/key_properties.cpp b/src/test/key_properties.cpp index c564b4eab..3a4a1de5d 100644 --- a/src/test/key_properties.cpp +++ b/src/test/key_properties.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp index a768b4bcb..b08197aae 100644 --- a/src/test/key_tests.cpp +++ b/src/test/key_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/limitedmap_tests.cpp b/src/test/limitedmap_tests.cpp index 0788f75b0..e7e6cd272 100644 --- a/src/test/limitedmap_tests.cpp +++ b/src/test/limitedmap_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/main_tests.cpp b/src/test/main_tests.cpp index 5b3f2bc57..2614fad3b 100644 --- a/src/test/main_tests.cpp +++ b/src/test/main_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp index 23ca9d89a..8a0f2e7ce 100644 --- a/src/test/mempool_tests.cpp +++ b/src/test/mempool_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/merkle_tests.cpp b/src/test/merkle_tests.cpp index 4cdf0f003..e59a55e04 100644 --- a/src/test/merkle_tests.cpp +++ b/src/test/merkle_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -81,7 +81,7 @@ static void MerkleComputation(const std::vector& leaves, uint256* proot bool matchh = matchlevel == level; while (count != (((uint32_t)1) << level)) { // If we reach this point, h is an inner value that is not the top. - // We combine it with itself (Bitcoin's special rule for odd levels in + // We combine it with itself (NYC3's special rule for odd levels in // the tree) to produce a higher level one. if (pbranch && matchh) { pbranch->push_back(h); diff --git a/src/test/merkleblock_tests.cpp b/src/test/merkleblock_tests.cpp index 497859328..6de33bf90 100644 --- a/src/test/merkleblock_tests.cpp +++ b/src/test/merkleblock_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index 5ba1df2ec..5f3637846 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp index 8afe4b8a5..e68324fd5 100644 --- a/src/test/multisig_tests.cpp +++ b/src/test/multisig_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp index b4ae8e976..a2dee692b 100644 --- a/src/test/net_tests.cpp +++ b/src/test/net_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include diff --git a/src/test/netbase_tests.cpp b/src/test/netbase_tests.cpp index 0d557cff1..0d81518a2 100644 --- a/src/test/netbase_tests.cpp +++ b/src/test/netbase_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/pmt_tests.cpp b/src/test/pmt_tests.cpp index 502019280..8454c3b8e 100644 --- a/src/test/pmt_tests.cpp +++ b/src/test/pmt_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/policyestimator_tests.cpp b/src/test/policyestimator_tests.cpp index 7b274a165..7777a4ef5 100644 --- a/src/test/policyestimator_tests.cpp +++ b/src/test/policyestimator_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/pow_tests.cpp b/src/test/pow_tests.cpp index 26cdc9bc5..f4cceac13 100644 --- a/src/test/pow_tests.cpp +++ b/src/test/pow_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp index 734138920..17f5070d4 100644 --- a/src/test/prevector_tests.cpp +++ b/src/test/prevector_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/raii_event_tests.cpp b/src/test/raii_event_tests.cpp index bdb411d53..394e147e0 100644 --- a/src/test/raii_event_tests.cpp +++ b/src/test/raii_event_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/random_tests.cpp b/src/test/random_tests.cpp index 8194070ab..e99f01389 100644 --- a/src/test/random_tests.cpp +++ b/src/test/random_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/reverselock_tests.cpp b/src/test/reverselock_tests.cpp index 91c76fda8..1d78ff434 100644 --- a/src/test/reverselock_tests.cpp +++ b/src/test/reverselock_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp index ff4839892..2bb0c9b49 100644 --- a/src/test/rpc_tests.cpp +++ b/src/test/rpc_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/sanity_tests.cpp b/src/test/sanity_tests.cpp index 8085a2192..d51310f33 100644 --- a/src/test/sanity_tests.cpp +++ b/src/test/sanity_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/scheduler_tests.cpp b/src/test/scheduler_tests.cpp index 100d65b77..8f4f82695 100644 --- a/src/test/scheduler_tests.cpp +++ b/src/test/scheduler_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/script_p2sh_tests.cpp b/src/test/script_p2sh_tests.cpp index 3a2a11ef9..1d221b49e 100644 --- a/src/test/script_p2sh_tests.cpp +++ b/src/test/script_p2sh_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/script_standard_tests.cpp b/src/test/script_standard_tests.cpp index bde82018c..edcb9fb2b 100644 --- a/src/test/script_standard_tests.cpp +++ b/src/test/script_standard_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index 87c3e74df..f52ccd85c 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/scriptnum10.h b/src/test/scriptnum10.h index 5052863c5..582b91af8 100644 --- a/src/test/scriptnum10.h +++ b/src/test/scriptnum10.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/scriptnum_tests.cpp b/src/test/scriptnum_tests.cpp index f9b407ce3..1ebc4ff3a 100644 --- a/src/test/scriptnum_tests.cpp +++ b/src/test/scriptnum_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp index 002f61f6a..f151d2d20 100644 --- a/src/test/serialize_tests.cpp +++ b/src/test/serialize_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp index 04d5462ac..f61f0b42a 100644 --- a/src/test/sighash_tests.cpp +++ b/src/test/sighash_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2013-2018 The Bitcoin Core developers +// Copyright (c) 2013-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp index 6a0349cd4..0c3a3af7a 100644 --- a/src/test/sigopcount_tests.cpp +++ b/src/test/sigopcount_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/skiplist_tests.cpp b/src/test/skiplist_tests.cpp index 5c46976ac..6bdee46c9 100644 --- a/src/test/skiplist_tests.cpp +++ b/src/test/skiplist_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/streams_tests.cpp b/src/test/streams_tests.cpp index a1940eb80..061715826 100644 --- a/src/test/streams_tests.cpp +++ b/src/test/streams_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/sync_tests.cpp b/src/test/sync_tests.cpp index df0380546..446c55a7a 100644 --- a/src/test/sync_tests.cpp +++ b/src/test/sync_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2017 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp index 0c3fb7c39..38e313929 100644 --- a/src/test/test_bitcoin.cpp +++ b/src/test/test_bitcoin.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/test_bitcoin.h b/src/test/test_bitcoin.h index 4a0684568..c8c84b804 100644 --- a/src/test/test_bitcoin.h +++ b/src/test/test_bitcoin.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/test_bitcoin_main.cpp b/src/test/test_bitcoin_main.cpp index 46b63b93b..201b9c6b7 100644 --- a/src/test/test_bitcoin_main.cpp +++ b/src/test/test_bitcoin_main.cpp @@ -1,8 +1,8 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#define BOOST_TEST_MODULE Bitcoin Test Suite +#define BOOST_TEST_MODULE NYC3 Test Suite #include #include diff --git a/src/test/timedata_tests.cpp b/src/test/timedata_tests.cpp index 474a67497..e87fcfdc8 100644 --- a/src/test/timedata_tests.cpp +++ b/src/test/timedata_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. // diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index 39cff3f46..b0685fa0c 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/txindex_tests.cpp b/src/test/txindex_tests.cpp index d667c26c3..99591c97c 100644 --- a/src/test/txindex_tests.cpp +++ b/src/test/txindex_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/txvalidation_tests.cpp b/src/test/txvalidation_tests.cpp index c2777cd6d..e6b7de2d3 100644 --- a/src/test/txvalidation_tests.cpp +++ b/src/test/txvalidation_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp index 4d04aae7e..86f9d88c3 100644 --- a/src/test/txvalidationcache_tests.cpp +++ b/src/test/txvalidationcache_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/uint256_tests.cpp b/src/test/uint256_tests.cpp index cca5e2029..c2977ae6c 100644 --- a/src/test/uint256_tests.cpp +++ b/src/test/uint256_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index 71b6ec742..8377f23d4 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -1252,7 +1252,7 @@ BOOST_AUTO_TEST_CASE(test_ToUpper) BOOST_AUTO_TEST_CASE(test_Capitalize) { BOOST_CHECK_EQUAL(Capitalize(""), ""); - BOOST_CHECK_EQUAL(Capitalize("bitcoin"), "Bitcoin"); + BOOST_CHECK_EQUAL(Capitalize("bitcoin"), "NYC3"); BOOST_CHECK_EQUAL(Capitalize("\x00\xfe\xff"), "\x00\xfe\xff"); } diff --git a/src/test/validation_block_tests.cpp b/src/test/validation_block_tests.cpp index c1f9d60fb..d12bb9532 100644 --- a/src/test/validation_block_tests.cpp +++ b/src/test/validation_block_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/versionbits_tests.cpp b/src/test/versionbits_tests.cpp index ca3196454..59c3fea1d 100644 --- a/src/test/versionbits_tests.cpp +++ b/src/test/versionbits_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/threadinterrupt.cpp b/src/threadinterrupt.cpp index 340106ed9..043d0d37e 100644 --- a/src/threadinterrupt.cpp +++ b/src/threadinterrupt.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/threadinterrupt.h b/src/threadinterrupt.h index 274357137..0a2e59aff 100644 --- a/src/threadinterrupt.h +++ b/src/threadinterrupt.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/threadsafety.h b/src/threadsafety.h index 33acddc65..577f8ddf7 100644 --- a/src/threadsafety.h +++ b/src/threadsafety.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/timedata.cpp b/src/timedata.cpp index 9c022c9ad..d561975c5 100644 --- a/src/timedata.cpp +++ b/src/timedata.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/timedata.h b/src/timedata.h index b165ecde2..9a95a4914 100644 --- a/src/timedata.h +++ b/src/timedata.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp index 550e23b22..4f61a9367 100644 --- a/src/torcontrol.cpp +++ b/src/torcontrol.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Copyright (c) 2017 The Zcash developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -401,7 +401,7 @@ static bool WriteBinaryFile(const fs::path &filename, const std::string &data) return true; } -/****** Bitcoin specific TorController implementation ********/ +/****** NYC3 specific TorController implementation ********/ /** Controller that connects to Tor control socket, authenticate, then create * and maintain an ephemeral hidden service. diff --git a/src/torcontrol.h b/src/torcontrol.h index 079146b54..c9e7990cf 100644 --- a/src/torcontrol.h +++ b/src/torcontrol.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/txdb.cpp b/src/txdb.cpp index b1655c008..6573dc684 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/txdb.h b/src/txdb.h index d5a4bfaeb..59ca7f623 100644 --- a/src/txdb.h +++ b/src/txdb.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 68f47d5cc..94bd6889a 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/txmempool.h b/src/txmempool.h index f7afaec8f..b99170fad 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/ui_interface.cpp b/src/ui_interface.cpp index 947d7e230..8fdf48abe 100644 --- a/src/ui_interface.cpp +++ b/src/ui_interface.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2010-2018 The Bitcoin Core developers +// Copyright (c) 2010-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/ui_interface.h b/src/ui_interface.h index fe466b3ca..99a901ee1 100644 --- a/src/ui_interface.h +++ b/src/ui_interface.h @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/uint256.cpp b/src/uint256.cpp index e3bc9712e..3b7a37620 100644 --- a/src/uint256.cpp +++ b/src/uint256.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/uint256.h b/src/uint256.h index 8010a04c3..7dac11e40 100644 --- a/src/uint256.h +++ b/src/uint256.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/undo.h b/src/undo.h index 3f50f4caa..6471e71ba 100644 --- a/src/undo.h +++ b/src/undo.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/univalue/test/object.cpp b/src/univalue/test/object.cpp index 70ccc0d08..88ec0fafd 100644 --- a/src/univalue/test/object.cpp +++ b/src/univalue/test/object.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2014 BitPay Inc. -// Copyright (c) 2014-2016 The Bitcoin Core developers +// Copyright (c) 2014-2016 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/bip32.cpp b/src/util/bip32.cpp index 6f176dd5e..ad9a80564 100644 --- a/src/util/bip32.cpp +++ b/src/util/bip32.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2019 The Bitcoin Core developers +// Copyright (c) 2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/bip32.h b/src/util/bip32.h index 7e58b79f3..96d9f9c7f 100644 --- a/src/util/bip32.h +++ b/src/util/bip32.h @@ -1,4 +1,4 @@ -// Copyright (c) 2019 The Bitcoin Core developers +// Copyright (c) 2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/bytevectorhash.cpp b/src/util/bytevectorhash.cpp index f87d0e04b..099a42a0e 100644 --- a/src/util/bytevectorhash.cpp +++ b/src/util/bytevectorhash.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/bytevectorhash.h b/src/util/bytevectorhash.h index b88c17460..e9ebfe572 100644 --- a/src/util/bytevectorhash.h +++ b/src/util/bytevectorhash.h @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/memory.h b/src/util/memory.h index 15ecf8f80..3e2c8ecbe 100644 --- a/src/util/memory.h +++ b/src/util/memory.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/moneystr.cpp b/src/util/moneystr.cpp index f4e41eea4..a3b4fc0b6 100644 --- a/src/util/moneystr.cpp +++ b/src/util/moneystr.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/moneystr.h b/src/util/moneystr.h index b8e2812a9..b96c26bba 100644 --- a/src/util/moneystr.h +++ b/src/util/moneystr.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/strencodings.cpp b/src/util/strencodings.cpp index 0acbb4f11..cb7c44eaa 100644 --- a/src/util/strencodings.cpp +++ b/src/util/strencodings.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/strencodings.h b/src/util/strencodings.h index 0ca138589..d49038e0f 100644 --- a/src/util/strencodings.h +++ b/src/util/strencodings.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/system.cpp b/src/util/system.cpp index ccb803b35..0dc30c3e0 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -680,13 +680,13 @@ void PrintExceptionContinue(const std::exception* pex, const char* pszThread) fs::path GetDefaultDataDir() { - // Windows < Vista: C:\Documents and Settings\Username\Application Data\Bitcoin - // Windows >= Vista: C:\Users\Username\AppData\Roaming\Bitcoin - // Mac: ~/Library/Application Support/Bitcoin + // Windows < Vista: C:\Documents and Settings\Username\Application Data\NYC3 + // Windows >= Vista: C:\Users\Username\AppData\Roaming\NYC3 + // Mac: ~/Library/Application Support/NYC3 // Unix: ~/.bitcoin #ifdef WIN32 // Windows - return GetSpecialFolderPath(CSIDL_APPDATA) / "Bitcoin"; + return GetSpecialFolderPath(CSIDL_APPDATA) / "NYC3"; #else fs::path pathRet; char* pszHome = getenv("HOME"); @@ -696,7 +696,7 @@ fs::path GetDefaultDataDir() pathRet = fs::path(pszHome); #ifdef MAC_OSX // Mac - return pathRet / "Library/Application Support/Bitcoin"; + return pathRet / "Library/Application Support/NYC3"; #else // Unix return pathRet / ".nyc3"; @@ -1222,7 +1222,7 @@ std::string CopyrightHolders(const std::string& strPrefix) // Check for untranslated substitution to make sure NYC3 copyright is not removed by accident if (strprintf(COPYRIGHT_HOLDERS, COPYRIGHT_HOLDERS_SUBSTITUTION).find("NYC3") == std::string::npos) { - strCopyrightHolders += "\n" + strPrefix + "The Bitcoin Core developers"; + strCopyrightHolders += "\n" + strPrefix + "The NYC3 Core developers"; } return strCopyrightHolders; } diff --git a/src/util/system.h b/src/util/system.h index ec48932a0..43a114ed7 100644 --- a/src/util/system.h +++ b/src/util/system.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/time.cpp b/src/util/time.cpp index 83a7937d8..db5ba015a 100644 --- a/src/util/time.cpp +++ b/src/util/time.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/time.h b/src/util/time.h index f2e274743..4e538e2d0 100644 --- a/src/util/time.h +++ b/src/util/time.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/validation.cpp b/src/validation.cpp index f171d28ac..1d246eee1 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -48,7 +48,7 @@ #include #if defined(NDEBUG) -# error "Bitcoin cannot be compiled without assertions." +# error "NYC3 cannot be compiled without assertions." #endif #define MICRO 0.000001 @@ -257,7 +257,7 @@ std::atomic_bool g_is_mempool_loaded{false}; /** Constant stuff for coinbase transactions we create: */ CScript COINBASE_FLAGS; -const std::string strMessageMagic = "Bitcoin Signed Message:\n"; +const std::string strMessageMagic = "NYC3 Signed Message:\n"; // Internal stuff namespace { diff --git a/src/validation.h b/src/validation.h index 6b0f215b1..7aca9b2d5 100644 --- a/src/validation.h +++ b/src/validation.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2019 The Bitcoin Core developers +// Copyright (c) 2009-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp index 70c274d20..d49a2355a 100644 --- a/src/validationinterface.cpp +++ b/src/validationinterface.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/validationinterface.h b/src/validationinterface.h index f0374e8e7..8c8dbdcb0 100644 --- a/src/validationinterface.h +++ b/src/validationinterface.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/version.h b/src/version.h index d932b512d..0aa62e1ec 100644 --- a/src/version.h +++ b/src/version.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2018 The Bitcoin Core developers +// Copyright (c) 2012-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/versionbits.cpp b/src/versionbits.cpp index 3f297c0eb..6f9b1c30c 100644 --- a/src/versionbits.cpp +++ b/src/versionbits.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/versionbits.h b/src/versionbits.h index cdc947cd9..d20975399 100644 --- a/src/versionbits.h +++ b/src/versionbits.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/versionbitsinfo.cpp b/src/versionbitsinfo.cpp index ecf348292..843d2cd9c 100644 --- a/src/versionbitsinfo.cpp +++ b/src/versionbitsinfo.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/versionbitsinfo.h b/src/versionbitsinfo.h index a7822bc74..ed66d531e 100644 --- a/src/versionbitsinfo.h +++ b/src/versionbitsinfo.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/coincontrol.cpp b/src/wallet/coincontrol.cpp index 87d2c4f06..80ac14d3a 100644 --- a/src/wallet/coincontrol.cpp +++ b/src/wallet/coincontrol.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/coincontrol.h b/src/wallet/coincontrol.h index 48a924abf..6b4174b6c 100644 --- a/src/wallet/coincontrol.h +++ b/src/wallet/coincontrol.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2018 The Bitcoin Core developers +// Copyright (c) 2011-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/coinselection.cpp b/src/wallet/coinselection.cpp index 8a37f374a..de4e93ca2 100644 --- a/src/wallet/coinselection.cpp +++ b/src/wallet/coinselection.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/coinselection.h b/src/wallet/coinselection.h index 5348401f4..341173081 100644 --- a/src/wallet/coinselection.h +++ b/src/wallet/coinselection.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/crypter.cpp b/src/wallet/crypter.cpp index a255177e3..360498b5d 100644 --- a/src/wallet/crypter.cpp +++ b/src/wallet/crypter.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h index 8e195ca8f..058da82ab 100644 --- a/src/wallet/crypter.h +++ b/src/wallet/crypter.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp index 99d880daa..44da00db7 100644 --- a/src/wallet/db.cpp +++ b/src/wallet/db.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/db.h b/src/wallet/db.h index 9df965305..827ad8f31 100644 --- a/src/wallet/db.h +++ b/src/wallet/db.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/feebumper.cpp b/src/wallet/feebumper.cpp index 7a71aea71..8b2c8ee8b 100644 --- a/src/wallet/feebumper.cpp +++ b/src/wallet/feebumper.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/feebumper.h b/src/wallet/feebumper.h index a1eb5d0e0..e0db92ee2 100644 --- a/src/wallet/feebumper.h +++ b/src/wallet/feebumper.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/fees.cpp b/src/wallet/fees.cpp index 9e2984ff0..879d2d0ca 100644 --- a/src/wallet/fees.cpp +++ b/src/wallet/fees.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/fees.h b/src/wallet/fees.h index 6bfee456c..5a6231dc6 100644 --- a/src/wallet/fees.h +++ b/src/wallet/fees.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp index 20d540c8d..d9bdba4d9 100644 --- a/src/wallet/init.cpp +++ b/src/wallet/init.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/psbtwallet.cpp b/src/wallet/psbtwallet.cpp index 1b17b0976..c5d4af2b1 100644 --- a/src/wallet/psbtwallet.cpp +++ b/src/wallet/psbtwallet.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/psbtwallet.h b/src/wallet/psbtwallet.h index a24a0967d..37b0dda13 100644 --- a/src/wallet/psbtwallet.h +++ b/src/wallet/psbtwallet.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2019 The Bitcoin Core developers +// Copyright (c) 2009-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index c63fdd80f..43e0ca27d 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -821,7 +821,7 @@ UniValue dumpwallet(const JSONRPCRequest& request) std::sort(vKeyBirth.begin(), vKeyBirth.end()); // produce output - file << strprintf("# Wallet dump created by Bitcoin %s\n", CLIENT_BUILD); + file << strprintf("# Wallet dump created by NYC3 %s\n", CLIENT_BUILD); file << strprintf("# * Created on %s\n", FormatISO8601DateTime(GetTime())); const Optional tip_height = locked_chain->getHeight(); file << strprintf("# * Best block at time of backup was %i (%s),\n", tip_height.get_value_or(-1), tip_height ? locked_chain->getBlockHash(*tip_height).ToString() : "(missing block hash)"); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 12c92a54d..c7665e52b 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/rpcwallet.h b/src/wallet/rpcwallet.h index 58053bde5..1503e9456 100644 --- a/src/wallet/rpcwallet.h +++ b/src/wallet/rpcwallet.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/coinselector_tests.cpp b/src/wallet/test/coinselector_tests.cpp index 5c65acf60..babe7a5c5 100644 --- a/src/wallet/test/coinselector_tests.cpp +++ b/src/wallet/test/coinselector_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/db_tests.cpp b/src/wallet/test/db_tests.cpp index 2a6474937..886c5b362 100644 --- a/src/wallet/test/db_tests.cpp +++ b/src/wallet/test/db_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/init_test_fixture.cpp b/src/wallet/test/init_test_fixture.cpp index 3b828d57f..b8a72e432 100644 --- a/src/wallet/test/init_test_fixture.cpp +++ b/src/wallet/test/init_test_fixture.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/init_test_fixture.h b/src/wallet/test/init_test_fixture.h index cd47b31da..2c912a333 100644 --- a/src/wallet/test/init_test_fixture.h +++ b/src/wallet/test/init_test_fixture.h @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/init_tests.cpp b/src/wallet/test/init_tests.cpp index 5852d3ef8..d16eaed42 100644 --- a/src/wallet/test/init_tests.cpp +++ b/src/wallet/test/init_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/psbt_wallet_tests.cpp b/src/wallet/test/psbt_wallet_tests.cpp index 789e86e21..118af127b 100644 --- a/src/wallet/test/psbt_wallet_tests.cpp +++ b/src/wallet/test/psbt_wallet_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/wallet_crypto_tests.cpp b/src/wallet/test/wallet_crypto_tests.cpp index ae7092fa8..4975d0ec2 100644 --- a/src/wallet/test/wallet_crypto_tests.cpp +++ b/src/wallet/test/wallet_crypto_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/wallet_test_fixture.cpp b/src/wallet/test/wallet_test_fixture.cpp index a5fb1db86..5b0a65b2f 100644 --- a/src/wallet/test/wallet_test_fixture.cpp +++ b/src/wallet/test/wallet_test_fixture.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/wallet_test_fixture.h b/src/wallet/test/wallet_test_fixture.h index e6fe8c947..75702b584 100644 --- a/src/wallet/test/wallet_test_fixture.h +++ b/src/wallet/test/wallet_test_fixture.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp index e674b2fae..9e7d26cb7 100644 --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2019 The Bitcoin Core developers +// Copyright (c) 2012-2019 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index b1b2a6316..0579667ca 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 291176c33..e4132588e 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index 2783f83fd..b9598b183 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h index 0532a55ff..ae9860dda 100644 --- a/src/wallet/walletdb.h +++ b/src/wallet/walletdb.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/wallettool.cpp b/src/wallet/wallettool.cpp index 797f05118..bba004137 100644 --- a/src/wallet/wallettool.cpp +++ b/src/wallet/wallettool.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/wallettool.h b/src/wallet/wallettool.h index 5b06fd179..2497c98e9 100644 --- a/src/wallet/wallettool.h +++ b/src/wallet/wallettool.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/walletutil.cpp b/src/wallet/walletutil.cpp index 2d8adf8ba..49cb51c97 100644 --- a/src/wallet/walletutil.cpp +++ b/src/wallet/walletutil.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/walletutil.h b/src/wallet/walletutil.h index ba2f91384..4105e1270 100644 --- a/src/wallet/walletutil.h +++ b/src/wallet/walletutil.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/walletinitinterface.h b/src/walletinitinterface.h index 22aca6599..bc4e65b07 100644 --- a/src/walletinitinterface.h +++ b/src/walletinitinterface.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2018 The Bitcoin Core developers +// Copyright (c) 2017-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/warnings.cpp b/src/warnings.cpp index 1c6ba13f6..432bef37a 100644 --- a/src/warnings.cpp +++ b/src/warnings.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/warnings.h b/src/warnings.h index 16c8f7b52..c951c9dfa 100644 --- a/src/warnings.h +++ b/src/warnings.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zmq/zmqabstractnotifier.cpp b/src/zmq/zmqabstractnotifier.cpp index 6a9661e3e..7609a4d61 100644 --- a/src/zmq/zmqabstractnotifier.cpp +++ b/src/zmq/zmqabstractnotifier.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zmq/zmqabstractnotifier.h b/src/zmq/zmqabstractnotifier.h index 887dde7b2..4d70d464a 100644 --- a/src/zmq/zmqabstractnotifier.h +++ b/src/zmq/zmqabstractnotifier.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zmq/zmqconfig.h b/src/zmq/zmqconfig.h index 5219ffad4..4f705e90f 100644 --- a/src/zmq/zmqconfig.h +++ b/src/zmq/zmqconfig.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 The Bitcoin Core developers +// Copyright (c) 2014-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp index 6826cf62d..3937c10ee 100644 --- a/src/zmq/zmqnotificationinterface.cpp +++ b/src/zmq/zmqnotificationinterface.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zmq/zmqnotificationinterface.h b/src/zmq/zmqnotificationinterface.h index a0cc26a16..c3e94d307 100644 --- a/src/zmq/zmqnotificationinterface.h +++ b/src/zmq/zmqnotificationinterface.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp index ba89d1401..95730e3cb 100644 --- a/src/zmq/zmqpublishnotifier.cpp +++ b/src/zmq/zmqpublishnotifier.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zmq/zmqpublishnotifier.h b/src/zmq/zmqpublishnotifier.h index 278fdb94d..5dfff6c3c 100644 --- a/src/zmq/zmqpublishnotifier.h +++ b/src/zmq/zmqpublishnotifier.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zmq/zmqrpc.cpp b/src/zmq/zmqrpc.cpp index a34968ef7..e84b9c31f 100644 --- a/src/zmq/zmqrpc.cpp +++ b/src/zmq/zmqrpc.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zmq/zmqrpc.h b/src/zmq/zmqrpc.h index 5a810a16f..ea6ec6177 100644 --- a/src/zmq/zmqrpc.h +++ b/src/zmq/zmqrpc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2018 The Bitcoin Core developers +// Copyright (c) 2018 The NYC3 Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/test/config.ini.in b/test/config.ini.in index 6b7ef7065..1b09ae5b2 100644 --- a/test/config.ini.in +++ b/test/config.ini.in @@ -1,4 +1,4 @@ -# Copyright (c) 2013-2016 The Bitcoin Core developers +# Copyright (c) 2013-2016 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/test/functional/README.md b/test/functional/README.md index 3f9074cfb..71b6fc48b 100644 --- a/test/functional/README.md +++ b/test/functional/README.md @@ -29,7 +29,7 @@ don't have test cases for. - Avoid wildcard imports - Use a module-level docstring to describe what the test is testing, and how it is testing it. -- When subclassing the BitcoinTestFramwork, place overrides for the +- When subclassing the NYC3TestFramwork, place overrides for the `set_test_params()`, `add_options()` and `setup_xxxx()` methods at the top of the subclass, then locally-defined helper methods, then the `run_test()` method. - Use `'{}'.format(x)` for string formatting, not `'%s' % x`. diff --git a/test/functional/create_cache.py b/test/functional/create_cache.py index edf16fa47..36d558080 100755 --- a/test/functional/create_cache.py +++ b/test/functional/create_cache.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2018 The Bitcoin Core developers +# Copyright (c) 2016-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Create a blockchain cache. @@ -9,9 +9,9 @@ multiple functional tests. This helper script is executed by test_runner when mu tests are being run in parallel. """ -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework -class CreateCache(BitcoinTestFramework): +class CreateCache(NYC3TestFramework): # Test network and test nodes are not required: def set_test_params(self): diff --git a/test/functional/data/invalid_txs.py b/test/functional/data/invalid_txs.py index 02deae92f..06de3b8a9 100644 --- a/test/functional/data/invalid_txs.py +++ b/test/functional/data/invalid_txs.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """ diff --git a/test/functional/example_test.py b/test/functional/example_test.py index f367e4fca..cd73452cd 100755 --- a/test/functional/example_test.py +++ b/test/functional/example_test.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """An example functional test @@ -22,7 +22,7 @@ from test_framework.mininode import ( msg_block, msg_getdata, ) -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, connect_nodes, @@ -64,12 +64,12 @@ def custom_function(): If this function is more generally useful for other tests, consider moving it to a module in test_framework.""" - # self.log.info("running custom_function") # Oops! Can't run self.log outside the BitcoinTestFramework + # self.log.info("running custom_function") # Oops! Can't run self.log outside the NYC3TestFramework pass -class ExampleTest(BitcoinTestFramework): - # Each functional test is a subclass of the BitcoinTestFramework class. +class ExampleTest(NYC3TestFramework): + # Each functional test is a subclass of the NYC3TestFramework class. # Override the set_test_params(), skip_test_if_missing_module(), add_options(), setup_chain(), setup_network() # and setup_nodes() methods to customize the test setup as required. @@ -129,7 +129,7 @@ class ExampleTest(BitcoinTestFramework): Define it in a method here because you're going to use it repeatedly. If you think it's useful in general, consider moving it to the base - BitcoinTestFramework class so other tests can use it.""" + NYC3TestFramework class so other tests can use it.""" self.log.info("Running custom_method") diff --git a/test/functional/feature_assumevalid.py b/test/functional/feature_assumevalid.py index 0eb3dd440..f75d5a0d2 100755 --- a/test/functional/feature_assumevalid.py +++ b/test/functional/feature_assumevalid.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test logic for skipping signature validation on old blocks. @@ -44,7 +44,7 @@ from test_framework.messages import ( ) from test_framework.mininode import P2PInterface from test_framework.script import (CScript, OP_TRUE) -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal class BaseNode(P2PInterface): @@ -53,7 +53,7 @@ class BaseNode(P2PInterface): headers_message.headers = [CBlockHeader(b) for b in new_blocks] self.send_message(headers_message) -class AssumeValidTest(BitcoinTestFramework): +class AssumeValidTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 3 diff --git a/test/functional/feature_bip68_sequence.py b/test/functional/feature_bip68_sequence.py index 8466f851c..dfb8eacfa 100755 --- a/test/functional/feature_bip68_sequence.py +++ b/test/functional/feature_bip68_sequence.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test BIP68 implementation.""" @@ -9,7 +9,7 @@ import time from test_framework.blocktools import create_block, create_coinbase, add_witness_commitment from test_framework.messages import COIN, COutPoint, CTransaction, CTxIn, CTxOut, FromHex, ToHex from test_framework.script import CScript -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_greater_than, assert_raises_rpc_error, bytes_to_hex_str, get_bip9_status, satoshi_round, sync_blocks SEQUENCE_LOCKTIME_DISABLE_FLAG = (1<<31) @@ -20,7 +20,7 @@ SEQUENCE_LOCKTIME_MASK = 0x0000ffff # RPC error for non-BIP68 final transactions NOT_FINAL_ERROR = "non-BIP68-final (code 64)" -class BIP68Test(BitcoinTestFramework): +class BIP68Test(NYC3TestFramework): def set_test_params(self): self.num_nodes = 2 self.extra_args = [[], ["-acceptnonstdtxn=0"]] diff --git a/test/functional/feature_block.py b/test/functional/feature_block.py index 5253ff7aa..1f2029b62 100755 --- a/test/functional/feature_block.py +++ b/test/functional/feature_block.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2019 The Bitcoin Core developers +# Copyright (c) 2015-2019 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test block processing.""" @@ -49,7 +49,7 @@ from test_framework.script import ( SignatureHash, hash160, ) -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal from data import invalid_txs @@ -74,7 +74,7 @@ class CBrokenBlock(CBlock): def normal_serialize(self): return super().serialize() -class FullBlockTest(BitcoinTestFramework): +class FullBlockTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 self.setup_clean_chain = True diff --git a/test/functional/feature_blocksdir.py b/test/functional/feature_blocksdir.py index 3a4889bbe..f8ce8cf73 100755 --- a/test/functional/feature_blocksdir.py +++ b/test/functional/feature_blocksdir.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the blocksdir option. @@ -8,10 +8,10 @@ import os import shutil -from test_framework.test_framework import BitcoinTestFramework, initialize_datadir +from test_framework.test_framework import NYC3TestFramework, initialize_datadir -class BlocksdirTest(BitcoinTestFramework): +class BlocksdirTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 1 diff --git a/test/functional/feature_cltv.py b/test/functional/feature_cltv.py index 96c5e49b0..25bb22ccf 100755 --- a/test/functional/feature_cltv.py +++ b/test/functional/feature_cltv.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test BIP65 (CHECKLOCKTIMEVERIFY). @@ -12,7 +12,7 @@ from test_framework.blocktools import create_coinbase, create_block, create_tran from test_framework.messages import CTransaction, msg_block, ToHex from test_framework.mininode import P2PInterface from test_framework.script import CScript, OP_1NEGATE, OP_CHECKLOCKTIMEVERIFY, OP_DROP, CScriptNum -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, bytes_to_hex_str, @@ -55,7 +55,7 @@ def cltv_validate(node, tx, height): return new_tx -class BIP65Test(BitcoinTestFramework): +class BIP65Test(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 self.extra_args = [['-whitelist=127.0.0.1', '-par=1']] # Use only one script thread to get the exact reject reason for testing diff --git a/test/functional/feature_config_args.py b/test/functional/feature_config_args.py index 4b3f6603a..d71633c59 100755 --- a/test/functional/feature_config_args.py +++ b/test/functional/feature_config_args.py @@ -1,15 +1,15 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test various command line arguments and configuration file parameters.""" import os -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework -class ConfArgsTest(BitcoinTestFramework): +class ConfArgsTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 1 diff --git a/test/functional/feature_csv_activation.py b/test/functional/feature_csv_activation.py index df79c4312..f37905fd2 100755 --- a/test/functional/feature_csv_activation.py +++ b/test/functional/feature_csv_activation.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test activation of the first version bits soft fork. @@ -55,7 +55,7 @@ from test_framework.script import ( OP_CHECKSEQUENCEVERIFY, OP_DROP, ) -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, get_bip9_status, @@ -139,7 +139,7 @@ def create_bip112txs(node, bip112inputs, varyOP_CSV, txversion, address, locktim txs.append({'tx': signtx, 'sdf': sdf, 'stf': stf}) return txs -class BIP68_112_113Test(BitcoinTestFramework): +class BIP68_112_113Test(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 self.setup_clean_chain = True diff --git a/test/functional/feature_dbcrash.py b/test/functional/feature_dbcrash.py index 8b06cc737..68929a19e 100755 --- a/test/functional/feature_dbcrash.py +++ b/test/functional/feature_dbcrash.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test recovery from a crash during chainstate writing. @@ -32,7 +32,7 @@ import sys import time from test_framework.messages import COIN, COutPoint, CTransaction, CTxIn, CTxOut, ToHex -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, create_confirmed_utxos, hex_str_to_bytes HTTP_DISCONNECT_ERRORS = [http.client.CannotSendRequest] @@ -41,7 +41,7 @@ try: except AttributeError: pass -class ChainstateWriteCrashTest(BitcoinTestFramework): +class ChainstateWriteCrashTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 4 self.setup_clean_chain = False diff --git a/test/functional/feature_dersig.py b/test/functional/feature_dersig.py index 8ff9498ef..4e0e7ac92 100755 --- a/test/functional/feature_dersig.py +++ b/test/functional/feature_dersig.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test BIP66 (DER SIG). @@ -11,7 +11,7 @@ from test_framework.blocktools import create_coinbase, create_block, create_tran from test_framework.messages import msg_block from test_framework.mininode import mininode_lock, P2PInterface from test_framework.script import CScript -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, bytes_to_hex_str, @@ -42,7 +42,7 @@ def unDERify(tx): -class BIP66Test(BitcoinTestFramework): +class BIP66Test(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 self.extra_args = [['-whitelist=127.0.0.1', '-par=1', '-enablebip61']] # Use only one script thread to get the exact reject reason for testing diff --git a/test/functional/feature_fee_estimation.py b/test/functional/feature_fee_estimation.py index b68e46adb..f5a663f4e 100755 --- a/test/functional/feature_fee_estimation.py +++ b/test/functional/feature_fee_estimation.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test fee estimation code.""" @@ -8,7 +8,7 @@ import random from test_framework.messages import CTransaction, CTxIn, CTxOut, COutPoint, ToHex, COIN from test_framework.script import CScript, OP_1, OP_DROP, OP_2, OP_HASH160, OP_EQUAL, hash160, OP_TRUE -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, assert_greater_than, @@ -122,7 +122,7 @@ def check_estimates(node, fees_seen): else: assert_greater_than_or_equal(i + 1, e["blocks"]) -class EstimateFeeTest(BitcoinTestFramework): +class EstimateFeeTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 3 diff --git a/test/functional/feature_filelock.py b/test/functional/feature_filelock.py index 22d3b2832..b62a18b2c 100755 --- a/test/functional/feature_filelock.py +++ b/test/functional/feature_filelock.py @@ -1,14 +1,14 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Check that it's not possible to start a second bitcoind instance using the same datadir or wallet.""" import os -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.test_node import ErrorMatch -class FilelockTest(BitcoinTestFramework): +class FilelockTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 2 diff --git a/test/functional/feature_help.py b/test/functional/feature_help.py index ed1d25c0d..31df6d521 100755 --- a/test/functional/feature_help.py +++ b/test/functional/feature_help.py @@ -1,13 +1,13 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Verify that starting bitcoin with -h works as expected.""" -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal -class HelpTest(BitcoinTestFramework): +class HelpTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 1 diff --git a/test/functional/feature_includeconf.py b/test/functional/feature_includeconf.py index d06f6826f..9eb78fc40 100755 --- a/test/functional/feature_includeconf.py +++ b/test/functional/feature_includeconf.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Tests the includeconf argument @@ -16,9 +16,9 @@ Verify that: """ import os -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework -class IncludeConfTest(BitcoinTestFramework): +class IncludeConfTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = False self.num_nodes = 1 diff --git a/test/functional/feature_logging.py b/test/functional/feature_logging.py index 8bb7e0269..0eebdcdf9 100755 --- a/test/functional/feature_logging.py +++ b/test/functional/feature_logging.py @@ -1,16 +1,16 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test debug logging.""" import os -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.test_node import ErrorMatch -class LoggingTest(BitcoinTestFramework): +class LoggingTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 self.setup_clean_chain = True diff --git a/test/functional/feature_maxuploadtarget.py b/test/functional/feature_maxuploadtarget.py index 87c318de9..2a7d377bf 100755 --- a/test/functional/feature_maxuploadtarget.py +++ b/test/functional/feature_maxuploadtarget.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test behavior of -maxuploadtarget. @@ -15,7 +15,7 @@ import time from test_framework.messages import CInv, msg_getdata from test_framework.mininode import P2PInterface -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, mine_large_block class TestP2PConn(P2PInterface): @@ -30,7 +30,7 @@ class TestP2PConn(P2PInterface): message.block.calc_sha256() self.block_receive_map[message.block.sha256] += 1 -class MaxUploadTest(BitcoinTestFramework): +class MaxUploadTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True diff --git a/test/functional/feature_minchainwork.py b/test/functional/feature_minchainwork.py index dbff6f15f..3a7e8d2bf 100755 --- a/test/functional/feature_minchainwork.py +++ b/test/functional/feature_minchainwork.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test logic for setting nMinimumChainWork on command line. @@ -17,13 +17,13 @@ only succeeds past a given node once its nMinimumChainWork has been exceeded. import time -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import connect_nodes, assert_equal # 2 hashes required per regtest block (with no difficulty adjustment) REGTEST_WORK_PER_BLOCK = 2 -class MinimumChainWorkTest(BitcoinTestFramework): +class MinimumChainWorkTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 3 diff --git a/test/functional/feature_notifications.py b/test/functional/feature_notifications.py index b98dd6d26..4c07046d4 100755 --- a/test/functional/feature_notifications.py +++ b/test/functional/feature_notifications.py @@ -1,16 +1,16 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the -alertnotify, -blocknotify and -walletnotify options.""" import os from test_framework.address import ADDRESS_BCRT1_UNSPENDABLE -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, wait_until, connect_nodes_bi -class NotificationsTest(BitcoinTestFramework): +class NotificationsTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 2 self.setup_clean_chain = True diff --git a/test/functional/feature_nulldummy.py b/test/functional/feature_nulldummy.py index eb76089d9..f1a07b325 100755 --- a/test/functional/feature_nulldummy.py +++ b/test/functional/feature_nulldummy.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2018 The Bitcoin Core developers +# Copyright (c) 2016-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test NULLDUMMY softfork. @@ -17,7 +17,7 @@ import time from test_framework.blocktools import create_coinbase, create_block, create_transaction, add_witness_commitment from test_framework.messages import CTransaction from test_framework.script import CScript -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_raises_rpc_error, bytes_to_hex_str NULLDUMMY_ERROR = "non-mandatory-script-verify-flag (Dummy CHECKMULTISIG argument must be zero) (code 64)" @@ -34,7 +34,7 @@ def trueDummy(tx): tx.vin[0].scriptSig = CScript(newscript) tx.rehash() -class NULLDUMMYTest(BitcoinTestFramework): +class NULLDUMMYTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 diff --git a/test/functional/feature_proxy.py b/test/functional/feature_proxy.py index f042adb7a..005ee52bb 100755 --- a/test/functional/feature_proxy.py +++ b/test/functional/feature_proxy.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test bitcoind with different proxy configuration. @@ -31,7 +31,7 @@ import socket import os from test_framework.socks5 import Socks5Configuration, Socks5Command, Socks5Server, AddressType -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( PORT_MIN, PORT_RANGE, @@ -41,7 +41,7 @@ from test_framework.netutil import test_ipv6_local RANGE_BEGIN = PORT_MIN + 2 * PORT_RANGE # Start after p2p and rpc ports -class ProxyTest(BitcoinTestFramework): +class ProxyTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 4 self.setup_clean_chain = True diff --git a/test/functional/feature_pruning.py b/test/functional/feature_pruning.py index 3e1ba88f0..41c7092e4 100755 --- a/test/functional/feature_pruning.py +++ b/test/functional/feature_pruning.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the pruning code. @@ -9,7 +9,7 @@ This test uses 4GB of disk space. This test takes 30 mins or more (up to 2 hours) """ -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_greater_than, assert_raises_rpc_error, connect_nodes, mine_large_block, sync_blocks, wait_until import os @@ -25,7 +25,7 @@ TIMESTAMP_WINDOW = 2 * 60 * 60 def calc_usage(blockdir): return sum(os.path.getsize(blockdir+f) for f in os.listdir(blockdir) if os.path.isfile(os.path.join(blockdir, f))) / (1024. * 1024.) -class PruneTest(BitcoinTestFramework): +class PruneTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 6 diff --git a/test/functional/feature_rbf.py b/test/functional/feature_rbf.py index ff7c2b23b..fc96d347b 100755 --- a/test/functional/feature_rbf.py +++ b/test/functional/feature_rbf.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the RBF code.""" @@ -8,7 +8,7 @@ from decimal import Decimal from test_framework.messages import COIN, COutPoint, CTransaction, CTxIn, CTxOut from test_framework.script import CScript, OP_DROP -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_raises_rpc_error, bytes_to_hex_str, satoshi_round MAX_REPLACEMENT_LIMIT = 100 @@ -62,7 +62,7 @@ def make_utxo(node, amount, confirmed=True, scriptPubKey=CScript([1])): return COutPoint(int(txid, 16), 0) -class ReplaceByFeeTest(BitcoinTestFramework): +class ReplaceByFeeTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 2 self.extra_args = [ diff --git a/test/functional/feature_reindex.py b/test/functional/feature_reindex.py index 940b403f9..d8bbea009 100755 --- a/test/functional/feature_reindex.py +++ b/test/functional/feature_reindex.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test running bitcoind with -reindex and -reindex-chainstate options. @@ -9,10 +9,10 @@ - Stop the node and restart it with -reindex-chainstate. Verify that the node has reindexed up to block 3. """ -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import wait_until -class ReindexTest(BitcoinTestFramework): +class ReindexTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True diff --git a/test/functional/feature_segwit.py b/test/functional/feature_segwit.py index 658a8cd75..98792fb1e 100755 --- a/test/functional/feature_segwit.py +++ b/test/functional/feature_segwit.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2018 The Bitcoin Core developers +# Copyright (c) 2016-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the SegWit changeover logic.""" @@ -17,7 +17,7 @@ from test_framework.address import ( from test_framework.blocktools import witness_script, send_to_witness from test_framework.messages import COIN, COutPoint, CTransaction, CTxIn, CTxOut, FromHex, sha256, ToHex from test_framework.script import CScript, OP_HASH160, OP_CHECKSIG, OP_0, hash160, OP_EQUAL, OP_DUP, OP_EQUALVERIFY, OP_1, OP_2, OP_CHECKMULTISIG, OP_TRUE, OP_DROP -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_raises_rpc_error, bytes_to_hex_str, connect_nodes, hex_str_to_bytes, sync_blocks, try_rpc NODE_0 = 0 @@ -40,7 +40,7 @@ def find_spendable_utxo(node, min_value): txs_mined = {} # txindex from txid to blockhash -class SegWitTest(BitcoinTestFramework): +class SegWitTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 3 diff --git a/test/functional/feature_shutdown.py b/test/functional/feature_shutdown.py index 5084cb132..220a0e460 100755 --- a/test/functional/feature_shutdown.py +++ b/test/functional/feature_shutdown.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test bitcoind shutdown.""" -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, get_rpc_proxy, wait_until from threading import Thread @@ -12,7 +12,7 @@ def test_long_call(node): block = node.waitfornewblock() assert_equal(block['height'], 0) -class ShutdownTest(BitcoinTestFramework): +class ShutdownTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True diff --git a/test/functional/feature_uacomment.py b/test/functional/feature_uacomment.py index fb4ad2135..5055beca1 100755 --- a/test/functional/feature_uacomment.py +++ b/test/functional/feature_uacomment.py @@ -1,17 +1,17 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the -uacomment option.""" import re -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.test_node import ErrorMatch from test_framework.util import assert_equal -class UacommentTest(BitcoinTestFramework): +class UacommentTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 self.setup_clean_chain = True diff --git a/test/functional/feature_versionbits_warning.py b/test/functional/feature_versionbits_warning.py index 1ced618d4..01fb24aed 100755 --- a/test/functional/feature_versionbits_warning.py +++ b/test/functional/feature_versionbits_warning.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2018 The Bitcoin Core developers +# Copyright (c) 2016-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test version bits warning system. @@ -13,7 +13,7 @@ import re from test_framework.blocktools import create_block, create_coinbase from test_framework.messages import msg_block from test_framework.mininode import P2PInterface, mininode_lock -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import wait_until VB_PERIOD = 144 # versionbits period length for regtest @@ -25,7 +25,7 @@ VB_UNKNOWN_VERSION = VB_TOP_BITS | (1 << VB_UNKNOWN_BIT) WARN_UNKNOWN_RULES_ACTIVE = "unknown new rules activated (versionbit {})".format(VB_UNKNOWN_BIT) VB_PATTERN = re.compile("Warning: unknown new rules activated.*versionbit") -class VersionBitsWarningTest(BitcoinTestFramework): +class VersionBitsWarningTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 1 diff --git a/test/functional/interface_bitcoin_cli.py b/test/functional/interface_bitcoin_cli.py index 69120b1f0..16889796d 100755 --- a/test/functional/interface_bitcoin_cli.py +++ b/test/functional/interface_bitcoin_cli.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test bitcoin-cli""" -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_raises_process_error, get_auth_cookie -class TestBitcoinCli(BitcoinTestFramework): +class TestNYC3Cli(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True @@ -76,4 +76,4 @@ class TestBitcoinCli(BitcoinTestFramework): if __name__ == '__main__': - TestBitcoinCli().main() + TestNYC3Cli().main() diff --git a/test/functional/interface_http.py b/test/functional/interface_http.py index 20889366e..a8b9329bd 100755 --- a/test/functional/interface_http.py +++ b/test/functional/interface_http.py @@ -1,16 +1,16 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the RPC HTTP basics.""" -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, str_to_b64str import http.client import urllib.parse -class HTTPBasicsTest (BitcoinTestFramework): +class HTTPBasicsTest (NYC3TestFramework): def set_test_params(self): self.num_nodes = 3 diff --git a/test/functional/interface_rest.py b/test/functional/interface_rest.py index f33040242..08230e4a9 100755 --- a/test/functional/interface_rest.py +++ b/test/functional/interface_rest.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the REST API.""" @@ -14,7 +14,7 @@ from struct import pack, unpack import http.client import urllib.parse -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, assert_greater_than, @@ -39,7 +39,7 @@ def filter_output_indices_by_value(vouts, value): if vout['value'] == value: yield vout['n'] -class RESTTest (BitcoinTestFramework): +class RESTTest (NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 2 @@ -76,7 +76,7 @@ class RESTTest (BitcoinTestFramework): def run_test(self): self.url = urllib.parse.urlparse(self.nodes[0].url) - self.log.info("Mine blocks and send Bitcoin to node 1") + self.log.info("Mine blocks and send NYC3 to node 1") # Random address so node1's balance doesn't increase not_related_address = "2MxqoHEdNQTyYeX1mHcbrrpzgojbosTpCvJ" diff --git a/test/functional/interface_rpc.py b/test/functional/interface_rpc.py index b6955d449..1aab46510 100755 --- a/test/functional/interface_rpc.py +++ b/test/functional/interface_rpc.py @@ -1,13 +1,13 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Tests some generic aspects of the RPC interface.""" -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_greater_than_or_equal -class RPCInterfaceTest(BitcoinTestFramework): +class RPCInterfaceTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 self.setup_clean_chain = True diff --git a/test/functional/interface_zmq.py b/test/functional/interface_zmq.py index 94fea3709..ab9f65ec7 100755 --- a/test/functional/interface_zmq.py +++ b/test/functional/interface_zmq.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the ZMQ notification interface.""" import struct from test_framework.address import ADDRESS_BCRT1_UNSPENDABLE -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.messages import CTransaction from test_framework.util import ( assert_equal, @@ -36,7 +36,7 @@ class ZMQSubscriber: return body -class ZMQTest (BitcoinTestFramework): +class ZMQTest (NYC3TestFramework): def set_test_params(self): self.num_nodes = 2 diff --git a/test/functional/mempool_accept.py b/test/functional/mempool_accept.py index efe720b9b..b932d6d85 100755 --- a/test/functional/mempool_accept.py +++ b/test/functional/mempool_accept.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test mempool acceptance of raw transactions.""" @@ -7,7 +7,7 @@ from io import BytesIO import math -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.messages import ( BIP125_SEQUENCE_NUMBER, COIN, @@ -32,7 +32,7 @@ from test_framework.util import ( ) -class MempoolAcceptanceTest(BitcoinTestFramework): +class MempoolAcceptanceTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 self.extra_args = [[ diff --git a/test/functional/mempool_limit.py b/test/functional/mempool_limit.py index c0918893c..22f2bc89c 100755 --- a/test/functional/mempool_limit.py +++ b/test/functional/mempool_limit.py @@ -1,15 +1,15 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test mempool limiting together/eviction with the wallet.""" from decimal import Decimal -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_greater_than, assert_raises_rpc_error, create_confirmed_utxos, create_lots_of_big_transactions, gen_return_txouts -class MempoolLimitTest(BitcoinTestFramework): +class MempoolLimitTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 1 diff --git a/test/functional/mempool_packages.py b/test/functional/mempool_packages.py index 9336547a6..87b3fc288 100755 --- a/test/functional/mempool_packages.py +++ b/test/functional/mempool_packages.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test descendant package tracking code.""" @@ -7,13 +7,13 @@ from decimal import Decimal from test_framework.messages import COIN -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_raises_rpc_error, satoshi_round, sync_blocks, sync_mempools MAX_ANCESTORS = 25 MAX_DESCENDANTS = 25 -class MempoolPackagesTest(BitcoinTestFramework): +class MempoolPackagesTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 2 self.extra_args = [["-maxorphantx=1000"], ["-maxorphantx=1000", "-limitancestorcount=5"]] diff --git a/test/functional/mempool_persist.py b/test/functional/mempool_persist.py index d74d4eaaf..d330eefd5 100755 --- a/test/functional/mempool_persist.py +++ b/test/functional/mempool_persist.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test mempool persistence. @@ -39,11 +39,11 @@ from decimal import Decimal import os import time -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_raises_rpc_error, wait_until -class MempoolPersistTest(BitcoinTestFramework): +class MempoolPersistTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 3 self.extra_args = [[], ["-persistmempool=0"], []] diff --git a/test/functional/mempool_reorg.py b/test/functional/mempool_reorg.py index 123f0b4c2..5e16ed21b 100755 --- a/test/functional/mempool_reorg.py +++ b/test/functional/mempool_reorg.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test mempool re-org scenarios. @@ -9,11 +9,11 @@ that spend (directly or indirectly) coinbase transactions. """ from test_framework.blocktools import create_raw_transaction -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_raises_rpc_error -class MempoolCoinbaseTest(BitcoinTestFramework): +class MempoolCoinbaseTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 2 diff --git a/test/functional/mempool_resurrect.py b/test/functional/mempool_resurrect.py index 845beb551..eed2e4ff8 100755 --- a/test/functional/mempool_resurrect.py +++ b/test/functional/mempool_resurrect.py @@ -1,15 +1,15 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test resurrection of mined transactions when the blockchain is re-organized.""" from test_framework.blocktools import create_raw_transaction -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal -class MempoolCoinbaseTest(BitcoinTestFramework): +class MempoolCoinbaseTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 diff --git a/test/functional/mempool_spend_coinbase.py b/test/functional/mempool_spend_coinbase.py index 854d506f0..0d90c3149 100755 --- a/test/functional/mempool_spend_coinbase.py +++ b/test/functional/mempool_spend_coinbase.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test spending coinbase transactions. @@ -12,12 +12,12 @@ in the next block are accepted into the memory pool, but less mature coinbase spends are NOT. """ -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.blocktools import create_raw_transaction from test_framework.util import assert_equal, assert_raises_rpc_error -class MempoolSpendCoinbaseTest(BitcoinTestFramework): +class MempoolSpendCoinbaseTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 diff --git a/test/functional/mining_basic.py b/test/functional/mining_basic.py index d0bef48cb..5d61f57be 100755 --- a/test/functional/mining_basic.py +++ b/test/functional/mining_basic.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2019 The Bitcoin Core developers +# Copyright (c) 2014-2019 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test mining RPCs @@ -23,7 +23,7 @@ from test_framework.messages import ( from test_framework.mininode import ( P2PDataStore, ) -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, assert_raises_rpc_error, @@ -40,7 +40,7 @@ def assert_template(node, block, expect, rehash=True): assert_equal(rsp, expect) -class MiningTest(BitcoinTestFramework): +class MiningTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 2 self.setup_clean_chain = True diff --git a/test/functional/mining_getblocktemplate_longpoll.py b/test/functional/mining_getblocktemplate_longpoll.py index 72cde8e81..34f7ccafc 100755 --- a/test/functional/mining_getblocktemplate_longpoll.py +++ b/test/functional/mining_getblocktemplate_longpoll.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test longpolling with getblocktemplate.""" from decimal import Decimal -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import get_rpc_proxy, random_transaction import threading @@ -24,7 +24,7 @@ class LongpollThread(threading.Thread): def run(self): self.node.getblocktemplate({'longpollid': self.longpollid, 'rules': ['segwit']}) -class GetBlockTemplateLPTest(BitcoinTestFramework): +class GetBlockTemplateLPTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 2 diff --git a/test/functional/mining_prioritisetransaction.py b/test/functional/mining_prioritisetransaction.py index ca4b621a7..16b06a066 100755 --- a/test/functional/mining_prioritisetransaction.py +++ b/test/functional/mining_prioritisetransaction.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the prioritisetransaction mining RPC.""" @@ -7,10 +7,10 @@ import time from test_framework.messages import COIN, MAX_BLOCK_BASE_SIZE -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_raises_rpc_error, create_confirmed_utxos, create_lots_of_big_transactions, gen_return_txouts -class PrioritiseTransactionTest(BitcoinTestFramework): +class PrioritiseTransactionTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 2 diff --git a/test/functional/p2p_compactblocks.py b/test/functional/p2p_compactblocks.py index f0dee59b5..60b847023 100755 --- a/test/functional/p2p_compactblocks.py +++ b/test/functional/p2p_compactblocks.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2018 The Bitcoin Core developers +# Copyright (c) 2016-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test compact blocks (BIP 152). @@ -14,7 +14,7 @@ from test_framework.blocktools import create_block, create_coinbase, add_witness from test_framework.messages import BlockTransactions, BlockTransactionsRequest, calculate_shortid, CBlock, CBlockHeader, CInv, COutPoint, CTransaction, CTxIn, CTxInWitness, CTxOut, FromHex, HeaderAndShortIDs, msg_block, msg_blocktxn, msg_cmpctblock, msg_getblocktxn, msg_getdata, msg_getheaders, msg_headers, msg_inv, msg_sendcmpct, msg_sendheaders, msg_tx, msg_witness_block, msg_witness_blocktxn, MSG_WITNESS_FLAG, NODE_NETWORK, NODE_WITNESS, P2PHeaderAndShortIDs, PrefilledTransaction, ser_uint256, ToHex from test_framework.mininode import mininode_lock, P2PInterface from test_framework.script import CScript, OP_TRUE, OP_DROP -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, get_bip9_status, satoshi_round, sync_blocks, wait_until # TestP2PConn: A peer we use to send messages to bitcoind, and store responses. @@ -91,7 +91,7 @@ class TestP2PConn(P2PInterface): self.send_message(message) wait_until(lambda: not self.is_connected, timeout=timeout, lock=mininode_lock) -class CompactBlocksTest(BitcoinTestFramework): +class CompactBlocksTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True # Node0 = pre-segwit, node1 = segwit-aware diff --git a/test/functional/p2p_disconnect_ban.py b/test/functional/p2p_disconnect_ban.py index 1b11a2a29..cd31d6bef 100755 --- a/test/functional/p2p_disconnect_ban.py +++ b/test/functional/p2p_disconnect_ban.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test node disconnect and ban behavior""" import time -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, assert_raises_rpc_error, @@ -13,7 +13,7 @@ from test_framework.util import ( wait_until, ) -class DisconnectBanTest(BitcoinTestFramework): +class DisconnectBanTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 2 diff --git a/test/functional/p2p_feefilter.py b/test/functional/p2p_feefilter.py index d589519e4..80a21e91d 100755 --- a/test/functional/p2p_feefilter.py +++ b/test/functional/p2p_feefilter.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2018 The Bitcoin Core developers +# Copyright (c) 2016-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test processing of feefilter messages.""" @@ -9,7 +9,7 @@ import time from test_framework.messages import msg_feefilter from test_framework.mininode import mininode_lock, P2PInterface -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import sync_blocks, sync_mempools def hashToHex(hash): @@ -38,7 +38,7 @@ class TestP2PConn(P2PInterface): with mininode_lock: self.txinvs = [] -class FeeFilterTest(BitcoinTestFramework): +class FeeFilterTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 2 diff --git a/test/functional/p2p_fingerprint.py b/test/functional/p2p_fingerprint.py index fab088719..4c64ce011 100755 --- a/test/functional/p2p_fingerprint.py +++ b/test/functional/p2p_fingerprint.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test various fingerprinting protections. @@ -19,13 +19,13 @@ from test_framework.mininode import ( msg_getdata, msg_getheaders, ) -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, wait_until, ) -class P2PFingerprintTest(BitcoinTestFramework): +class P2PFingerprintTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 1 diff --git a/test/functional/p2p_invalid_block.py b/test/functional/p2p_invalid_block.py index 1e0b87659..43bcf64c2 100755 --- a/test/functional/p2p_invalid_block.py +++ b/test/functional/p2p_invalid_block.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test node responses to invalid blocks. @@ -15,10 +15,10 @@ import copy from test_framework.blocktools import create_block, create_coinbase, create_tx_with_script from test_framework.messages import COIN from test_framework.mininode import P2PDataStore -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal -class InvalidBlockRequestTest(BitcoinTestFramework): +class InvalidBlockRequestTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 self.setup_clean_chain = True diff --git a/test/functional/p2p_invalid_locator.py b/test/functional/p2p_invalid_locator.py index 33b706006..c62266e47 100755 --- a/test/functional/p2p_invalid_locator.py +++ b/test/functional/p2p_invalid_locator.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test node responses to invalid locators. @@ -7,10 +7,10 @@ from test_framework.messages import msg_getheaders, msg_getblocks, MAX_LOCATOR_SZ from test_framework.mininode import P2PInterface -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework -class InvalidLocatorTest(BitcoinTestFramework): +class InvalidLocatorTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 self.setup_clean_chain = False diff --git a/test/functional/p2p_invalid_messages.py b/test/functional/p2p_invalid_messages.py index 700fdf6e0..6569dad72 100755 --- a/test/functional/p2p_invalid_messages.py +++ b/test/functional/p2p_invalid_messages.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2019 The Bitcoin Core developers +# Copyright (c) 2015-2019 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test node responses to invalid network messages.""" @@ -8,7 +8,7 @@ import struct from test_framework import messages from test_framework.mininode import P2PDataStore -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework class msg_unrecognized: @@ -26,7 +26,7 @@ class msg_unrecognized: return "{}(data={})".format(self.command, self.str_data) -class InvalidMessagesTest(BitcoinTestFramework): +class InvalidMessagesTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 self.setup_clean_chain = True diff --git a/test/functional/p2p_invalid_tx.py b/test/functional/p2p_invalid_tx.py index 1b18dd3e5..6f3be76b0 100755 --- a/test/functional/p2p_invalid_tx.py +++ b/test/functional/p2p_invalid_tx.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test node responses to invalid transactions. @@ -14,7 +14,7 @@ from test_framework.messages import ( CTxOut, ) from test_framework.mininode import P2PDataStore -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, wait_until, @@ -22,7 +22,7 @@ from test_framework.util import ( from data import invalid_txs -class InvalidTxRequestTest(BitcoinTestFramework): +class InvalidTxRequestTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 self.setup_clean_chain = True diff --git a/test/functional/p2p_leak.py b/test/functional/p2p_leak.py index 336d34a81..a93fa8266 100755 --- a/test/functional/p2p_leak.py +++ b/test/functional/p2p_leak.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test message sending before handshake completion. @@ -14,7 +14,7 @@ import time from test_framework.messages import msg_getaddr, msg_ping, msg_verack from test_framework.mininode import mininode_lock, P2PInterface -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import wait_until banscore = 10 @@ -88,7 +88,7 @@ class CNodeNoVerackIdle(CLazyNode): self.send_message(msg_ping()) self.send_message(msg_getaddr()) -class P2PLeakTest(BitcoinTestFramework): +class P2PLeakTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 self.extra_args = [['-banscore=' + str(banscore)]] diff --git a/test/functional/p2p_leak_tx.py b/test/functional/p2p_leak_tx.py index dc4d475b2..866d378ad 100755 --- a/test/functional/p2p_leak_tx.py +++ b/test/functional/p2p_leak_tx.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test that we don't leak txs to inbound peers that we haven't yet announced to""" from test_framework.messages import msg_getdata, CInv from test_framework.mininode import P2PDataStore -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, ) @@ -17,7 +17,7 @@ class P2PNode(P2PDataStore): pass -class P2PLeakTxTest(BitcoinTestFramework): +class P2PLeakTxTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 diff --git a/test/functional/p2p_mempool.py b/test/functional/p2p_mempool.py index a8fcb181e..9cb812a87 100755 --- a/test/functional/p2p_mempool.py +++ b/test/functional/p2p_mempool.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test p2p mempool message. @@ -10,10 +10,10 @@ filters are not enabled. from test_framework.messages import msg_mempool from test_framework.mininode import P2PInterface -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal -class P2PMempoolTests(BitcoinTestFramework): +class P2PMempoolTests(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 1 diff --git a/test/functional/p2p_node_network_limited.py b/test/functional/p2p_node_network_limited.py index 359880506..2120b5f91 100755 --- a/test/functional/p2p_node_network_limited.py +++ b/test/functional/p2p_node_network_limited.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Tests NODE_NETWORK_LIMITED. @@ -10,7 +10,7 @@ and that it responds to getdata requests for blocks correctly: - disconnect peers who request blocks older than that.""" from test_framework.messages import CInv, msg_getdata, msg_verack, NODE_BLOOM, NODE_NETWORK_LIMITED, NODE_WITNESS from test_framework.mininode import P2PInterface, mininode_lock -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, disconnect_nodes, connect_nodes_bi, sync_blocks, wait_until class P2PIgnoreInv(P2PInterface): @@ -28,7 +28,7 @@ class P2PIgnoreInv(P2PInterface): getdata_request.inv.append(CInv(2, int(blockhash, 16))) self.send_message(getdata_request) -class NodeNetworkLimitedTest(BitcoinTestFramework): +class NodeNetworkLimitedTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 3 diff --git a/test/functional/p2p_segwit.py b/test/functional/p2p_segwit.py index 8f8e89cf1..d24deb077 100755 --- a/test/functional/p2p_segwit.py +++ b/test/functional/p2p_segwit.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2018 The Bitcoin Core developers +# Copyright (c) 2016-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test segwit transactions and blocks on P2P network.""" @@ -71,7 +71,7 @@ from test_framework.script import ( SignatureHash, hash160, ) -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, bytes_to_hex_str, @@ -181,7 +181,7 @@ class TestP2PConn(P2PInterface): self.wait_for_block(blockhash, timeout) return self.last_message["block"].block -class SegWitTest(BitcoinTestFramework): +class SegWitTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 3 diff --git a/test/functional/p2p_sendheaders.py b/test/functional/p2p_sendheaders.py index 7d7d25176..cfbaf1328 100755 --- a/test/functional/p2p_sendheaders.py +++ b/test/functional/p2p_sendheaders.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test behavior of headers messages to announce blocks. @@ -100,7 +100,7 @@ from test_framework.mininode import ( msg_inv, msg_sendheaders, ) -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, sync_blocks, @@ -203,7 +203,7 @@ class BaseNode(P2PInterface): self.block_announced = False self.last_message.pop("inv", None) -class SendHeadersTest(BitcoinTestFramework): +class SendHeadersTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 2 diff --git a/test/functional/p2p_timeouts.py b/test/functional/p2p_timeouts.py index 02ceec3dc..1eb0780c8 100755 --- a/test/functional/p2p_timeouts.py +++ b/test/functional/p2p_timeouts.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2018 The Bitcoin Core developers +# Copyright (c) 2016-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test various net timeouts. @@ -25,14 +25,14 @@ from time import sleep from test_framework.messages import msg_ping from test_framework.mininode import P2PInterface -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework class TestP2PConn(P2PInterface): def on_version(self, message): # Don't send a verack in response pass -class TimeoutsTest(BitcoinTestFramework): +class TimeoutsTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 1 diff --git a/test/functional/p2p_unrequested_blocks.py b/test/functional/p2p_unrequested_blocks.py index 11299cbc0..d8304d0b8 100755 --- a/test/functional/p2p_unrequested_blocks.py +++ b/test/functional/p2p_unrequested_blocks.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test processing of unrequested blocks. @@ -56,11 +56,11 @@ import time from test_framework.blocktools import create_block, create_coinbase, create_tx_with_script from test_framework.messages import CBlockHeader, CInv, msg_block, msg_headers, msg_inv from test_framework.mininode import mininode_lock, P2PInterface -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_raises_rpc_error, connect_nodes, sync_blocks -class AcceptBlockTest(BitcoinTestFramework): +class AcceptBlockTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 2 diff --git a/test/functional/rpc_bind.py b/test/functional/rpc_bind.py index 3938ca98d..848273e5d 100755 --- a/test/functional/rpc_bind.py +++ b/test/functional/rpc_bind.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test running bitcoind with the -rpcbind and -rpcallowip options.""" @@ -7,10 +7,10 @@ import sys from test_framework.netutil import all_interfaces, addr_to_hex, get_bind_addrs, test_ipv6_local -from test_framework.test_framework import BitcoinTestFramework, SkipTest +from test_framework.test_framework import NYC3TestFramework, SkipTest from test_framework.util import assert_equal, assert_raises_rpc_error, get_rpc_proxy, rpc_port, rpc_url -class RPCBindTest(BitcoinTestFramework): +class RPCBindTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.bind_to_localhost_only = False diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py index af150a09a..6ef9bdd91 100755 --- a/test/functional/rpc_blockchain.py +++ b/test/functional/rpc_blockchain.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test RPCs related to blockchainstate. @@ -22,7 +22,7 @@ from decimal import Decimal import http.client import subprocess -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, assert_greater_than, @@ -45,7 +45,7 @@ from test_framework.mininode import ( ) -class BlockchainTest(BitcoinTestFramework): +class BlockchainTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 1 diff --git a/test/functional/rpc_createmultisig.py b/test/functional/rpc_createmultisig.py index 3cc35a7b9..57b427bfa 100755 --- a/test/functional/rpc_createmultisig.py +++ b/test/functional/rpc_createmultisig.py @@ -1,13 +1,13 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test transaction signing using the signrawtransaction* RPCs.""" -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework import decimal -class RpcCreateMultiSigTest(BitcoinTestFramework): +class RpcCreateMultiSigTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 3 diff --git a/test/functional/rpc_decodescript.py b/test/functional/rpc_decodescript.py index 940386eee..d65bae593 100755 --- a/test/functional/rpc_decodescript.py +++ b/test/functional/rpc_decodescript.py @@ -1,16 +1,16 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test decoding scripts via decodescript RPC command.""" from test_framework.messages import CTransaction, sha256 -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, bytes_to_hex_str, hex_str_to_bytes from io import BytesIO -class DecodeScriptTest(BitcoinTestFramework): +class DecodeScriptTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 1 diff --git a/test/functional/rpc_deprecated.py b/test/functional/rpc_deprecated.py index 588bfbe08..c25074224 100755 --- a/test/functional/rpc_deprecated.py +++ b/test/functional/rpc_deprecated.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test deprecation of RPC calls.""" -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_raises_rpc_error -class DeprecatedRpcTest(BitcoinTestFramework): +class DeprecatedRpcTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 2 self.setup_clean_chain = True diff --git a/test/functional/rpc_deriveaddresses.py b/test/functional/rpc_deriveaddresses.py index 185dffd51..920baa820 100755 --- a/test/functional/rpc_deriveaddresses.py +++ b/test/functional/rpc_deriveaddresses.py @@ -1,13 +1,13 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the deriveaddresses rpc call.""" -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.descriptors import descsum_create from test_framework.util import assert_equal, assert_raises_rpc_error -class DeriveaddressesTest(BitcoinTestFramework): +class DeriveaddressesTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 self.supports_cli = 1 diff --git a/test/functional/rpc_fundrawtransaction.py b/test/functional/rpc_fundrawtransaction.py index 4f350953b..812953c64 100755 --- a/test/functional/rpc_fundrawtransaction.py +++ b/test/functional/rpc_fundrawtransaction.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the fundrawtransaction RPC.""" from decimal import Decimal -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, assert_fee_amount, @@ -24,7 +24,7 @@ def get_unspent(listunspent, amount): return utx raise AssertionError('Could not find unspent with amount={}'.format(amount)) -class RawTransactionsTest(BitcoinTestFramework): +class RawTransactionsTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 4 self.setup_clean_chain = True diff --git a/test/functional/rpc_getblockstats.py b/test/functional/rpc_getblockstats.py index feba16f1b..f77718133 100755 --- a/test/functional/rpc_getblockstats.py +++ b/test/functional/rpc_getblockstats.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # # Test getblockstats rpc call # -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, assert_raises_rpc_error, @@ -17,7 +17,7 @@ import time TESTSDIR = os.path.dirname(os.path.realpath(__file__)) -class GetblockstatsTest(BitcoinTestFramework): +class GetblockstatsTest(NYC3TestFramework): start_height = 101 max_stat_pos = 2 diff --git a/test/functional/rpc_getchaintips.py b/test/functional/rpc_getchaintips.py index c869c7262..f1ebf4845 100755 --- a/test/functional/rpc_getchaintips.py +++ b/test/functional/rpc_getchaintips.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the getchaintips RPC. @@ -10,10 +10,10 @@ - verify that getchaintips now returns two chain tips. """ -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal -class GetChainTipsTest (BitcoinTestFramework): +class GetChainTipsTest (NYC3TestFramework): def set_test_params(self): self.num_nodes = 4 diff --git a/test/functional/rpc_help.py b/test/functional/rpc_help.py index 78d6e78ae..cebe3ab24 100755 --- a/test/functional/rpc_help.py +++ b/test/functional/rpc_help.py @@ -1,16 +1,16 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test RPC help output.""" -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_raises_rpc_error import os -class HelpRpcTest(BitcoinTestFramework): +class HelpRpcTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 diff --git a/test/functional/rpc_invalidateblock.py b/test/functional/rpc_invalidateblock.py index d8a1deb2a..8b1f801f9 100755 --- a/test/functional/rpc_invalidateblock.py +++ b/test/functional/rpc_invalidateblock.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the invalidateblock RPC.""" -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.address import ADDRESS_BCRT1_UNSPENDABLE from test_framework.util import ( assert_equal, @@ -14,7 +14,7 @@ from test_framework.util import ( ) -class InvalidateTest(BitcoinTestFramework): +class InvalidateTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 3 diff --git a/test/functional/rpc_misc.py b/test/functional/rpc_misc.py index 7bf8e6817..19d18287b 100755 --- a/test/functional/rpc_misc.py +++ b/test/functional/rpc_misc.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 -# Copyright (c) 2019 The Bitcoin Core developers +# Copyright (c) 2019 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test RPC misc output.""" import xml.etree.ElementTree as ET -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_raises_rpc_error, assert_equal, @@ -16,7 +16,7 @@ from test_framework.util import ( from test_framework.authproxy import JSONRPCException -class RpcMiscTest(BitcoinTestFramework): +class RpcMiscTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 diff --git a/test/functional/rpc_named_arguments.py b/test/functional/rpc_named_arguments.py index 6c5c29dfd..674647344 100755 --- a/test/functional/rpc_named_arguments.py +++ b/test/functional/rpc_named_arguments.py @@ -1,16 +1,16 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2018 The Bitcoin Core developers +# Copyright (c) 2016-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test using named arguments for RPCs.""" -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, assert_raises_rpc_error, ) -class NamedArgumentTest(BitcoinTestFramework): +class NamedArgumentTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 diff --git a/test/functional/rpc_net.py b/test/functional/rpc_net.py index b12eb1d9e..d700cfc8a 100755 --- a/test/functional/rpc_net.py +++ b/test/functional/rpc_net.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test RPC calls related to net. @@ -9,7 +9,7 @@ Tests correspond to code in rpc/net.cpp. from decimal import Decimal -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, assert_greater_than_or_equal, @@ -22,7 +22,7 @@ from test_framework.util import ( from test_framework.mininode import P2PInterface from test_framework.messages import CAddress, msg_addr, NODE_NETWORK, NODE_WITNESS -class NetTest(BitcoinTestFramework): +class NetTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 2 diff --git a/test/functional/rpc_preciousblock.py b/test/functional/rpc_preciousblock.py index 72e6e6329..b4fb32891 100755 --- a/test/functional/rpc_preciousblock.py +++ b/test/functional/rpc_preciousblock.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the preciousblock RPC.""" -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, connect_nodes_bi, @@ -33,7 +33,7 @@ def node_sync_via_rpc(nodes): continue unidirectional_node_sync_via_rpc(node_src, node_dest) -class PreciousTest(BitcoinTestFramework): +class PreciousTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 3 diff --git a/test/functional/rpc_psbt.py b/test/functional/rpc_psbt.py index 53f606f2e..e77611701 100755 --- a/test/functional/rpc_psbt.py +++ b/test/functional/rpc_psbt.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the Partially Signed Transaction RPCs. """ from decimal import Decimal -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_raises_rpc_error, connect_nodes_bi, disconnect_nodes, find_output, sync_blocks import json @@ -15,7 +15,7 @@ import os MAX_BIP125_RBF_SEQUENCE = 0xfffffffd # Create one-input, one-output, no-fee transaction: -class PSBTTest(BitcoinTestFramework): +class PSBTTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = False diff --git a/test/functional/rpc_rawtransaction.py b/test/functional/rpc_rawtransaction.py index c793cf00d..0b820d2d3 100755 --- a/test/functional/rpc_rawtransaction.py +++ b/test/functional/rpc_rawtransaction.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the rawtransaction RPCs. @@ -16,7 +16,7 @@ from collections import OrderedDict from decimal import Decimal from io import BytesIO from test_framework.messages import CTransaction, ToHex -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_raises_rpc_error, bytes_to_hex_str, connect_nodes_bi, hex_str_to_bytes class multidict(dict): @@ -38,7 +38,7 @@ class multidict(dict): # Create one-input, one-output, no-fee transaction: -class RawTransactionsTest(BitcoinTestFramework): +class RawTransactionsTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 3 @@ -95,7 +95,7 @@ class RawTransactionsTest(BitcoinTestFramework): self.nodes[0].createrawtransaction(inputs=[], outputs={}) # Should not throw for backwards compatibility self.nodes[0].createrawtransaction(inputs=[], outputs=[]) assert_raises_rpc_error(-8, "Data must be hexadecimal string", self.nodes[0].createrawtransaction, [], {'data': 'foo'}) - assert_raises_rpc_error(-5, "Invalid Bitcoin address", self.nodes[0].createrawtransaction, [], {'foo': 0}) + assert_raises_rpc_error(-5, "Invalid NYC3 address", self.nodes[0].createrawtransaction, [], {'foo': 0}) assert_raises_rpc_error(-3, "Invalid amount", self.nodes[0].createrawtransaction, [], {address: 'foo'}) assert_raises_rpc_error(-3, "Amount out of range", self.nodes[0].createrawtransaction, [], {address: -1}) assert_raises_rpc_error(-8, "Invalid parameter, duplicated address: %s" % address, self.nodes[0].createrawtransaction, [], multidict([(address, 1), (address, 1)])) diff --git a/test/functional/rpc_scantxoutset.py b/test/functional/rpc_scantxoutset.py index 18258f5df..92dd67fe2 100755 --- a/test/functional/rpc_scantxoutset.py +++ b/test/functional/rpc_scantxoutset.py @@ -1,9 +1,9 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the scantxoutset rpc call.""" -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal from decimal import Decimal @@ -13,7 +13,7 @@ import os def descriptors(out): return sorted(u['desc'] for u in out['unspents']) -class ScantxoutsetTest(BitcoinTestFramework): +class ScantxoutsetTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 self.setup_clean_chain = True diff --git a/test/functional/rpc_signmessage.py b/test/functional/rpc_signmessage.py index ad0e29b45..3755e78c4 100755 --- a/test/functional/rpc_signmessage.py +++ b/test/functional/rpc_signmessage.py @@ -1,13 +1,13 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2018 The Bitcoin Core developers +# Copyright (c) 2016-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test RPC commands for signing and verifying messages.""" -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal -class SignMessagesTest(BitcoinTestFramework): +class SignMessagesTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 1 diff --git a/test/functional/rpc_signrawtransaction.py b/test/functional/rpc_signrawtransaction.py index 56e2c73a9..9064ce432 100755 --- a/test/functional/rpc_signrawtransaction.py +++ b/test/functional/rpc_signrawtransaction.py @@ -1,17 +1,17 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test transaction signing using the signrawtransaction* RPCs.""" -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_raises_rpc_error, bytes_to_hex_str, hex_str_to_bytes from test_framework.messages import sha256 from test_framework.script import CScript, OP_0 from decimal import Decimal -class SignRawTransactionsTest(BitcoinTestFramework): +class SignRawTransactionsTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 2 diff --git a/test/functional/rpc_txoutproof.py b/test/functional/rpc_txoutproof.py index 8913b8698..66ab4416c 100755 --- a/test/functional/rpc_txoutproof.py +++ b/test/functional/rpc_txoutproof.py @@ -1,14 +1,14 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test gettxoutproof and verifytxoutproof RPCs.""" from test_framework.messages import CMerkleBlock, FromHex, ToHex -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_raises_rpc_error, connect_nodes -class MerkleBlockTest(BitcoinTestFramework): +class MerkleBlockTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 4 self.setup_clean_chain = True diff --git a/test/functional/rpc_uptime.py b/test/functional/rpc_uptime.py index 20b634155..f07d7e1f2 100755 --- a/test/functional/rpc_uptime.py +++ b/test/functional/rpc_uptime.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the RPC call related to the uptime command. @@ -9,10 +9,10 @@ Test corresponds to code in rpc/server.cpp. import time -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework -class UptimeTest(BitcoinTestFramework): +class UptimeTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 self.setup_clean_chain = True diff --git a/test/functional/rpc_users.py b/test/functional/rpc_users.py index 102dd2259..776fd706a 100755 --- a/test/functional/rpc_users.py +++ b/test/functional/rpc_users.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test multiple RPC users.""" -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, get_datadir_path, @@ -21,7 +21,7 @@ import configparser import sys -class HTTPBasicsTest(BitcoinTestFramework): +class HTTPBasicsTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 2 diff --git a/test/functional/test_framework/address.py b/test/functional/test_framework/address.py index 456d43aa2..a061a675d 100644 --- a/test/functional/test_framework/address.py +++ b/test/functional/test_framework/address.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2018 The Bitcoin Core developers +# Copyright (c) 2016-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Encode and decode BASE58, P2PKH and P2SH addresses.""" diff --git a/test/functional/test_framework/authproxy.py b/test/functional/test_framework/authproxy.py index 1140fe9b3..949ab10a0 100644 --- a/test/functional/test_framework/authproxy.py +++ b/test/functional/test_framework/authproxy.py @@ -46,7 +46,7 @@ import urllib.parse HTTP_TIMEOUT = 30 USER_AGENT = "AuthServiceProxy/0.1" -log = logging.getLogger("BitcoinRPC") +log = logging.getLogger("NYC3RPC") class JSONRPCException(Exception): def __init__(self, rpc_error): diff --git a/test/functional/test_framework/blocktools.py b/test/functional/test_framework/blocktools.py index 15f450299..e8e3fad9b 100644 --- a/test/functional/test_framework/blocktools.py +++ b/test/functional/test_framework/blocktools.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2019 The Bitcoin Core developers +# Copyright (c) 2015-2019 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Utilities for manipulating blocks and transactions.""" diff --git a/test/functional/test_framework/coverage.py b/test/functional/test_framework/coverage.py index 7705dd3e4..74d08ebb0 100644 --- a/test/functional/test_framework/coverage.py +++ b/test/functional/test_framework/coverage.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Utilities for doing coverage analysis on the RPC interface. diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py index 4bd58519c..ba0e18557 100755 --- a/test/functional/test_framework/messages.py +++ b/test/functional/test_framework/messages.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 # Copyright (c) 2010 ArtForz -- public domain half-a-node # Copyright (c) 2012 Jeff Garzik -# Copyright (c) 2010-2018 The Bitcoin Core developers +# Copyright (c) 2010-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -"""Bitcoin test framework primitive and message structures +"""NYC3 test framework primitive and message structures CBlock, CTransaction, CBlockHeader, CTxIn, CTxOut, etc....: data structures that should map to corresponding structures in diff --git a/test/functional/test_framework/mininode.py b/test/functional/test_framework/mininode.py index 53e53fbfe..5e430c0f9 100755 --- a/test/functional/test_framework/mininode.py +++ b/test/functional/test_framework/mininode.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 # Copyright (c) 2010 ArtForz -- public domain half-a-node # Copyright (c) 2012 Jeff Garzik -# Copyright (c) 2010-2018 The Bitcoin Core developers +# Copyright (c) 2010-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -"""Bitcoin P2P network half-a-node. +"""NYC3 P2P network half-a-node. This python code was modified from ArtForz' public domain half-a-node, as found in the mini-node branch of http://github.com/jgarzik/pynode. @@ -119,7 +119,7 @@ class P2PConnection(asyncio.Protocol): self.on_connection_send_msg = None self.recvbuf = b"" self.magic_bytes = MAGIC_BYTES[net] - logger.debug('Connecting to Bitcoin Node: %s:%d' % (self.dstaddr, self.dstport)) + logger.debug('Connecting to NYC3 Node: %s:%d' % (self.dstaddr, self.dstport)) loop = NetworkThread.network_event_loop conn_gen_unsafe = loop.create_connection(lambda: self, host=self.dstaddr, port=self.dstport) @@ -255,7 +255,7 @@ class P2PConnection(asyncio.Protocol): class P2PInterface(P2PConnection): - """A high-level P2P interface class for communicating with a Bitcoin node. + """A high-level P2P interface class for communicating with a NYC3 node. This class provides high-level callbacks for processing P2P message payloads, as well as convenience methods for interacting with the diff --git a/test/functional/test_framework/netutil.py b/test/functional/test_framework/netutil.py index 45c182f63..ee6c02a2b 100644 --- a/test/functional/test_framework/netutil.py +++ b/test/functional/test_framework/netutil.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Linux network utilities. diff --git a/test/functional/test_framework/script.py b/test/functional/test_framework/script.py index 012c80a1b..e5097692e 100644 --- a/test/functional/test_framework/script.py +++ b/test/functional/test_framework/script.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Functionality to build scripts, as well as SignatureHash(). diff --git a/test/functional/test_framework/siphash.py b/test/functional/test_framework/siphash.py index 85836845d..a83aaea8f 100644 --- a/test/functional/test_framework/siphash.py +++ b/test/functional/test_framework/siphash.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2018 The Bitcoin Core developers +# Copyright (c) 2016-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Specialized SipHash-2-4 implementations. diff --git a/test/functional/test_framework/socks5.py b/test/functional/test_framework/socks5.py index a21c864e7..8a8b8d282 100644 --- a/test/functional/test_framework/socks5.py +++ b/test/functional/test_framework/socks5.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Dummy Socks5 server for testing.""" diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index 09d7d877a..29935dc63 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Base class for RPC testing.""" @@ -53,27 +53,27 @@ class SkipTest(Exception): self.message = message -class BitcoinTestMetaClass(type): - """Metaclass for BitcoinTestFramework. +class NYC3TestMetaClass(type): + """Metaclass for NYC3TestFramework. - Ensures that any attempt to register a subclass of `BitcoinTestFramework` + Ensures that any attempt to register a subclass of `NYC3TestFramework` adheres to a standard whereby the subclass overrides `set_test_params` and `run_test` but DOES NOT override either `__init__` or `main`. If any of those standards are violated, a ``TypeError`` is raised.""" def __new__(cls, clsname, bases, dct): - if not clsname == 'BitcoinTestFramework': + if not clsname == 'NYC3TestFramework': if not ('run_test' in dct and 'set_test_params' in dct): - raise TypeError("BitcoinTestFramework subclasses must override " + raise TypeError("NYC3TestFramework subclasses must override " "'run_test' and 'set_test_params'") if '__init__' in dct or 'main' in dct: - raise TypeError("BitcoinTestFramework subclasses may not override " + raise TypeError("NYC3TestFramework subclasses may not override " "'__init__' or 'main'") return super().__new__(cls, clsname, bases, dct) -class BitcoinTestFramework(metaclass=BitcoinTestMetaClass): +class NYC3TestFramework(metaclass=NYC3TestMetaClass): """Base class for a bitcoin test script. Individual bitcoin test scripts should subclass this class and override the set_test_params() and run_test() methods. @@ -437,7 +437,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass): self.log.addHandler(ch) if self.options.trace_rpc: - rpc_logger = logging.getLogger("BitcoinRPC") + rpc_logger = logging.getLogger("NYC3RPC") rpc_logger.setLevel(logging.DEBUG) rpc_handler = logging.StreamHandler(sys.stdout) rpc_handler.setLevel(logging.DEBUG) diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py index 37fd2a874..653121589 100755 --- a/test/functional/test_framework/test_node.py +++ b/test/functional/test_framework/test_node.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Class for bitcoind node under test""" diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py index fef998241..73b6929fd 100644 --- a/test/functional/test_framework/util.py +++ b/test/functional/test_framework/util.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Helpful routines for regression testing.""" diff --git a/test/functional/test_framework/wallet_util.py b/test/functional/test_framework/wallet_util.py index c0dfa4c3f..b5be28006 100755 --- a/test/functional/test_framework/wallet_util.py +++ b/test/functional/test_framework/wallet_util.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Useful util functions for testing the wallet""" diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index bb9ac58e4..6075e600b 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Run regression test suite. @@ -8,7 +8,7 @@ This module calls down into individual test cases via subprocess. It will forward all unrecognized arguments onto the individual test scripts. For a description of arguments recognized by test scripts, see -`test/functional/test_framework/test_framework.py:BitcoinTestFramework.main`. +`test/functional/test_framework/test_framework.py:NYC3TestFramework.main`. """ diff --git a/test/functional/tool_wallet.py b/test/functional/tool_wallet.py index fbcf21e72..d73946fa8 100755 --- a/test/functional/tool_wallet.py +++ b/test/functional/tool_wallet.py @@ -1,15 +1,15 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test bitcoin-wallet.""" import subprocess import textwrap -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal -class ToolWalletTest(BitcoinTestFramework): +class ToolWalletTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 self.setup_clean_chain = True diff --git a/test/functional/wallet_abandonconflict.py b/test/functional/wallet_abandonconflict.py index b0b151d2d..c35a74c9f 100755 --- a/test/functional/wallet_abandonconflict.py +++ b/test/functional/wallet_abandonconflict.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2019 The Bitcoin Core developers +# Copyright (c) 2014-2019 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the abandontransaction RPC. @@ -12,7 +12,7 @@ """ from decimal import Decimal -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, assert_raises_rpc_error, @@ -23,7 +23,7 @@ from test_framework.util import ( ) -class AbandonConflictTest(BitcoinTestFramework): +class AbandonConflictTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 2 self.extra_args = [["-minrelaytxfee=0.00001"], []] diff --git a/test/functional/wallet_address_types.py b/test/functional/wallet_address_types.py index 380dd9c0a..fdd3bbd96 100755 --- a/test/functional/wallet_address_types.py +++ b/test/functional/wallet_address_types.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test that the wallet can send and receive using all combinations of address types. @@ -53,7 +53,7 @@ Test that the nodes generate the correct change address type: from decimal import Decimal import itertools -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.descriptors import ( descsum_create, descsum_check, @@ -68,7 +68,7 @@ from test_framework.util import ( ) -class AddressTypeTest(BitcoinTestFramework): +class AddressTypeTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 6 self.extra_args = [ diff --git a/test/functional/wallet_backup.py b/test/functional/wallet_backup.py index dd3750203..d984984f1 100755 --- a/test/functional/wallet_backup.py +++ b/test/functional/wallet_backup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the wallet backup features. @@ -35,10 +35,10 @@ import os from random import randint import shutil -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_raises_rpc_error, connect_nodes, sync_blocks, sync_mempools -class WalletBackupTest(BitcoinTestFramework): +class WalletBackupTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 4 self.setup_clean_chain = True diff --git a/test/functional/wallet_balance.py b/test/functional/wallet_balance.py index 3a65b684c..ca1191fca 100755 --- a/test/functional/wallet_balance.py +++ b/test/functional/wallet_balance.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the wallet balance RPC methods.""" from decimal import Decimal -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, assert_raises_rpc_error, @@ -37,7 +37,7 @@ def create_transactions(node, address, amt, fees): return txs -class WalletTest(BitcoinTestFramework): +class WalletTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 2 self.setup_clean_chain = True diff --git a/test/functional/wallet_basic.py b/test/functional/wallet_basic.py index 0477164b6..06a73d31e 100755 --- a/test/functional/wallet_basic.py +++ b/test/functional/wallet_basic.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2019 The Bitcoin Core developers +# Copyright (c) 2014-2019 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the wallet.""" from decimal import Decimal import time -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_array_result, assert_equal, @@ -19,7 +19,7 @@ from test_framework.util import ( ) -class WalletTest(BitcoinTestFramework): +class WalletTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 4 self.setup_clean_chain = True @@ -336,14 +336,14 @@ class WalletTest(BitcoinTestFramework): # This will raise an exception for attempting to dump the private key of an address you do not own assert_raises_rpc_error(-3, "Address does not refer to a key", self.nodes[0].dumpprivkey, temp_address) - # This will raise an exception for attempting to get the private key of an invalid Bitcoin address - assert_raises_rpc_error(-5, "Invalid Bitcoin address", self.nodes[0].dumpprivkey, "invalid") + # This will raise an exception for attempting to get the private key of an invalid NYC3 address + assert_raises_rpc_error(-5, "Invalid NYC3 address", self.nodes[0].dumpprivkey, "invalid") - # This will raise an exception for attempting to set a label for an invalid Bitcoin address - assert_raises_rpc_error(-5, "Invalid Bitcoin address", self.nodes[0].setlabel, "invalid address", "label") + # This will raise an exception for attempting to set a label for an invalid NYC3 address + assert_raises_rpc_error(-5, "Invalid NYC3 address", self.nodes[0].setlabel, "invalid address", "label") # This will raise an exception for importing an invalid address - assert_raises_rpc_error(-5, "Invalid Bitcoin address or script", self.nodes[0].importaddress, "invalid") + assert_raises_rpc_error(-5, "Invalid NYC3 address or script", self.nodes[0].importaddress, "invalid") # This will raise an exception for attempting to import a pubkey that isn't in hex assert_raises_rpc_error(-5, "Pubkey must be a hex string", self.nodes[0].importpubkey, "not hex") diff --git a/test/functional/wallet_bumpfee.py b/test/functional/wallet_bumpfee.py index 7d3d9b61e..b89c4acd7 100755 --- a/test/functional/wallet_bumpfee.py +++ b/test/functional/wallet_bumpfee.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2018 The Bitcoin Core developers +# Copyright (c) 2016-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the bumpfee RPC. @@ -18,13 +18,13 @@ import io from test_framework.blocktools import add_witness_commitment, create_block, create_coinbase, send_to_witness from test_framework.messages import BIP125_SEQUENCE_NUMBER, CTransaction -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_greater_than, assert_raises_rpc_error, bytes_to_hex_str, connect_nodes_bi, hex_str_to_bytes, sync_mempools WALLET_PASSPHRASE = "test" WALLET_PASSPHRASE_TIMEOUT = 3600 -class BumpFeeTest(BitcoinTestFramework): +class BumpFeeTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 2 self.setup_clean_chain = True diff --git a/test/functional/wallet_coinbase_category.py b/test/functional/wallet_coinbase_category.py index 7aa8b44eb..ee39971c5 100755 --- a/test/functional/wallet_coinbase_category.py +++ b/test/functional/wallet_coinbase_category.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test coinbase transactions return the correct categories. @@ -7,12 +7,12 @@ Tests listtransactions, listsinceblock, and gettransaction. """ -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_array_result ) -class CoinbaseCategoryTest(BitcoinTestFramework): +class CoinbaseCategoryTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 diff --git a/test/functional/wallet_create_tx.py b/test/functional/wallet_create_tx.py index 7b749235e..154266dc8 100755 --- a/test/functional/wallet_create_tx.py +++ b/test/functional/wallet_create_tx.py @@ -1,9 +1,9 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, ) @@ -12,7 +12,7 @@ from test_framework.blocktools import ( ) -class CreateTxWalletTest(BitcoinTestFramework): +class CreateTxWalletTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 1 diff --git a/test/functional/wallet_createwallet.py b/test/functional/wallet_createwallet.py index 7ec72b864..ce65c1909 100755 --- a/test/functional/wallet_createwallet.py +++ b/test/functional/wallet_createwallet.py @@ -1,17 +1,17 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test createwallet arguments. """ -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, assert_raises_rpc_error, ) -class CreateWalletTest(BitcoinTestFramework): +class CreateWalletTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = False self.num_nodes = 1 diff --git a/test/functional/wallet_disable.py b/test/functional/wallet_disable.py index 6530c58c7..298998a86 100755 --- a/test/functional/wallet_disable.py +++ b/test/functional/wallet_disable.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test a node with the -disablewallet option. @@ -8,10 +8,10 @@ - Test that it is not possible to mine to an invalid address. """ -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_raises_rpc_error -class DisableWalletTest (BitcoinTestFramework): +class DisableWalletTest (NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 1 diff --git a/test/functional/wallet_dump.py b/test/functional/wallet_dump.py index 3f39654bb..cd637ba22 100755 --- a/test/functional/wallet_dump.py +++ b/test/functional/wallet_dump.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2018 The Bitcoin Core developers +# Copyright (c) 2016-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the dumpwallet RPC.""" import os -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, assert_raises_rpc_error, @@ -85,7 +85,7 @@ def read_dump(file_name, addrs, script_addrs, hd_master_addr_old): return found_legacy_addr, found_p2sh_segwit_addr, found_bech32_addr, found_script_addr, found_addr_chg, found_addr_rsv, hd_master_addr_ret -class WalletDumpTest(BitcoinTestFramework): +class WalletDumpTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 self.extra_args = [["-keypool=90", "-addresstype=legacy"]] diff --git a/test/functional/wallet_encryption.py b/test/functional/wallet_encryption.py index c514b7e0b..3e926abb6 100755 --- a/test/functional/wallet_encryption.py +++ b/test/functional/wallet_encryption.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2018 The Bitcoin Core developers +# Copyright (c) 2016-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test Wallet encryption""" import time -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, assert_raises_rpc_error, @@ -14,7 +14,7 @@ from test_framework.util import ( assert_greater_than_or_equal, ) -class WalletEncryptionTest(BitcoinTestFramework): +class WalletEncryptionTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 1 diff --git a/test/functional/wallet_fallbackfee.py b/test/functional/wallet_fallbackfee.py index 0c67982bb..20f164409 100755 --- a/test/functional/wallet_fallbackfee.py +++ b/test/functional/wallet_fallbackfee.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test wallet replace-by-fee capabilities in conjunction with the fallbackfee.""" -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_raises_rpc_error -class WalletRBFTest(BitcoinTestFramework): +class WalletRBFTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 self.setup_clean_chain = True diff --git a/test/functional/wallet_groups.py b/test/functional/wallet_groups.py index 5452433ac..396ccbe35 100755 --- a/test/functional/wallet_groups.py +++ b/test/functional/wallet_groups.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test wallet group functionality.""" -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.messages import CTransaction, FromHex, ToHex from test_framework.util import ( assert_equal, @@ -16,7 +16,7 @@ def assert_approx(v, vexp, vspan=0.00001): if v > vexp + vspan: raise AssertionError("%s > [%s..%s]" % (str(v), str(vexp - vspan), str(vexp + vspan))) -class WalletGroupTest(BitcoinTestFramework): +class WalletGroupTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 3 diff --git a/test/functional/wallet_hd.py b/test/functional/wallet_hd.py index 61245e510..25e64faf4 100755 --- a/test/functional/wallet_hd.py +++ b/test/functional/wallet_hd.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2018 The Bitcoin Core developers +# Copyright (c) 2016-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test Hierarchical Deterministic wallet function.""" @@ -7,7 +7,7 @@ import os import shutil -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, connect_nodes_bi, @@ -15,7 +15,7 @@ from test_framework.util import ( ) -class WalletHDTest(BitcoinTestFramework): +class WalletHDTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 2 diff --git a/test/functional/wallet_import_rescan.py b/test/functional/wallet_import_rescan.py index 46462a16f..6c4d6b673 100755 --- a/test/functional/wallet_import_rescan.py +++ b/test/functional/wallet_import_rescan.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test wallet import RPCs. @@ -19,7 +19,7 @@ importing nodes pick up the new transactions regardless of whether rescans happened previously. """ -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import (assert_raises_rpc_error, connect_nodes, sync_blocks, assert_equal, set_node_times) import collections @@ -119,7 +119,7 @@ IMPORT_NODES = [ImportNode(*fields) for fields in itertools.product((False, True TIMESTAMP_WINDOW = 2 * 60 * 60 -class ImportRescanTest(BitcoinTestFramework): +class ImportRescanTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 2 + len(IMPORT_NODES) diff --git a/test/functional/wallet_import_with_label.py b/test/functional/wallet_import_with_label.py index a623b7560..f000c7368 100755 --- a/test/functional/wallet_import_with_label.py +++ b/test/functional/wallet_import_with_label.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the behavior of RPC importprivkey on set and unset labels of @@ -10,11 +10,11 @@ with or without a label and then its private key is imported with importprivkey with and without a label. """ -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.wallet_util import test_address -class ImportWithLabel(BitcoinTestFramework): +class ImportWithLabel(NYC3TestFramework): def set_test_params(self): self.num_nodes = 2 self.setup_clean_chain = True diff --git a/test/functional/wallet_importmulti.py b/test/functional/wallet_importmulti.py index bfee2fe4c..6d793651b 100755 --- a/test/functional/wallet_importmulti.py +++ b/test/functional/wallet_importmulti.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the importmulti RPC. @@ -19,7 +19,7 @@ from test_framework.script import ( CScript, OP_NOP, ) -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.descriptors import descsum_create from test_framework.util import ( assert_equal, @@ -33,7 +33,7 @@ from test_framework.wallet_util import ( test_address, ) -class ImportMultiTest(BitcoinTestFramework): +class ImportMultiTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 2 self.extra_args = [["-addresstype=legacy"], ["-addresstype=legacy"]] @@ -78,7 +78,7 @@ class ImportMultiTest(BitcoinTestFramework): # RPC importmulti ----------------------------------------------- - # Bitcoin Address (implicit non-internal) + # NYC3 Address (implicit non-internal) self.log.info("Should import an address") key = get_key(self.nodes[0]) self.test_importmulti({"scriptPubKey": {"address": key.p2pkh_addr}, diff --git a/test/functional/wallet_importprunedfunds.py b/test/functional/wallet_importprunedfunds.py index 78426018e..2c43a51d2 100755 --- a/test/functional/wallet_importprunedfunds.py +++ b/test/functional/wallet_importprunedfunds.py @@ -1,17 +1,17 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the importprunedfunds and removeprunedfunds RPCs.""" from decimal import Decimal -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, assert_raises_rpc_error, ) -class ImportPrunedFundsTest(BitcoinTestFramework): +class ImportPrunedFundsTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 2 diff --git a/test/functional/wallet_keypool.py b/test/functional/wallet_keypool.py index 111619626..f40783af6 100755 --- a/test/functional/wallet_keypool.py +++ b/test/functional/wallet_keypool.py @@ -1,15 +1,15 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the wallet keypool and interaction with wallet encryption/locking.""" import time -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_raises_rpc_error -class KeyPoolTest(BitcoinTestFramework): +class KeyPoolTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 diff --git a/test/functional/wallet_keypool_topup.py b/test/functional/wallet_keypool_topup.py index b7c8d3098..674ad7140 100755 --- a/test/functional/wallet_keypool_topup.py +++ b/test/functional/wallet_keypool_topup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test HD Wallet keypool restore function. @@ -13,7 +13,7 @@ Two nodes. Node1 is under test. Node0 is providing transactions and generating b import os import shutil -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, connect_nodes_bi, @@ -21,7 +21,7 @@ from test_framework.util import ( ) -class KeypoolRestoreTest(BitcoinTestFramework): +class KeypoolRestoreTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 4 diff --git a/test/functional/wallet_labels.py b/test/functional/wallet_labels.py index b71dae9f4..8a8b97fb4 100755 --- a/test/functional/wallet_labels.py +++ b/test/functional/wallet_labels.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2018 The Bitcoin Core developers +# Copyright (c) 2016-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test label RPCs. @@ -11,10 +11,10 @@ RPCs tested are: """ from collections import defaultdict -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_raises_rpc_error -class WalletLabelsTest(BitcoinTestFramework): +class WalletLabelsTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 1 @@ -34,7 +34,7 @@ class WalletLabelsTest(BitcoinTestFramework): assert_equal(node.getbalance(), 100) # there should be 2 address groups - # each with 1 address with a balance of 50 Bitcoins + # each with 1 address with a balance of 50 NYC3s address_groups = node.listaddressgroupings() assert_equal(len(address_groups), 2) # the addresses aren't linked now, but will be after we send to the diff --git a/test/functional/wallet_listreceivedby.py b/test/functional/wallet_listreceivedby.py index 011975e37..00e79e0dc 100755 --- a/test/functional/wallet_listreceivedby.py +++ b/test/functional/wallet_listreceivedby.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the listreceivedbyaddress RPC.""" from decimal import Decimal -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_array_result, assert_equal, @@ -14,7 +14,7 @@ from test_framework.util import ( ) -class ReceivedByTest(BitcoinTestFramework): +class ReceivedByTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 2 diff --git a/test/functional/wallet_listsinceblock.py b/test/functional/wallet_listsinceblock.py index 25ab22237..1fed1f5cf 100755 --- a/test/functional/wallet_listsinceblock.py +++ b/test/functional/wallet_listsinceblock.py @@ -1,13 +1,13 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the listsincelast RPC.""" -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, assert_array_result, assert_raises_rpc_error -class ListSinceBlockTest (BitcoinTestFramework): +class ListSinceBlockTest (NYC3TestFramework): def set_test_params(self): self.num_nodes = 4 self.setup_clean_chain = True diff --git a/test/functional/wallet_listtransactions.py b/test/functional/wallet_listtransactions.py index 17f044bf6..669b5c6e5 100755 --- a/test/functional/wallet_listtransactions.py +++ b/test/functional/wallet_listtransactions.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the listtransactions API.""" @@ -7,7 +7,7 @@ from decimal import Decimal from io import BytesIO from test_framework.messages import COIN, CTransaction -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_array_result, assert_equal, @@ -22,7 +22,7 @@ def tx_from_hex(hexstring): tx.deserialize(f) return tx -class ListTransactionsTest(BitcoinTestFramework): +class ListTransactionsTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 2 diff --git a/test/functional/wallet_multiwallet.py b/test/functional/wallet_multiwallet.py index df778f57d..8324110fd 100755 --- a/test/functional/wallet_multiwallet.py +++ b/test/functional/wallet_multiwallet.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test multiwallet. @@ -10,7 +10,7 @@ import os import shutil import time -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.test_node import ErrorMatch from test_framework.util import ( assert_equal, @@ -18,7 +18,7 @@ from test_framework.util import ( ) -class MultiWalletTest(BitcoinTestFramework): +class MultiWalletTest(NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 2 diff --git a/test/functional/wallet_resendwallettransactions.py b/test/functional/wallet_resendwallettransactions.py index 8aafa94c2..4f5036478 100755 --- a/test/functional/wallet_resendwallettransactions.py +++ b/test/functional/wallet_resendwallettransactions.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test that the wallet resends transactions periodically.""" @@ -9,7 +9,7 @@ import time from test_framework.blocktools import create_block, create_coinbase from test_framework.messages import ToHex from test_framework.mininode import P2PInterface, mininode_lock -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import assert_equal, wait_until class P2PStoreTxInvs(P2PInterface): @@ -24,7 +24,7 @@ class P2PStoreTxInvs(P2PInterface): # save txid self.tx_invs_received[i.hash] += 1 -class ResendWalletTransactionsTest(BitcoinTestFramework): +class ResendWalletTransactionsTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 1 diff --git a/test/functional/wallet_txn_clone.py b/test/functional/wallet_txn_clone.py index a0a35bf43..071de2c0f 100755 --- a/test/functional/wallet_txn_clone.py +++ b/test/functional/wallet_txn_clone.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the wallet accounts properly when there are cloned transactions with malleated scriptsigs.""" import io -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, bytes_to_hex_str as b2x, @@ -15,7 +15,7 @@ from test_framework.util import ( ) from test_framework.messages import CTransaction, COIN -class TxnMallTest(BitcoinTestFramework): +class TxnMallTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 4 diff --git a/test/functional/wallet_txn_doublespend.py b/test/functional/wallet_txn_doublespend.py index 9050e2124..17e5e9c27 100755 --- a/test/functional/wallet_txn_doublespend.py +++ b/test/functional/wallet_txn_doublespend.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the wallet accounts properly when there is a double-spend conflict.""" from decimal import Decimal -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, connect_nodes, @@ -14,7 +14,7 @@ from test_framework.util import ( sync_blocks, ) -class TxnMallTest(BitcoinTestFramework): +class TxnMallTest(NYC3TestFramework): def set_test_params(self): self.num_nodes = 4 diff --git a/test/functional/wallet_zapwallettxes.py b/test/functional/wallet_zapwallettxes.py index adebff360..b00117fe4 100755 --- a/test/functional/wallet_zapwallettxes.py +++ b/test/functional/wallet_zapwallettxes.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2018 The Bitcoin Core developers +# Copyright (c) 2014-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the zapwallettxes functionality. @@ -14,14 +14,14 @@ transactions are still available, but that the unconfirmed transaction has been zapped. """ -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import NYC3TestFramework from test_framework.util import ( assert_equal, assert_raises_rpc_error, wait_until, ) -class ZapWalletTXesTest (BitcoinTestFramework): +class ZapWalletTXesTest (NYC3TestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 2 diff --git a/test/fuzz/test_runner.py b/test/fuzz/test_runner.py index 1869f7175..33e9ee6b4 100755 --- a/test/fuzz/test_runner.py +++ b/test/fuzz/test_runner.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2019 The Bitcoin Core developers +# Copyright (c) 2019 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Run fuzz test targets. diff --git a/test/lint/check-doc.py b/test/lint/check-doc.py index c370ce0c0..5122cdba0 100755 --- a/test/lint/check-doc.py +++ b/test/lint/check-doc.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/test/lint/check-rpc-mappings.py b/test/lint/check-rpc-mappings.py index 137cc82b5..a2b17465d 100755 --- a/test/lint/check-rpc-mappings.py +++ b/test/lint/check-rpc-mappings.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2018 The Bitcoin Core developers +# Copyright (c) 2017-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Check RPC argument consistency.""" diff --git a/test/lint/commit-script-check.sh b/test/lint/commit-script-check.sh index 4267f9fa0..70d39009c 100755 --- a/test/lint/commit-script-check.sh +++ b/test/lint/commit-script-check.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/test/lint/git-subtree-check.sh b/test/lint/git-subtree-check.sh index 85e8b841b..52eef3fba 100755 --- a/test/lint/git-subtree-check.sh +++ b/test/lint/git-subtree-check.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2015 The Bitcoin Core developers +# Copyright (c) 2015 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/test/lint/lint-all.sh b/test/lint/lint-all.sh index 7c4f96cb3..a5a6e2a1c 100755 --- a/test/lint/lint-all.sh +++ b/test/lint/lint-all.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/test/lint/lint-assertions.sh b/test/lint/lint-assertions.sh index 5bbcae79e..3c43326ed 100755 --- a/test/lint/lint-assertions.sh +++ b/test/lint/lint-assertions.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh index be67cbed3..ed0dc122b 100755 --- a/test/lint/lint-circular-dependencies.sh +++ b/test/lint/lint-circular-dependencies.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/test/lint/lint-filenames.sh b/test/lint/lint-filenames.sh index 5391e43d9..cd3d25a39 100755 --- a/test/lint/lint-filenames.sh +++ b/test/lint/lint-filenames.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/test/lint/lint-format-strings.py b/test/lint/lint-format-strings.py index f5d4780b6..80fdb8f36 100755 --- a/test/lint/lint-format-strings.py +++ b/test/lint/lint-format-strings.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/test/lint/lint-format-strings.sh b/test/lint/lint-format-strings.sh index c994ae3f4..9a447820c 100755 --- a/test/lint/lint-format-strings.sh +++ b/test/lint/lint-format-strings.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/test/lint/lint-include-guards.sh b/test/lint/lint-include-guards.sh index 464969794..930c8122a 100755 --- a/test/lint/lint-include-guards.sh +++ b/test/lint/lint-include-guards.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/test/lint/lint-includes.sh b/test/lint/lint-includes.sh index 4b9e2615b..54e09f586 100755 --- a/test/lint/lint-includes.sh +++ b/test/lint/lint-includes.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/test/lint/lint-logs.sh b/test/lint/lint-logs.sh index 1afd4cfc1..e3a3364ee 100755 --- a/test/lint/lint-logs.sh +++ b/test/lint/lint-logs.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/test/lint/lint-python-dead-code.sh b/test/lint/lint-python-dead-code.sh index 863caa9d5..2bfea5531 100755 --- a/test/lint/lint-python-dead-code.sh +++ b/test/lint/lint-python-dead-code.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/test/lint/lint-python-utf8-encoding.sh b/test/lint/lint-python-utf8-encoding.sh index d03c20205..9d5891295 100755 --- a/test/lint/lint-python-utf8-encoding.sh +++ b/test/lint/lint-python-utf8-encoding.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/test/lint/lint-python.sh b/test/lint/lint-python.sh index f5b851aea..d54970f92 100755 --- a/test/lint/lint-python.sh +++ b/test/lint/lint-python.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/test/lint/lint-qt.sh b/test/lint/lint-qt.sh index 2e77682aa..f03ed6344 100755 --- a/test/lint/lint-qt.sh +++ b/test/lint/lint-qt.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/test/lint/lint-rpc-help.sh b/test/lint/lint-rpc-help.sh index faac5d43e..8325953ae 100755 --- a/test/lint/lint-rpc-help.sh +++ b/test/lint/lint-rpc-help.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/test/lint/lint-shell-locale.sh b/test/lint/lint-shell-locale.sh index 084dc93f7..144fd12af 100755 --- a/test/lint/lint-shell-locale.sh +++ b/test/lint/lint-shell-locale.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/test/lint/lint-shell.sh b/test/lint/lint-shell.sh index 6f5e6546c..3c83b5730 100755 --- a/test/lint/lint-shell.sh +++ b/test/lint/lint-shell.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/test/lint/lint-spelling.sh b/test/lint/lint-spelling.sh index 5d672698a..02252babb 100755 --- a/test/lint/lint-spelling.sh +++ b/test/lint/lint-spelling.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/test/lint/lint-tests.sh b/test/lint/lint-tests.sh index 35d11023e..596a3fa58 100755 --- a/test/lint/lint-tests.sh +++ b/test/lint/lint-tests.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2018 The Bitcoin Core developers +# Copyright (c) 2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/test/lint/lint-whitespace.sh b/test/lint/lint-whitespace.sh index d5c1dee42..a8d25f91c 100755 --- a/test/lint/lint-whitespace.sh +++ b/test/lint/lint-whitespace.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2017-2019 The Bitcoin Core developers +# Copyright (c) 2017-2019 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/test/util/bitcoin-util-test.py b/test/util/bitcoin-util-test.py index 7b1cc2b03..eb3f0c44e 100755 --- a/test/util/bitcoin-util-test.py +++ b/test/util/bitcoin-util-test.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # Copyright 2014 BitPay Inc. -# Copyright 2016-2017 The Bitcoin Core developers +# Copyright 2016-2017 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test framework for bitcoin utils. diff --git a/test/util/rpcauth-test.py b/test/util/rpcauth-test.py index 53058dc39..cea6e12dc 100755 --- a/test/util/rpcauth-test.py +++ b/test/util/rpcauth-test.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2018 The NYC3 Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test share/rpcauth/rpcauth.py